# HG changeset patch # User Sebastien Jodogne # Date 1478701083 -3600 # Node ID 41b70d5b44c99f0af0a1e7e95c5dd342f8db3fac # Parent 595cf22b3e7e200962fc74a27902511b9cf32ead fix diff -r 595cf22b3e7e -r 41b70d5b44c9 Core/DicomFormat/DicomValue.h --- a/Core/DicomFormat/DicomValue.h Wed Nov 09 15:07:50 2016 +0100 +++ b/Core/DicomFormat/DicomValue.h Wed Nov 09 15:18:03 2016 +0100 @@ -35,6 +35,11 @@ #include #include +#if !defined(ORTHANC_ENABLE_BASE64) +# error The macro ORTHANC_ENABLE_BASE64 must be defined +#endif + + namespace Orthanc { class DicomValue : public boost::noncopyable @@ -78,7 +83,7 @@ DicomValue* Clone() const; -#if !defined(ORTHANC_ENABLE_BASE64) || ORTHANC_ENABLE_BASE64 == 1 +#if ORTHANC_ENABLE_BASE64 == 1 void FormatDataUriScheme(std::string& target, const std::string& mime) const; diff -r 595cf22b3e7e -r 41b70d5b44c9 Plugins/Samples/Common/OrthancPlugins.cmake --- a/Plugins/Samples/Common/OrthancPlugins.cmake Wed Nov 09 15:07:50 2016 +0100 +++ b/Plugins/Samples/Common/OrthancPlugins.cmake Wed Nov 09 15:18:03 2016 +0100 @@ -17,7 +17,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") # Linking with "pthread" is necessary, otherwise the software crashes # http://sourceware.org/bugzilla/show_bug.cgi?id=10652#c17 - link_libraries(dl rt) + link_libraries(dl rt pthread) endif() diff -r 595cf22b3e7e -r 41b70d5b44c9 Plugins/Samples/DatabasePlugin/CMakeLists.txt --- a/Plugins/Samples/DatabasePlugin/CMakeLists.txt Wed Nov 09 15:07:50 2016 +0100 +++ b/Plugins/Samples/DatabasePlugin/CMakeLists.txt Wed Nov 09 15:18:03 2016 +0100 @@ -29,10 +29,11 @@ add_definitions( -DORTHANC_SQLITE_STANDALONE=1 + -DORTHANC_ENABLE_BASE64=0 -DORTHANC_ENABLE_LOGGING=0 - -DORTHANC_ENABLE_BASE64=0 -DORTHANC_ENABLE_MD5=0 -DORTHANC_ENABLE_PLUGINS=1 + -DORTHANC_ENABLE_PUGIXML=0 -DSAMPLE_DATABASE_VERSION="${SAMPLE_DATABASE_VERSION}" )