Blob Blame History Raw
--- CMakeLists.txt.orig	2019-11-25 17:09:54.607425486 +0100
+++ CMakeLists.txt	2019-11-25 17:10:47.340672511 +0100
@@ -10,6 +10,12 @@
 FIND_LIBRARY(ZLIB_LIBRARY NAMES z)
 FIND_LIBRARY(XLST_LIBRARY NAMES exslt)
 
+FIND_PACKAGE(GDCM REQUIRED)
+if(GDCM_FOUND)
+  message(STATUS Found GDCM)
+  include(${GDCM_USE_FILE})
+endif(GDCM_FOUND)
+
 message(STATUS LIBXML2_LIBRARY = ${LIBXML2_LIBRARY})
 message(STATUS JPEG_LIBRARY = ${JPEG_LIBRARY})
 message(STATUS ZLIB_LIBRARY = ${ZLIB_LIBRARY})
@@ -18,13 +24,13 @@
 add_executable (anonymize anonymize.cxx ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories (anonymize PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/gdcm-build/Source/DataStructureAndEncodingDefinition ${CMAKE_CURRENT_SOURCE_DIR}/gdcm-build/Source/Common ${CMAKE_CURRENT_SOURCE_DIR}/GDCM-2.8.9/Source/Common ${CMAKE_CURRENT_SOURCE_DIR}/GDCM-2.8.9/Source/MediaStorageAndFileFormat/ ${CMAKE_CURRENT_SOURCE_DIR}/GDCM-2.8.9/Source/InformationObjectDefinition/ ${CMAKE_CURRENT_SOURCE_DIR}/GDCM-2.8.9/Source/DataDictionary/ ${CMAKE_CURRENT_SOURCE_DIR}/GDCM-2.8.9/bin/Source/Common ${CMAKE_CURRENT_SOURCE_DIR}/GDCM-2.8.9/Source/DataStructureAndEncodingDefinition ${LIBXML2_INCLUDE_DIR})
 
-SET(GDCM_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/gdcm-build/bin/)
-link_directories(anonymize ${CMAKE_CURRENT_SOURCE_DIR}/gdcm-build/bin/)
-FIND_LIBRARY(COMMON_LIBRARY       NAMES gdcmCommon       PATHS ${GDCM_LIB_PATH} NO_DEFAULT_PATH)
-FIND_LIBRARY(IOD_LIBRARY       NAMES gdcmIOD       PATHS ${GDCM_LIB_PATH} NO_DEFAULT_PATH)
-FIND_LIBRARY(MSFF_LIBRARY       NAMES gdcmMSFF       PATHS ${GDCM_LIB_PATH} NO_DEFAULT_PATH)
-FIND_LIBRARY(DSED_LIBRARY       NAMES gdcmDSED       PATHS ${GDCM_LIB_PATH} NO_DEFAULT_PATH)
-FIND_LIBRARY(DICT_LIBRARY       NAMES gdcmDICT       PATHS ${GDCM_LIB_PATH} NO_DEFAULT_PATH)
+#SET(GDCM_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/gdcm-build/bin/)
+#link_directories(anonymize ${CMAKE_CURRENT_SOURCE_DIR}/gdcm-build/bin/)
+FIND_LIBRARY(COMMON_LIBRARY       NAMES gdcmCommon)
+FIND_LIBRARY(IOD_LIBRARY       NAMES gdcmIOD)
+FIND_LIBRARY(MSFF_LIBRARY       NAMES gdcmMSFF)
+FIND_LIBRARY(DSED_LIBRARY       NAMES gdcmDSED)
+FIND_LIBRARY(DICT_LIBRARY       NAMES gdcmDICT)
 
 
 #message(AUTHOR_WARNING ${COMMON_LIBRARY})