# HG changeset patch # User jodogne # Date 1383033644 -3600 # Node ID b8322fe3bdba0b63b300fdcf54fc6f0b7dbe579b # Parent 7e7f41a9f33dd9586603357b809e960de7725a6d possibility to disable the use of system dcmtk or boost diff -r 7e7f41a9f33d -r b8322fe3bdba CMakeLists.txt --- a/CMakeLists.txt Fri Oct 25 12:43:02 2013 +0200 +++ b/CMakeLists.txt Tue Oct 29 09:00:44 2013 +0100 @@ -25,6 +25,8 @@ SET(USE_DYNAMIC_SQLITE ON CACHE BOOL "Use the dynamic version of SQLite") SET(USE_DYNAMIC_MONGOOSE OFF CACHE BOOL "Use the dynamic version of Mongoose") SET(USE_DYNAMIC_LUA OFF CACHE BOOL "Use the dynamic version of Lua") +SET(USE_SYSTEM_DCMTK ON CACHE BOOL "Use the system version of DCMTK") +SET(USE_SYSTEM_BOOST ON CACHE BOOL "Use the system version of Boost") SET(DEBIAN_USE_GTEST_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)") mark_as_advanced(USE_DYNAMIC_JSONCPP) diff -r 7e7f41a9f33d -r b8322fe3bdba Resources/CMake/BoostConfiguration.cmake --- a/Resources/CMake/BoostConfiguration.cmake Fri Oct 25 12:43:02 2013 +0200 +++ b/Resources/CMake/BoostConfiguration.cmake Tue Oct 29 09:00:44 2013 +0100 @@ -1,4 +1,4 @@ -if (${STATIC_BUILD}) +if (STATIC_BUILD OR NOT USE_SYSTEM_BOOST) set(BOOST_STATIC 1) else() include(FindBoost) diff -r 7e7f41a9f33d -r b8322fe3bdba Resources/CMake/DcmtkConfiguration.cmake --- a/Resources/CMake/DcmtkConfiguration.cmake Fri Oct 25 12:43:02 2013 +0200 +++ b/Resources/CMake/DcmtkConfiguration.cmake Tue Oct 29 09:00:44 2013 +0100 @@ -1,6 +1,6 @@ add_definitions(-DDCMTK_DICTIONARY_DIR="${DCMTK_DICTIONARY_DIR}") -if (${STATIC_BUILD}) +if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK) SET(DCMTK_VERSION_NUMBER 360) SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0) DownloadPackage(