Mercurial > hg > orthanc
changeset 633:e207b33216db
merge
| author | jodogne |
|---|---|
| date | Tue, 29 Oct 2013 09:04:25 +0100 |
| parents | b8322fe3bdba (diff) 17815b9d4280 (current diff) |
| children | d775a3cb5a06 |
| files | CMakeLists.txt UnitTests/FileStorage.cpp UnitTests/Lua.cpp UnitTests/MemoryCache.cpp UnitTests/Png.cpp UnitTests/RestApi.cpp UnitTests/SQLite.cpp UnitTests/SQLiteChromium.cpp UnitTests/ServerIndex.cpp UnitTests/Versions.cpp UnitTests/Zip.cpp UnitTests/main.cpp |
| diffstat | 3 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Mon Oct 28 16:26:51 2013 +0100 +++ b/CMakeLists.txt Tue Oct 29 09:04:25 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)
--- a/Resources/CMake/BoostConfiguration.cmake Mon Oct 28 16:26:51 2013 +0100 +++ b/Resources/CMake/BoostConfiguration.cmake Tue Oct 29 09:04:25 2013 +0100 @@ -1,4 +1,4 @@ -if (${STATIC_BUILD}) +if (STATIC_BUILD OR NOT USE_SYSTEM_BOOST) set(BOOST_STATIC 1) else() include(FindBoost)
--- a/Resources/CMake/DcmtkConfiguration.cmake Mon Oct 28 16:26:51 2013 +0100 +++ b/Resources/CMake/DcmtkConfiguration.cmake Tue Oct 29 09:04:25 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(