Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 115:97d92e25c961

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