Mercurial > hg > orthanc

comparison Resources/CMake/DcmtkConfiguration.cmake @ 1634:c095b0ddeea6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improvement
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 23 Sep 2015 09:57:12 +0200
parents 17a3814fd8a1
children 0844a4bcb0ad 8c4f1de71f8d
comparison
equal deleted inserted replaced
1632:eb8fbcf008b5 1634:c095b0ddeea6
13 endif() 13 endif()
14 14
15 15
16 if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK) 16 if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK)
17 SET(DCMTK_VERSION_NUMBER 360) 17 SET(DCMTK_VERSION_NUMBER 360)
18 set(DCMTK_PACKAGE_VERSION "3.6.0")
18 SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0) 19 SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0)
19 SET(DCMTK_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.0.zip") 20 SET(DCMTK_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.0.zip")
20 SET(DCMTK_MD5 "219ad631b82031806147e4abbfba4fa4") 21 SET(DCMTK_MD5 "219ad631b82031806147e4abbfba4fa4")
21 22
22 if (IS_DIRECTORY "${DCMTK_SOURCES_DIR}") 23 if (IS_DIRECTORY "${DCMTK_SOURCES_DIR}")
28 DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}") 29 DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}")
29 30
30 IF (CMAKE_CROSSCOMPILING) 31 IF (CMAKE_CROSSCOMPILING)
31 SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.") 32 SET(C_CHAR_UNSIGNED 1 CACHE INTERNAL "Whether char is unsigned.")
32 ENDIF() 33 ENDIF()
33 SET(DCMTK_SOURCE_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0) 34 SET(DCMTK_SOURCE_DIR ${DCMTK_SOURCES_DIR})
34 include(${DCMTK_SOURCES_DIR}/CMake/CheckFunctionWithHeaderExists.cmake) 35 include(${DCMTK_SOURCES_DIR}/CMake/CheckFunctionWithHeaderExists.cmake)
35 include(${DCMTK_SOURCES_DIR}/CMake/GenerateDCMTKConfigure.cmake) 36 include(${DCMTK_SOURCES_DIR}/CMake/GenerateDCMTKConfigure.cmake)
36 37
37 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") 38 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
38 set(HAVE_SSTREAM 1) 39 set(HAVE_SSTREAM 1)
45 set(HAVE_PROTOTYPE_ACCEPT 1) 46 set(HAVE_PROTOTYPE_ACCEPT 1)
46 set(HAVE_PROTOTYPE_SETSOCKNAME 1) 47 set(HAVE_PROTOTYPE_SETSOCKNAME 1)
47 set(HAVE_PROTOTYPE_GETSOCKNAME 1) 48 set(HAVE_PROTOTYPE_GETSOCKNAME 1)
48 endif() 49 endif()
49 50
50 set(DCMTK_PACKAGE_VERSION "3.6.0")
51 set(DCMTK_PACKAGE_VERSION_SUFFIX "") 51 set(DCMTK_PACKAGE_VERSION_SUFFIX "")
52 set(DCMTK_PACKAGE_VERSION_NUMBER 360) 52 set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_VERSION_NUMBER})
53 53
54 CONFIGURE_FILE( 54 CONFIGURE_FILE(
55 ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in 55 ${DCMTK_SOURCES_DIR}/CMake/osconfig.h.in
56 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h) 56 ${DCMTK_SOURCES_DIR}/config/include/dcmtk/config/osconfig.h)
57 57
153 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc 153 ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc
154 ) 154 )
155 155
156 #set_source_files_properties(${DCMTK_SOURCES} 156 #set_source_files_properties(${DCMTK_SOURCES}
157 # PROPERTIES COMPILE_DEFINITIONS 157 # PROPERTIES COMPILE_DEFINITIONS
158 # "PACKAGE_VERSION=\"3.6.0\";PACKAGE_VERSION_NUMBER=\"360\"") 158 # "PACKAGE_VERSION=\"3.6.0\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"")
159 159
160 # This fixes crashes related to the destruction of the DCMTK OFLogger 160 # This fixes crashes related to the destruction of the DCMTK OFLogger
161 # http://support.dcmtk.org/docs-snapshot/file_macros.html 161 # http://support.dcmtk.org/docs-snapshot/file_macros.html
162 add_definitions( 162 add_definitions(
163 -DLOG4CPLUS_DISABLE_FATAL=1 163 -DLOG4CPLUS_DISABLE_FATAL=1
164 -DDCMTK_VERSION_NUMBER=360 164 -DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER}
165 ) 165 )
166 166
167 include_directories( 167 include_directories(
168 #${DCMTK_SOURCES_DIR} 168 #${DCMTK_SOURCES_DIR}
169 ${DCMTK_SOURCES_DIR}/config/include 169 ${DCMTK_SOURCES_DIR}/config/include