comparison Applications/CMakeLists.txt @ 208:541a4aa63278

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 04 Aug 2020 17:13:35 +0200
parents a8f25caebc07
children 443f219a68fd
comparison
equal deleted inserted replaced
207:3d457e61a88c 208:541a4aa63278
24 ##################################################################### 24 #####################################################################
25 25
26 SET(ORTHANC_WSI_DIR ${CMAKE_CURRENT_LIST_DIR}/..) 26 SET(ORTHANC_WSI_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
27 SET(USE_OPENJPEG_JP2 ON) 27 SET(USE_OPENJPEG_JP2 ON)
28 28
29 include_directories(${ORTHANC_FRAMEWORK_ROOT})
30
31 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system") 29 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
32 set(ENABLE_DCMTK ON) 30 set(ENABLE_DCMTK ON)
33 set(ORTHANC_BOOST_COMPONENTS program_options) 31 set(ORTHANC_BOOST_COMPONENTS program_options)
34 include(${CMAKE_SOURCE_DIR}/../Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) 32 include(${CMAKE_SOURCE_DIR}/../Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)
33
35 link_libraries(${ORTHANC_FRAMEWORK_LIBRARIES}) 34 link_libraries(${ORTHANC_FRAMEWORK_LIBRARIES})
35 include_directories(${ORTHANC_FRAMEWORK_ROOT})
36 36
37 else() 37 else()
38 include(${CMAKE_SOURCE_DIR}/../Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) 38 include(${CMAKE_SOURCE_DIR}/../Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)
39 include_directories(${ORTHANC_FRAMEWORK_ROOT})
39 40
40 UNSET(STANDALONE_BUILD CACHE) 41 UNSET(STANDALONE_BUILD CACHE)
41 SET(STANDALONE_BUILD ON) # Embed DCMTK's dictionaries for static builds 42 SET(STANDALONE_BUILD ON) # Embed DCMTK's dictionaries for static builds
42 43
43 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake) 44 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake)