Mercurial > hg > orthanc-wsi
changeset 126:e7c049a61e9a
sync
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 02 Feb 2018 17:35:39 +0100 |
parents | 7a3f4d580625 |
children | 2cb9fabb529e |
files | Resources/Orthanc/Core/DicomParsing/FromDcmtkBridge.cpp Resources/Orthanc/Core/HttpClient.cpp Resources/Orthanc/Resources/CMake/BoostConfiguration.cmake Resources/Orthanc/Resources/CMake/Compiler.cmake |
diffstat | 4 files changed, 20 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/Orthanc/Core/DicomParsing/FromDcmtkBridge.cpp Fri Feb 02 17:34:35 2018 +0100 +++ b/Resources/Orthanc/Core/DicomParsing/FromDcmtkBridge.cpp Fri Feb 02 17:35:39 2018 +0100 @@ -1074,6 +1074,7 @@ } else { + LOG(INFO) << "Unknown DICOM tag: \"" << name << "\""; throw OrthancException(ErrorCode_UnknownDicomTag); } #endif
--- a/Resources/Orthanc/Core/HttpClient.cpp Fri Feb 02 17:34:35 2018 +0100 +++ b/Resources/Orthanc/Core/HttpClient.cpp Fri Feb 02 17:35:39 2018 +0100 @@ -84,7 +84,12 @@ #endif static CURLcode OrthancHttpClientPerformSSL(CURL* curl, long* status) { +#if ORTHANC_ENABLE_SSL == 1 return GetHttpStatus(curl_easy_perform(curl), curl, status); +#else + LOG(ERROR) << "Orthanc was compiled without SSL support, cannot make HTTPS request"; + throw OrthancException(ErrorCode_InternalError); +#endif } }
--- a/Resources/Orthanc/Resources/CMake/BoostConfiguration.cmake Fri Feb 02 17:34:35 2018 +0100 +++ b/Resources/Orthanc/Resources/CMake/BoostConfiguration.cmake Fri Feb 02 17:35:39 2018 +0100 @@ -11,10 +11,22 @@ list(APPEND ORTHANC_BOOST_COMPONENTS locale) endif() - find_package(Boost - COMPONENTS filesystem thread system date_time regex ${ORTHANC_BOOST_COMPONENTS}) + list(APPEND ORTHANC_BOOST_COMPONENTS filesystem thread system date_time regex) + find_package(Boost COMPONENTS "${ORTHANC_BOOST_COMPONENTS}") if (NOT Boost_FOUND) + foreach (item ${ORTHANC_BOOST_COMPONENTS}) + string(TOUPPER ${item} tmp) + + if (Boost_${tmp}_FOUND) + set(tmp2 "found") + else() + set(tmp2 "missing") + endif() + + message("Boost component ${item} - ${tmp2}") + endforeach() + message(FATAL_ERROR "Unable to locate Boost on this system") endif()
--- a/Resources/Orthanc/Resources/CMake/Compiler.cmake Fri Feb 02 17:34:35 2018 +0100 +++ b/Resources/Orthanc/Resources/CMake/Compiler.cmake Fri Feb 02 17:35:39 2018 +0100 @@ -180,10 +180,6 @@ if (DEFINED ENABLE_PROFILING AND ENABLE_PROFILING) - if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") - message(WARNING "Enabling profiling on a non-debug build will not produce full information") - endif() - if (CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg")