Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 114:b4f1191768eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 04 Oct 2012 14:35:53 +0200
parents 8c0a5666b05f
children 97d92e25c961
comparison
equal deleted inserted replaced
113:b00a6c68d529 114:b4f1191768eb
60 60
61 else() 61 else()
62 include(FindDCMTK) 62 include(FindDCMTK)
63 63
64 include_directories(${DCMTK_INCLUDE_DIR}) 64 include_directories(${DCMTK_INCLUDE_DIR})
65 link_libraries(${DCMTK_LIBRARIES} ofstd wrap) 65 link_libraries(${DCMTK_LIBRARIES} ofstd)
66 66
67 add_definitions( 67 add_definitions(
68 -DHAVE_CONFIG_H=1 68 -DHAVE_CONFIG_H=1
69 ) 69 )
70 70
78 string(REGEX REPLACE ".*PACKAGE_VERSION.*\"([0-9]*)\\.([0-9]*)\\.([0-9]*)\"$" "\\1\\2\\3" DCMTK_VERSION_NUMBER ${DCMTK_VERSION_NUMBER1}) 78 string(REGEX REPLACE ".*PACKAGE_VERSION.*\"([0-9]*)\\.([0-9]*)\\.([0-9]*)\"$" "\\1\\2\\3" DCMTK_VERSION_NUMBER ${DCMTK_VERSION_NUMBER1})
79 79
80 80
81 IF (EXISTS "${DCMTK_DIR}/oflog") 81 IF (EXISTS "${DCMTK_DIR}/oflog")
82 set(DCMTK_BUNDLES_LOG4CPLUS 1) 82 set(DCMTK_BUNDLES_LOG4CPLUS 1)
83 link_libraries(${DCMTK_LIBRARIES} oflog) 83 link_libraries(${DCMTK_LIBRARIES} oflog wrap)
84 else() 84 else()
85 set(DCMTK_BUNDLES_LOG4CPLUS 0) 85 set(DCMTK_BUNDLES_LOG4CPLUS 0)
86 endif() 86 endif()
87 endif() 87 endif()
88 88