From 7b5ff72987d413c0051744cf53b453f70f160f6f Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 21 Oct 2015 18:20:08 +0200 Subject: [PATCH] Add option to use FindDCMTK modules or not. --- CMakeLists.txt | 10 +++++++++- example/CMakeLists.txt | 2 +- src/CMakeLists.txt | 8 ++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 281e5df..1cde67e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.0.2) project(QTDCM VERSION "2.1.0") @@ -14,6 +14,14 @@ else() endif() mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH) +option(DCMTK_FIND_PACKAGE_USE_CONFIG_ONLY + "Do not use any FindDCMTK.cmake module found in the CMAKE_MODULE_PATH to find DCMTK." + OFF) + +if(DCMTK_FIND_PACKAGE_USE_CONFIG_ONLY) + set(DCMTK_FIND_PACKAGE_STATEGY NO_MODULE) +endif() + set(${PROJECT_NAME}_CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${${PROJECT_NAME}_CMAKE_MODULE_PATH}") diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 721a25c..d3fbf2d 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.0.2) project(dicom) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index af5c962..cdb4462 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.0.2) project(qtdcm) @@ -7,10 +7,10 @@ find_package( Qt5 REQUIRED COMPONENTS Core Widgets Network) get_target_property(QT5_QMAKE_EXECUTABLE Qt5::qmake LOCATION) get_filename_component(QT5_BINARY_DIR ${QT5_QMAKE_EXECUTABLE} PATH) -find_package(DCMTK REQUIRED) +find_package(DCMTK REQUIRED ${DCMTK_FIND_PACKAGE_STATEGY}) include_directories(${DCMTK_INCLUDE_DIRS}) -if(APPLE) +if(APPLE AND NOT DCMTK_FIND_PACKAGE_USE_CONFIG_ONLY) include(FixDCMTKMacInstall) FixDCMTKMacInstall() endif() @@ -146,7 +146,7 @@ target_link_libraries(${PROJECT_NAME} ${${PROJECT_NAME}_LIBRARIES}) source_group("Header Files" REGULAR_EXPRESSION .*\\.h\$) source_group("Generated Files" FILES ${${PROJECT_NAME}_MOC_SRCS}) -if(APPLE) +if(APPLE AND NOT DCMTK_FIND_PACKAGE_USE_CONFIG_ONLY) include(FixDCMTKMacLink) FixDCMTKMacLibLink(${PROJECT_NAME}) endif()