Mercurial > hg > orthanc
changeset 3653:468181e2f090
Fix issue #166 (CMake find_boost version is now broken with newer boost/cmake)
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 05 Feb 2020 15:23:22 +0100 |
| parents | 46cb00e4adbb |
| children | e7248fa2738f |
| files | Core/DicomFormat/DicomMap.cpp NEWS Resources/CMake/BoostConfiguration.cmake |
| diffstat | 3 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/DicomFormat/DicomMap.cpp Wed Feb 05 13:22:02 2020 +0100 +++ b/Core/DicomFormat/DicomMap.cpp Wed Feb 05 15:23:22 2020 +0100 @@ -1367,8 +1367,6 @@ throw OrthancException(ErrorCode_BadFileFormat); } - Clear(); - std::map<std::string, DicomTag2> mainTags; // TODO - Create a singleton to hold this map LoadMainDicomTags(mainTags, level);
--- a/NEWS Wed Feb 05 13:22:02 2020 +0100 +++ b/NEWS Wed Feb 05 15:23:22 2020 +0100 @@ -23,6 +23,7 @@ Therefore, the "ClearCanvas" and "Dcm4Chee" modality manufacturer have now been deprecated. * Fix issue #156 (Chunked Dicom-web transfer uses 100% CPU) * Fix issue #165 (Boundary parameter in multipart Content-Type is too long) +* Fix issue #166 (CMake find_boost version is now broken with newer boost/cmake) Version 1.5.8 (2019-10-16)
--- a/Resources/CMake/BoostConfiguration.cmake Wed Feb 05 13:22:02 2020 +0100 +++ b/Resources/CMake/BoostConfiguration.cmake Wed Feb 05 15:23:22 2020 +0100 @@ -30,9 +30,20 @@ message(FATAL_ERROR "Unable to locate Boost on this system") endif() + + # Patch by xnox to fix issue #166 (CMake find_boost version is now + # broken with newer boost/cmake) + # https://bitbucket.org/sjodogne/orthanc/issues/166/ + if (POLICY CMP0093) + set(BOOST144 1.44) + else() + set(BOOST144 104400) + endif() + + # Boost releases 1.44 through 1.47 supply both V2 and V3 filesystem # http://www.boost.org/doc/libs/1_46_1/libs/filesystem/v3/doc/index.htm - if (${Boost_VERSION} LESS 104400) + if (${Boost_VERSION} LESS ${BOOST144}) add_definitions( -DBOOST_HAS_FILESYSTEM_V3=0 )