diff --git a/CMake/PackageDepends/MITK_DCMTK_Config.cmake b/CMake/PackageDepends/MITK_DCMTK_Config.cmake index aae8c5d348..abf39d01a2 100644 --- a/CMake/PackageDepends/MITK_DCMTK_Config.cmake +++ b/CMake/PackageDepends/MITK_DCMTK_Config.cmake @@ -1,58 +1,58 @@ if(MITK_USE_DCMTK) if(NOT DCMTK_DIR) set(DCMTK_DIR "$ENV{DCMTK_DIR}" CACHE PATH "Location of DCMTK") set(DCMTK_DIR "$ENV{DCMTK_DIR}") if(NOT DCMTK_DIR) message(FATAL_ERROR "DCMTK_DIR not set. Cannot proceed.") endif(NOT DCMTK_DIR) endif(NOT DCMTK_DIR) find_package(DCMTK) if(NOT DCMTK_FOUND) message(SEND_ERROR "DCMTK development files not found.\n Please check variables (e.g. DCMTK_DIR) for include directories and libraries.\nYou may set environment variable DCMTK_DIR before pressing 'configure'") endif(NOT DCMTK_FOUND) -if( NOT WIN32 ) +if( NOT WIN32 AND NOT APPLE ) set(MISSING_LIBS_REQUIRED_BY_DCMTK wrap tiff z) -endif( NOT WIN32 ) +endif( NOT WIN32 AND NOT APPLE ) set(QT_USE_QTSQL 1) if(EXISTS ${DCMTK_config_INCLUDE_DIR}/osconfig.h) file(READ ${DCMTK_config_INCLUDE_DIR}/osconfig.h _osconfig_h) if(NOT _osconfig_h MATCHES "PACKAGE_VERSION_NUMBER \"354\"") # message(STATUS "Found DCMTK newer that 3.5.4 ...") set(MITK_USE_DCMTK_NEWER_THAN_3_5_4 TRUE) # assume the new oflog library is located next to the others # this can be removed if FindDCMTK is adapted for 3.5.5 # treat Debug and Release separately get_filename_component(_DCMTK_lib_dir_release ${DCMTK_ofstd_LIBRARY_RELEASE} PATH) get_filename_component(_DCMTK_lib_dir_debug ${DCMTK_ofstd_LIBRARY_DEBUG} PATH) set(DCMTK_oflog_LIBRARY_RELEASE ) set(DCMTK_oflog_LIBRARY_DEBUG ) if(_DCMTK_lib_dir_release) find_library(DCMTK_oflog_LIBRARY_RELEASE oflog ${_DCMTK_lib_dir_release} ) list(APPEND DCMTK_LIBRARIES optimized ${DCMTK_oflog_LIBRARY_RELEASE} ) endif() if(_DCMTK_lib_dir_debug) find_library(DCMTK_oflog_LIBRARY_DEBUG oflog ${_DCMTK_lib_dir_debug} ) list(APPEND DCMTK_LIBRARIES debug ${DCMTK_oflog_LIBRARY_DEBUG} ) endif() endif(NOT _osconfig_h MATCHES "PACKAGE_VERSION_NUMBER \"354\"") endif(EXISTS ${DCMTK_config_INCLUDE_DIR}/osconfig.h) # # Usually all code should be adapted to DCMTK 3.6 # If necessary you could configure the MITK_USE_DCMTK_NEWER_THAN_3_5_4 variable # to configure a header file for ifdefs: # configure_file( mitkDCMTKConfig.h.in mitkDCMTKConfig.h ) list(APPEND ALL_INCLUDE_DIRECTORIES ${DCMTK_INCLUDE_DIR} ${DCMTK_DIR}/include) list(APPEND ALL_LIBRARIES ${DCMTK_LIBRARIES} ${MISSING_LIBS_REQUIRED_BY_DCMTK}) #link_directories() endif(MITK_USE_DCMTK)