comparison CMakeLists.txt @ 4049:47e9e788224c framework

removing occurrences of ORTHANC_ROOT
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 11 Jun 2020 10:05:26 +0200
parents 7ff1e6c80627
children 8661d8c656e6
comparison
equal deleted inserted replaced
4048:64919a9958bb 4049:47e9e788224c
168 ${ORTHANC_CORE_SOURCES_INTERNAL} 168 ${ORTHANC_CORE_SOURCES_INTERNAL}
169 ${ORTHANC_DICOM_SOURCES_INTERNAL} 169 ${ORTHANC_DICOM_SOURCES_INTERNAL}
170 ${ORTHANC_SERVER_SOURCES} 170 ${ORTHANC_SERVER_SOURCES}
171 ${ORTHANC_FRAMEWORK_UNIT_TESTS} 171 ${ORTHANC_FRAMEWORK_UNIT_TESTS}
172 ${ORTHANC_SERVER_UNIT_TESTS} 172 ${ORTHANC_SERVER_UNIT_TESTS}
173 ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp 173 ${CMAKE_SOURCE_DIR}/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
174 ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp 174 ${CMAKE_SOURCE_DIR}/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp
175 ${ORTHANC_ROOT}/OrthancServer/Sources/EmbeddedResourceHttpHandler.cpp 175 ${CMAKE_SOURCE_DIR}/OrthancServer/Sources/EmbeddedResourceHttpHandler.cpp
176 ${ORTHANC_ROOT}/OrthancServer/Sources/main.cpp 176 ${CMAKE_SOURCE_DIR}/OrthancServer/Sources/main.cpp
177 ) 177 )
178 178
179 set_source_files_properties(${ORTHANC_ALL_SOURCES} 179 set_source_files_properties(${ORTHANC_ALL_SOURCES}
180 PROPERTIES COMPILE_FLAGS -pedantic 180 PROPERTIES COMPILE_FLAGS -pedantic
181 ) 181 )
224 224
225 225
226 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") 226 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
227 execute_process( 227 execute_process(
228 COMMAND 228 COMMAND
229 ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py 229 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/WindowsResources.py
230 ${ORTHANC_VERSION} Orthanc Orthanc.exe "Lightweight, RESTful DICOM server for medical imaging" 230 ${ORTHANC_VERSION} Orthanc Orthanc.exe "Lightweight, RESTful DICOM server for medical imaging"
231 ERROR_VARIABLE Failure 231 ERROR_VARIABLE Failure
232 OUTPUT_FILE ${AUTOGENERATED_DIR}/Orthanc.rc 232 OUTPUT_FILE ${AUTOGENERATED_DIR}/Orthanc.rc
233 ) 233 )
234 234
396 396
397 if (ENABLE_PLUGINS AND BUILD_SERVE_FOLDERS) 397 if (ENABLE_PLUGINS AND BUILD_SERVE_FOLDERS)
398 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") 398 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
399 execute_process( 399 execute_process(
400 COMMAND 400 COMMAND
401 ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py 401 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/WindowsResources.py
402 ${ORTHANC_VERSION} ServeFolders ServeFolders.dll "Orthanc plugin to serve additional folders" 402 ${ORTHANC_VERSION} ServeFolders ServeFolders.dll "Orthanc plugin to serve additional folders"
403 ERROR_VARIABLE Failure 403 ERROR_VARIABLE Failure
404 OUTPUT_FILE ${AUTOGENERATED_DIR}/ServeFolders.rc 404 OUTPUT_FILE ${AUTOGENERATED_DIR}/ServeFolders.rc
405 ) 405 )
406 406
410 410
411 list(APPEND SERVE_FOLDERS_RESOURCES ${AUTOGENERATED_DIR}/ServeFolders.rc) 411 list(APPEND SERVE_FOLDERS_RESOURCES ${AUTOGENERATED_DIR}/ServeFolders.rc)
412 endif() 412 endif()
413 413
414 add_library(ServeFolders SHARED 414 add_library(ServeFolders SHARED
415 ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp 415 ${CMAKE_SOURCE_DIR}/OrthancServer/Plugins/Samples/ServeFolders/Plugin.cpp
416 ${SERVE_FOLDERS_RESOURCES} 416 ${SERVE_FOLDERS_RESOURCES}
417 ) 417 )
418 418
419 target_link_libraries(ServeFolders ThirdPartyPlugins) 419 target_link_libraries(ServeFolders ThirdPartyPlugins)
420 420
439 439
440 if (ENABLE_PLUGINS AND BUILD_MODALITY_WORKLISTS) 440 if (ENABLE_PLUGINS AND BUILD_MODALITY_WORKLISTS)
441 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") 441 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
442 execute_process( 442 execute_process(
443 COMMAND 443 COMMAND
444 ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py 444 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/WindowsResources.py
445 ${ORTHANC_VERSION} ModalityWorklists ModalityWorklists.dll "Sample Orthanc plugin to serve modality worklists" 445 ${ORTHANC_VERSION} ModalityWorklists ModalityWorklists.dll "Sample Orthanc plugin to serve modality worklists"
446 ERROR_VARIABLE Failure 446 ERROR_VARIABLE Failure
447 OUTPUT_FILE ${AUTOGENERATED_DIR}/ModalityWorklists.rc 447 OUTPUT_FILE ${AUTOGENERATED_DIR}/ModalityWorklists.rc
448 ) 448 )
449 449
453 453
454 list(APPEND MODALITY_WORKLISTS_RESOURCES ${AUTOGENERATED_DIR}/ModalityWorklists.rc) 454 list(APPEND MODALITY_WORKLISTS_RESOURCES ${AUTOGENERATED_DIR}/ModalityWorklists.rc)
455 endif() 455 endif()
456 456
457 add_library(ModalityWorklists SHARED 457 add_library(ModalityWorklists SHARED
458 ${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp 458 ${CMAKE_SOURCE_DIR}/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
459 ${MODALITY_WORKLISTS_RESOURCES} 459 ${MODALITY_WORKLISTS_RESOURCES}
460 ) 460 )
461 461
462 target_link_libraries(ModalityWorklists ThirdPartyPlugins) 462 target_link_libraries(ModalityWorklists ThirdPartyPlugins)
463 463
497 -DLSB_CXX=${CMAKE_LSB_CXX} 497 -DLSB_CXX=${CMAKE_LSB_CXX}
498 ) 498 )
499 endif() 499 endif()
500 500
501 externalproject_add(ConnectivityChecks 501 externalproject_add(ConnectivityChecks
502 SOURCE_DIR "${ORTHANC_ROOT}/OrthancServer/Plugins/Samples/ConnectivityChecks" 502 SOURCE_DIR "${CMAKE_SOURCE_DIR}/OrthancServer/Plugins/Samples/ConnectivityChecks"
503 503
504 # We explicitly provide a build directory, in order to avoid paths 504 # We explicitly provide a build directory, in order to avoid paths
505 # that are too long on our Visual Studio 2008 CIS 505 # that are too long on our Visual Studio 2008 CIS
506 BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/ConnectivityChecks-build" 506 BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/ConnectivityChecks-build"
507 507
541 ## Build the companion tool to recover files compressed using Orthanc 541 ## Build the companion tool to recover files compressed using Orthanc
542 ##################################################################### 542 #####################################################################
543 543
544 if (BUILD_RECOVER_COMPRESSED_FILE) 544 if (BUILD_RECOVER_COMPRESSED_FILE)
545 set(RECOVER_COMPRESSED_SOURCES 545 set(RECOVER_COMPRESSED_SOURCES
546 ${ORTHANC_ROOT}/OrthancServer/Resources/Samples/Tools/RecoverCompressedFile.cpp 546 ${CMAKE_SOURCE_DIR}/OrthancServer/Resources/Samples/Tools/RecoverCompressedFile.cpp
547 ) 547 )
548 548
549 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") 549 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
550 execute_process( 550 execute_process(
551 COMMAND 551 COMMAND
552 ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py 552 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/OrthancFramework/Resources/WindowsResources.py
553 ${ORTHANC_VERSION} OrthancRecoverCompressedFile OrthancRecoverCompressedFile.exe 553 ${ORTHANC_VERSION} OrthancRecoverCompressedFile OrthancRecoverCompressedFile.exe
554 "Lightweight, RESTful DICOM server for medical imaging" 554 "Lightweight, RESTful DICOM server for medical imaging"
555 ERROR_VARIABLE Failure 555 ERROR_VARIABLE Failure
556 OUTPUT_FILE ${AUTOGENERATED_DIR}/OrthancRecoverCompressedFile.rc 556 OUTPUT_FILE ${AUTOGENERATED_DIR}/OrthancRecoverCompressedFile.rc
557 ) 557 )