comparison Resources/CMake/OrthancFrameworkConfiguration.cmake @ 2512:4dcafa8d6633

SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 28 Mar 2018 15:20:50 +0200
parents 8a0d3044ef53
children 97a74f0eac7a
comparison
equal deleted inserted replaced
2511:8a0d3044ef53 2512:4dcafa8d6633
357 ##################################################################### 357 #####################################################################
358 ## Inclusion of mandatory third-party dependencies 358 ## Inclusion of mandatory third-party dependencies
359 ##################################################################### 359 #####################################################################
360 360
361 include(${CMAKE_CURRENT_LIST_DIR}/JsonCppConfiguration.cmake) 361 include(${CMAKE_CURRENT_LIST_DIR}/JsonCppConfiguration.cmake)
362 362 include(${CMAKE_CURRENT_LIST_DIR}/UuidConfiguration.cmake)
363 if (NOT ORTHANC_SANDBOXED)
364 include(${CMAKE_CURRENT_LIST_DIR}/UuidConfiguration.cmake)
365 endif()
366 363
367 # We put Boost as the last dependency, as it is the heaviest to 364 # We put Boost as the last dependency, as it is the heaviest to
368 # configure, which allows to quickly spot problems when configuring 365 # configure, which allows to quickly spot problems when configuring
369 # static builds in other dependencies 366 # static builds in other dependencies
370 include(${CMAKE_CURRENT_LIST_DIR}/BoostConfiguration.cmake) 367 include(${CMAKE_CURRENT_LIST_DIR}/BoostConfiguration.cmake)
394 else() 391 else()
395 add_definitions(-DORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS=0) 392 add_definitions(-DORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS=0)
396 endif() 393 endif()
397 394
398 set(ORTHANC_DICOM_SOURCES_INTERNAL 395 set(ORTHANC_DICOM_SOURCES_INTERNAL
399 ${ORTHANC_ROOT}/Core/DicomParsing/DicomDirWriter.cpp
400 ${ORTHANC_ROOT}/Core/DicomParsing/DicomModification.cpp 396 ${ORTHANC_ROOT}/Core/DicomParsing/DicomModification.cpp
401 ${ORTHANC_ROOT}/Core/DicomParsing/FromDcmtkBridge.cpp 397 ${ORTHANC_ROOT}/Core/DicomParsing/FromDcmtkBridge.cpp
402 ${ORTHANC_ROOT}/Core/DicomParsing/ParsedDicomFile.cpp 398 ${ORTHANC_ROOT}/Core/DicomParsing/ParsedDicomFile.cpp
403 ${ORTHANC_ROOT}/Core/DicomParsing/ToDcmtkBridge.cpp 399 ${ORTHANC_ROOT}/Core/DicomParsing/ToDcmtkBridge.cpp
404 400
475 -DORTHANC_ENABLE_LOGGING_STDIO=0 471 -DORTHANC_ENABLE_LOGGING_STDIO=0
476 ) 472 )
477 473
478 list(APPEND ORTHANC_CORE_SOURCES_INTERNAL 474 list(APPEND ORTHANC_CORE_SOURCES_INTERNAL
479 ${ORTHANC_ROOT}/Core/Cache/SharedArchive.cpp 475 ${ORTHANC_ROOT}/Core/Cache/SharedArchive.cpp
476 ${ORTHANC_ROOT}/Core/DicomParsing/DicomDirWriter.cpp
480 ${ORTHANC_ROOT}/Core/FileStorage/FilesystemStorage.cpp 477 ${ORTHANC_ROOT}/Core/FileStorage/FilesystemStorage.cpp
481 ${ORTHANC_ROOT}/Core/FileStorage/StorageAccessor.cpp 478 ${ORTHANC_ROOT}/Core/FileStorage/StorageAccessor.cpp
482 ${ORTHANC_ROOT}/Core/MultiThreading/BagOfTasksProcessor.cpp 479 ${ORTHANC_ROOT}/Core/MultiThreading/BagOfTasksProcessor.cpp
483 ${ORTHANC_ROOT}/Core/MultiThreading/Mutex.cpp 480 ${ORTHANC_ROOT}/Core/MultiThreading/Mutex.cpp
484 ${ORTHANC_ROOT}/Core/MultiThreading/ReaderWriterLock.cpp 481 ${ORTHANC_ROOT}/Core/MultiThreading/ReaderWriterLock.cpp