Mercurial > hg > orthanc
changeset 1943:bc949ea71fe6
Fix of Debian bug #818512 ("FTBFS: Please install libdcmtk*-dev")
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 04 Apr 2016 13:17:08 +0200 |
| parents | cc9901a98099 |
| children | 1a5e070a21c3 |
| files | NEWS Resources/CMake/DcmtkConfiguration.cmake |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Fri Mar 25 11:28:52 2016 +0100 +++ b/NEWS Mon Apr 04 13:17:08 2016 +0200 @@ -12,6 +12,7 @@ * Fix issue 11 (is_regular_file() fails for FILE_ATTRIBUTE_REPARSE_POINT) * Upgrade to Boost 1.60.0 for static builds * Support of signed 16bpp images in ParsedDicomFile +* Fix of Debian bug #818512 ("FTBFS: Please install libdcmtk*-dev") Version 1.0.0 (2015/12/15)
--- a/Resources/CMake/DcmtkConfiguration.cmake Fri Mar 25 11:28:52 2016 +0100 +++ b/Resources/CMake/DcmtkConfiguration.cmake Mon Apr 04 13:17:08 2016 +0200 @@ -201,16 +201,16 @@ include(FindDCMTK) list(APPEND DCMTK_LIBRARIES "${tmp}") - include_directories(${DCMTK_INCLUDE_DIR}) + include_directories(${DCMTK_INCLUDE_DIRS}) add_definitions( -DHAVE_CONFIG_H=1 ) - if (EXISTS "${DCMTK_DIR}/config/cfunix.h") - set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h") - elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h") # This is for Arch Linux - set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h") + if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h") + set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h") + elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h") # This is for Arch Linux + set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h") else() message(FATAL_ERROR "Please install libdcmtk*-dev") endif()