Mercurial > hg > orthanc
comparison Resources/CMake/DcmtkConfiguration.cmake @ 117:0c5902cfe9db
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 04 Oct 2012 14:57:54 +0200 |
parents | 5dce26a8d045 |
children | 1058c115aed1 |
comparison
equal
deleted
inserted
replaced
116:5dce26a8d045 | 117:0c5902cfe9db |
---|---|
64 set(DCMTK_INCLUDE_DIR ${DCMTK_DIR}) | 64 set(DCMTK_INCLUDE_DIR ${DCMTK_DIR}) |
65 | 65 |
66 #message(${DCMTK_LIBRARIES}) | 66 #message(${DCMTK_LIBRARIES}) |
67 | 67 |
68 include_directories(${DCMTK_INCLUDE_DIR}) | 68 include_directories(${DCMTK_INCLUDE_DIR}) |
69 link_libraries(dcmdata dcmnet wrap) | 69 link_libraries(dcmdata dcmnet wrap ofstd) |
70 | 70 |
71 add_definitions( | 71 add_definitions( |
72 -DHAVE_CONFIG_H=1 | 72 -DHAVE_CONFIG_H=1 |
73 ) | 73 ) |
74 | 74 |
82 string(REGEX REPLACE ".*PACKAGE_VERSION.*\"([0-9]*)\\.([0-9]*)\\.([0-9]*)\"$" "\\1\\2\\3" DCMTK_VERSION_NUMBER ${DCMTK_VERSION_NUMBER1}) | 82 string(REGEX REPLACE ".*PACKAGE_VERSION.*\"([0-9]*)\\.([0-9]*)\\.([0-9]*)\"$" "\\1\\2\\3" DCMTK_VERSION_NUMBER ${DCMTK_VERSION_NUMBER1}) |
83 | 83 |
84 | 84 |
85 IF (EXISTS "${DCMTK_DIR}/oflog") | 85 IF (EXISTS "${DCMTK_DIR}/oflog") |
86 set(DCMTK_BUNDLES_LOG4CPLUS 1) | 86 set(DCMTK_BUNDLES_LOG4CPLUS 1) |
87 link_libraries(ofstd oflog) | 87 link_libraries(oflog) |
88 else() | 88 else() |
89 set(DCMTK_BUNDLES_LOG4CPLUS 0) | 89 set(DCMTK_BUNDLES_LOG4CPLUS 0) |
90 endif() | 90 endif() |
91 endif() | 91 endif() |
92 | 92 |