comparison CMakeLists.txt @ 73:da73be4b361b

no more need of "-DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES" to link against system-wide orthanc framework
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 12 Jun 2021 08:00:57 +0200
parents 38b0a6a1ca56
children 5217f6f8a8cf
comparison
equal deleted inserted replaced
72:38b0a6a1ca56 73:da73be4b361b
44 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) 44 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)
45 45
46 include_directories(${ORTHANC_FRAMEWORK_ROOT}) 46 include_directories(${ORTHANC_FRAMEWORK_ROOT})
47 47
48 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system") 48 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
49 if (NOT ORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES STREQUAL "") 49 include(FindBoost)
50 # https://stackoverflow.com/a/5272993/881731 50 find_package(Boost COMPONENTS filesystem regex thread)
51 string(REPLACE " " ";" tmp ${ORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES}) 51
52 link_libraries(${tmp}) 52 if (NOT Boost_FOUND)
53 endif() 53 message(FATAL_ERROR "Unable to locate Boost on this system")
54 54 endif()
55
56 link_libraries(${Boost_LIBRARIES} jsoncpp)
57
55 else() 58 else()
56 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake) 59 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake)
57 60
58 #set(ENABLE_MODULE_IMAGES OFF CACHE INTERNAL "") 61 #set(ENABLE_MODULE_IMAGES OFF CACHE INTERNAL "")
59 #set(ENABLE_MODULE_JOBS OFF CACHE INTERNAL "") 62 #set(ENABLE_MODULE_JOBS OFF CACHE INTERNAL "")