comparison CMakeLists.txt @ 3786:3801435e34a1 SylvainRouquette/fix-issue169-95b752c

integration Orthanc-1.6.0->SylvainRouquette
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 19 Mar 2020 11:48:30 +0100
parents 875308321fa8
children 3b5feb2bbd4b 4f78da5613a1
comparison
equal deleted inserted replaced
3785:763533d6dd67 3786:3801435e34a1
15 set(ENABLE_DCMTK_NETWORKING ON) 15 set(ENABLE_DCMTK_NETWORKING ON)
16 set(ENABLE_GOOGLE_TEST ON) 16 set(ENABLE_GOOGLE_TEST ON)
17 set(ENABLE_JPEG ON) 17 set(ENABLE_JPEG ON)
18 set(ENABLE_LOCALE ON) 18 set(ENABLE_LOCALE ON)
19 set(ENABLE_LUA ON) 19 set(ENABLE_LUA ON)
20 set(ENABLE_OPENSSL_ENGINES ON) 20 set(ENABLE_OPENSSL_ENGINES ON) # OpenSSL engines are necessary for PKCS11
21 set(ENABLE_PNG ON) 21 set(ENABLE_PNG ON)
22 set(ENABLE_PUGIXML ON) 22 set(ENABLE_PUGIXML ON)
23 set(ENABLE_SQLITE ON) 23 set(ENABLE_SQLITE ON)
24 set(ENABLE_WEB_CLIENT ON) 24 set(ENABLE_WEB_CLIENT ON)
25 set(ENABLE_WEB_SERVER ON) 25 set(ENABLE_WEB_SERVER ON)
26 set(ENABLE_ZLIB ON) 26 set(ENABLE_ZLIB ON)
27 27
28 # To test transcoding
29 #set(ENABLE_DCMTK_TRANSCODING ON)
30
28 set(HAS_EMBEDDED_RESOURCES ON) 31 set(HAS_EMBEDDED_RESOURCES ON)
29 32
30 33
31 ##################################################################### 34 #####################################################################
32 ## CMake parameters tunable at the command line to configure the 35 ## CMake parameters tunable at the command line to configure the
35 38
36 # Parameters of the build 39 # Parameters of the build
37 SET(BUILD_MODALITY_WORKLISTS ON CACHE BOOL "Whether to build the sample plugin to serve modality worklists") 40 SET(BUILD_MODALITY_WORKLISTS ON CACHE BOOL "Whether to build the sample plugin to serve modality worklists")
38 SET(BUILD_RECOVER_COMPRESSED_FILE ON CACHE BOOL "Whether to build the companion tool to recover files compressed using Orthanc") 41 SET(BUILD_RECOVER_COMPRESSED_FILE ON CACHE BOOL "Whether to build the companion tool to recover files compressed using Orthanc")
39 SET(BUILD_SERVE_FOLDERS ON CACHE BOOL "Whether to build the ServeFolders plugin") 42 SET(BUILD_SERVE_FOLDERS ON CACHE BOOL "Whether to build the ServeFolders plugin")
43 SET(BUILD_CONNECTIVITY_CHECKS ON CACHE BOOL "Whether to build the ConnectivityChecks plugin")
40 SET(ENABLE_PLUGINS ON CACHE BOOL "Enable plugins") 44 SET(ENABLE_PLUGINS ON CACHE BOOL "Enable plugins")
41 SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests") 45 SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests")
42 46
43 47
44 ##################################################################### 48 #####################################################################
100 OrthancServer/ServerJobs/Operations/SystemCallOperation.cpp 104 OrthancServer/ServerJobs/Operations/SystemCallOperation.cpp
101 OrthancServer/ServerJobs/OrthancJobUnserializer.cpp 105 OrthancServer/ServerJobs/OrthancJobUnserializer.cpp
102 OrthancServer/ServerJobs/OrthancPeerStoreJob.cpp 106 OrthancServer/ServerJobs/OrthancPeerStoreJob.cpp
103 OrthancServer/ServerJobs/ResourceModificationJob.cpp 107 OrthancServer/ServerJobs/ResourceModificationJob.cpp
104 OrthancServer/ServerJobs/SplitStudyJob.cpp 108 OrthancServer/ServerJobs/SplitStudyJob.cpp
109 OrthancServer/ServerJobs/StorageCommitmentScpJob.cpp
105 OrthancServer/ServerToolbox.cpp 110 OrthancServer/ServerToolbox.cpp
106 OrthancServer/SliceOrdering.cpp 111 OrthancServer/SliceOrdering.cpp
112 OrthancServer/StorageCommitmentReports.cpp
107 ) 113 )
108 114
109 115
110 set(ORTHANC_UNIT_TESTS_SOURCES 116 set(ORTHANC_UNIT_TESTS_SOURCES
111 UnitTestsSources/DatabaseLookupTests.cpp 117 UnitTestsSources/DatabaseLookupTests.cpp
459 endif() 465 endif()
460 466
461 467
462 468
463 ##################################################################### 469 #####################################################################
470 ## Build the "ConnectivityChecks" plugin
471 #####################################################################
472
473 if (ENABLE_PLUGINS AND BUILD_CONNECTIVITY_CHECKS)
474 include(ExternalProject)
475
476 set(Flags)
477
478 if (CMAKE_TOOLCHAIN_FILE)
479 # Take absolute path to the toolchain
480 get_filename_component(TMP ${CMAKE_TOOLCHAIN_FILE} REALPATH BASE ${CMAKE_SOURCE_DIR})
481 list(APPEND Flags -DCMAKE_TOOLCHAIN_FILE=${TMP})
482 endif()
483
484 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
485 list(APPEND Flags
486 -DLSB_CC=${CMAKE_LSB_CC}
487 -DLSB_CXX=${CMAKE_LSB_CXX}
488 )
489 endif()
490
491 externalproject_add(ConnectivityChecks
492 SOURCE_DIR "${ORTHANC_ROOT}/Plugins/Samples/ConnectivityChecks"
493
494 # We explicitly provide a build directory, in order to avoid paths
495 # that are too long on our Visual Studio 2008 CIS
496 BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/ConnectivityChecks-build"
497
498 CMAKE_ARGS
499 -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
500 -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}
501 -DPLUGIN_VERSION=${ORTHANC_VERSION}
502 -DSTATIC_BUILD=${STATIC_BUILD}
503 -DALLOW_DOWNLOADS=${ALLOW_DOWNLOADS}
504 -DUSE_LEGACY_JSONCPP=${USE_LEGACY_JSONCPP}
505 ${Flags}
506 )
507
508 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
509 if (MSVC)
510 set(Prefix "")
511 else()
512 set(Prefix "lib") # MinGW
513 endif()
514
515 install(FILES
516 ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}ConnectivityChecks.dll
517 DESTINATION "lib")
518 else()
519 list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix)
520 list(GET CMAKE_FIND_LIBRARY_SUFFIXES 0 Suffix)
521 install(FILES
522 ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}ConnectivityChecks${Suffix}
523 ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}ConnectivityChecks${Suffix}.${ORTHANC_VERSION}
524 DESTINATION "share/orthanc/plugins")
525 endif()
526 endif()
527
528
529
530 #####################################################################
464 ## Build the companion tool to recover files compressed using Orthanc 531 ## Build the companion tool to recover files compressed using Orthanc
465 ##################################################################### 532 #####################################################################
466 533
467 if (BUILD_RECOVER_COMPRESSED_FILE) 534 if (BUILD_RECOVER_COMPRESSED_FILE)
468 set(RECOVER_COMPRESSED_SOURCES 535 set(RECOVER_COMPRESSED_SOURCES