Mercurial > hg > orthanc-python

comparison CMakeLists.txt @ 70:c10386bee2e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix link against system-wide orthanc framework
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 11 Jun 2021 14:54:26 +0200
parents 32de70a1e4c7
children 0fb9f2fb3157
comparison
equal deleted inserted replaced
69:07fdf388c12e 70:c10386bee2e3
5 5
6 if (PLUGIN_VERSION STREQUAL "mainline") 6 if (PLUGIN_VERSION STREQUAL "mainline")
7 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") 7 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
8 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") 8 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
9 else() 9 else()
10 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.8.2") 10 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.3")
11 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") 11 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
12 endif() 12 endif()
13 13
14 14
15 if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") 15 if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
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 #link_libraries(${ORTHANC_FRAMEWORK_LIBRARIES}) 49 if (NOT ORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES STREQUAL "")
50 50 # https://stackoverflow.com/a/5272993/881731
51 string(REPLACE " " ";" tmp ${ORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES})
52 link_libraries(${tmp})
53 endif()
54
51 else() 55 else()
52 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake) 56 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake)
53 57
54 #set(ENABLE_MODULE_IMAGES OFF CACHE INTERNAL "") 58 #set(ENABLE_MODULE_IMAGES OFF CACHE INTERNAL "")
55 #set(ENABLE_MODULE_JOBS OFF CACHE INTERNAL "") 59 #set(ENABLE_MODULE_JOBS OFF CACHE INTERNAL "")