# HG changeset patch # User jodogne # Date 1349276174 -7200 # Node ID bb50d0eb4493b3105bb3bc95f7ea5dde0d56735a # Parent f2ecbe7d50b8312f215c8ced68cb9e846d18b84c fix diff -r f2ecbe7d50b8 -r bb50d0eb4493 Resources/CMake/DcmtkConfiguration.cmake --- a/Resources/CMake/DcmtkConfiguration.cmake Wed Oct 03 16:47:02 2012 +0200 +++ b/Resources/CMake/DcmtkConfiguration.cmake Wed Oct 03 16:56:14 2012 +0200 @@ -70,10 +70,9 @@ # Autodetection of the version of DCMTK - file(STRINGS "${DCMTK_DIR}/config/cfunix.h" DCMTK_VERSION_NUMBER - REGEX ".*PACKAGE_VERSION_NUMBER.*") - string(REGEX REPLACE ".*PACKAGE_VERSION_NUMBER" "" DCMTK_VERSION_NUMBER1 ${DCMTK_VERSION_NUMBER}) - string(STRIP ${DCMTK_VERSION_NUMBER1} DCMTK_VERSION_NUMBER) + file(STRINGS "${DCMTK_DIR}/config/cfunix.h" DCMTK_VERSION_NUMBER1 + REGEX ".*PACKAGE_VERSION .*") + string(REGEX REPLACE ".*PACKAGE_VERSION.*\"([0-9]*)\\.([0-9]*)\\.([0-9]*)\"$" "\\1\\2\\3" DCMTK_VERSION_NUMBER ${DCMTK_VERSION_NUMBER1}) IF (EXISTS "${DCMTK_DIR}/oflog")