comparison Resources/CMake/DcmtkConfiguration.cmake @ 104:bb50d0eb4493

fix
author jodogne
date Wed, 03 Oct 2012 16:56:14 +0200
parents f2ecbe7d50b8
children 8c0a5666b05f
comparison
equal deleted inserted replaced
103:f2ecbe7d50b8 104:bb50d0eb4493
68 -DHAVE_CONFIG_H=1 68 -DHAVE_CONFIG_H=1
69 ) 69 )
70 70
71 71
72 # Autodetection of the version of DCMTK 72 # Autodetection of the version of DCMTK
73 file(STRINGS "${DCMTK_DIR}/config/cfunix.h" DCMTK_VERSION_NUMBER 73 file(STRINGS "${DCMTK_DIR}/config/cfunix.h" DCMTK_VERSION_NUMBER1
74 REGEX ".*PACKAGE_VERSION_NUMBER.*") 74 REGEX ".*PACKAGE_VERSION .*")
75 string(REGEX REPLACE ".*PACKAGE_VERSION_NUMBER" "" DCMTK_VERSION_NUMBER1 ${DCMTK_VERSION_NUMBER}) 75 string(REGEX REPLACE ".*PACKAGE_VERSION.*\"([0-9]*)\\.([0-9]*)\\.([0-9]*)\"$" "\\1\\2\\3" DCMTK_VERSION_NUMBER ${DCMTK_VERSION_NUMBER1})
76 string(STRIP ${DCMTK_VERSION_NUMBER1} DCMTK_VERSION_NUMBER)
77 76
78 77
79 IF (EXISTS "${DCMTK_DIR}/oflog") 78 IF (EXISTS "${DCMTK_DIR}/oflog")
80 set(DCMTK_BUNDLES_LOG4CPLUS 1) 79 set(DCMTK_BUNDLES_LOG4CPLUS 1)
81 link_libraries(${DCMTK_LIBRARIES} oflog) 80 link_libraries(${DCMTK_LIBRARIES} oflog)