comparison Applications/CMakeLists.txt @ 204:9d3ffcc402a9

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 04 Aug 2020 13:12:40 +0200
parents 2d3fe6967894
children a8f25caebc07
comparison
equal deleted inserted replaced
203:029563c83ad8 204:9d3ffcc402a9
23 ## Configure mandatory third-party components 23 ## Configure mandatory third-party components
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
29 include_directories(${ORTHANC_FRAMEWORK_ROOT})
28 30
29 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system") 31 if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
30 set(ENABLE_DCMTK ON) 32 set(ENABLE_DCMTK ON)
31 set(ORTHANC_BOOST_COMPONENTS program_options) 33 set(ORTHANC_BOOST_COMPONENTS program_options)
32 include(${CMAKE_SOURCE_DIR}/../Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) 34 include(${CMAKE_SOURCE_DIR}/../Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)
36 include(${CMAKE_SOURCE_DIR}/../Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) 38 include(${CMAKE_SOURCE_DIR}/../Resources/Orthanc/CMake/DownloadOrthancFramework.cmake)
37 39
38 UNSET(STANDALONE_BUILD CACHE) 40 UNSET(STANDALONE_BUILD CACHE)
39 SET(STANDALONE_BUILD ON) # Embed DCMTK's dictionaries for static builds 41 SET(STANDALONE_BUILD ON) # Embed DCMTK's dictionaries for static builds
40 42
41 include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkParameters.cmake) 43 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake)
42 44
43 SET(ENABLE_CRYPTO_OPTIONS ON) 45 SET(ENABLE_CRYPTO_OPTIONS ON)
44 SET(ENABLE_DCMTK ON) 46 SET(ENABLE_DCMTK ON)
45 SET(ENABLE_DCMTK_JPEG OFF) # Disable DCMTK's support for JPEG, that clashes with libtiff 47 SET(ENABLE_DCMTK_JPEG OFF) # Disable DCMTK's support for JPEG, that clashes with libtiff
46 SET(ENABLE_DCMTK_JPEG_LOSSLESS OFF) # Disable DCMTK's support for JPEG-LS 48 SET(ENABLE_DCMTK_JPEG_LOSSLESS OFF) # Disable DCMTK's support for JPEG-LS
51 SET(ENABLE_PNG ON) 53 SET(ENABLE_PNG ON)
52 SET(ENABLE_SSL ON) 54 SET(ENABLE_SSL ON)
53 SET(ENABLE_WEB_CLIENT ON) 55 SET(ENABLE_WEB_CLIENT ON)
54 SET(ENABLE_ZLIB ON) 56 SET(ENABLE_ZLIB ON)
55 57
56 include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/VisualStudioPrecompiledHeaders.cmake) 58 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/VisualStudioPrecompiledHeaders.cmake)
57 include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) 59 include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkConfiguration.cmake)
58 include_directories(
59 ${ORTHANC_FRAMEWORK_ROOT}/Sources/
60 )
61 60
62 include(${ORTHANC_WSI_DIR}/Resources/CMake/BoostExtendedConfiguration.cmake) 61 include(${ORTHANC_WSI_DIR}/Resources/CMake/BoostExtendedConfiguration.cmake)
63 endif() 62 endif()
64 63
65 64