Mercurial > hg > orthanc-webviewer

comparison CMakeLists.txt @ 300:7dc18c36dd3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync + no more need of "-DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES" to dynamically link against system-wide orthanc framework
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 12 Jun 2021 08:35:27 +0200
parents e376158e2dbb
children e89cc1536b51
comparison
equal deleted inserted replaced
299:5ffad296d194 300:7dc18c36dd3d
25 25
26 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline") 26 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
27 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") 27 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
28 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") 28 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
29 else() 29 else()
30 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.8.1") 30 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.9.3")
31 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") 31 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
32 endif() 32 endif()
33 33
34 34
35 # Parameters of the build 35 # Parameters of the build
52 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) 52 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)
53 53
54 include_directories(${ORTHANC_FRAMEWORK_ROOT}) 54 include_directories(${ORTHANC_FRAMEWORK_ROOT})
55 55
56 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system") 56 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
57 if (ORTHANC_FRAMEWORK_USE_SHARED)
58 include(FindBoost)
59 find_package(Boost COMPONENTS filesystem regex thread)
60
61 if (NOT Boost_FOUND)
62 message(FATAL_ERROR "Unable to locate Boost on this system")
63 endif()
64
65 link_libraries(${Boost_LIBRARIES} jsoncpp)
66 endif()
67
57 link_libraries(${ORTHANC_FRAMEWORK_LIBRARIES}) 68 link_libraries(${ORTHANC_FRAMEWORK_LIBRARIES})
58 69
59 set(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test") 70 set(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test")
60 set(USE_GOOGLE_TEST_DEBIAN_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)") 71 set(USE_GOOGLE_TEST_DEBIAN_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)")
61 mark_as_advanced(USE_GOOGLE_TEST_DEBIAN_PACKAGE) 72 mark_as_advanced(USE_GOOGLE_TEST_DEBIAN_PACKAGE)