Mercurial > hg > orthanc
diff OrthancFramework/SharedLibrary/CMakeLists.txt @ 4535:c40c1234a696
simplification of DownloadOrthancFramework.cmake
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 26 Feb 2021 13:50:37 +0100 |
parents | d64e6f401a8a |
children | 237ec4c5a24d |
line wrap: on
line diff
--- a/OrthancFramework/SharedLibrary/CMakeLists.txt Thu Feb 25 18:27:28 2021 +0100 +++ b/OrthancFramework/SharedLibrary/CMakeLists.txt Fri Feb 26 13:50:37 2021 +0100 @@ -45,7 +45,7 @@ set(ORTHANC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "") SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests") set(BUILD_SHARED_LIBRARY ON CACHE BOOL "Whether to build a shared library instead of a static library") -set(ORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES "" CACHE STRING "Additional libraries to link against, separated by whitespaces, typically needed if using the static library (a typical value is \"uuid curl civetweb\")") +set(ORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES "" CACHE STRING "Additional libraries to link against, separated by whitespaces, typically needed if building the static library (a common minimal value is \"boost_filesystem boost_iostreams boost_locale boost_regex boost_thread jsoncpp pugixml uuid\")") @@ -507,32 +507,23 @@ ) endif() - if (JSONCPP_CXX11) - list(APPEND Flags -DUSE_CXX11=1) - endif() - # Build the unit tests, linking them against the just-created # "OrthancFramework" library externalproject_add(UnitTests SOURCE_DIR "${CMAKE_SOURCE_DIR}/../UnitTestsSources" CMAKE_ARGS + ${Flags} -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} + -DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES:STRING=${ORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES} -DORTHANC_FRAMEWORK_LIBDIR:PATH=${CMAKE_CURRENT_BINARY_DIR} -DORTHANC_FRAMEWORK_ROOT:PATH=${CMAKE_CURRENT_BINARY_DIR}/Include/orthanc-framework -DORTHANC_FRAMEWORK_SOURCE:STRING=system -DORTHANC_FRAMEWORK_STATIC:BOOL=${STATIC_BUILD} - - -DALLOW_DOWNLOADS:BOOL=${ALLOW_DOWNLOADS} - -DBOOST_LOCALE_BACKEND:STRING=${BOOST_LOCALE_BACKEND} + -DORTHANC_FRAMEWORK_USE_SHARED:BOOL=${BUILD_SHARED_LIBRARY} -DSTATIC_BUILD:BOOL=${STATIC_BUILD} -DUNIT_TESTS_WITH_HTTP_CONNEXIONS:BOOL=${UNIT_TESTS_WITH_HTTP_CONNEXIONS} -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE:BOOL=${USE_GOOGLE_TEST_DEBIAN_PACKAGE} - -DUSE_SYSTEM_BOOST:BOOL=${USE_SYSTEM_BOOST} -DUSE_SYSTEM_GOOGLE_TEST:BOOL=${USE_SYSTEM_GOOGLE_TEST} - -DORTHANC_FRAMEWORK_USE_SHARED:BOOL=${BUILD_SHARED_LIBRARY} - -DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES:STRING=${ORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES} - - ${Flags} ) add_dependencies(UnitTests OrthancFramework)