Mercurial > hg > orthanc

diff CMakeLists.txt @ 1487:23083810d543

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removal of unneeded static libraries
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 04 Aug 2015 10:45:58 +0200
parents 27661b33f624
children c8763b603b0e
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Aug 04 10:01:31 2015 +0200
+++ b/CMakeLists.txt	Tue Aug 04 10:45:58 2015 +0200
@@ -25,6 +25,7 @@
 SET(DCMTK_DICTIONARY_DIR "" CACHE PATH "Directory containing the DCMTK dictionaries \"dicom.dic\" and \"private.dic\" (only when using system version of DCMTK)") 
 SET(ALLOW_DOWNLOADS OFF CACHE BOOL "Allow CMake to download packages")
 SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests")
+SET(ENABLE_GOOGLE_LOG ON CACHE BOOL "Enable Google Log (otherwise, an internal logger is used)")
 SET(ENABLE_JPEG ON CACHE BOOL "Enable JPEG decompression")
 SET(ENABLE_JPEG_LOSSLESS ON CACHE BOOL "Enable JPEG-LS (Lossless) decompression")
 SET(ENABLE_PLUGINS ON CACHE BOOL "Enable plugins")
@@ -234,7 +235,10 @@
 ## Inclusion of third-party dependencies
 #####################################################################
 
-include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleLogConfiguration.cmake)
+if (ENABLE_GOOGLE_LOG)
+  include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleLogConfiguration.cmake)
+endif()
+
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/BoostConfiguration.cmake)
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/DcmtkConfiguration.cmake)
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/MongooseConfiguration.cmake)
@@ -364,14 +368,16 @@
   ${ORTHANC_CORE_SOURCES}
   ${AUTOGENERATED_SOURCES}
 
+  ${BOOST_SOURCES}
   ${CURL_SOURCES}
-  ${ZLIB_SOURCES}
-  ${MONGOOSE_SOURCES}
+  ${GOOGLE_LOG_SOURCES}
   ${JSONCPP_SOURCES}
-  ${BOOST_SOURCES}
+  ${LIBPNG_SOURCES}
+  ${LUA_SOURCES}
+  ${MONGOOSE_SOURCES}
+  ${PUGIXML_SOURCES}
   ${SQLITE_SOURCES}
-  ${LIBPNG_SOURCES}
-  ${PUGIXML_SOURCES}
+  ${ZLIB_SOURCES}
 
   ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/md5/md5.c
   ${CMAKE_SOURCE_DIR}/Resources/ThirdParty/base64/base64.cpp
@@ -397,7 +403,7 @@
   ${ORTHANC_RESOURCES}
   )
 
-target_link_libraries(Orthanc ServerLibrary CoreLibrary ${STATIC_LUA} ${STATIC_GOOGLE_LOG} ${DCMTK_LIBRARIES})
+target_link_libraries(Orthanc ServerLibrary CoreLibrary ${DCMTK_LIBRARIES})
 
 if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
   target_link_libraries(Orthanc OpenSSL)
@@ -426,7 +432,7 @@
   ${GTEST_SOURCES}
   ${ORTHANC_UNIT_TESTS_SOURCES}
   )
-target_link_libraries(UnitTests ServerLibrary CoreLibrary ${STATIC_LUA} ${STATIC_GOOGLE_LOG} ${DCMTK_LIBRARIES})
+target_link_libraries(UnitTests ServerLibrary CoreLibrary ${DCMTK_LIBRARIES})
 
 if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
   target_link_libraries(UnitTests OpenSSL)