Mercurial > hg > orthanc

changeset 5073:859f3668c181

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replaced macro "#warning" by "#pragma message" for Visual Studio
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 16 Aug 2022 11:06:25 +0200
parents b23a4bb18065
children fa3699115b48
files OrthancFramework/SharedLibrary/CMakeLists.txt OrthancFramework/Sources/HttpServer/HttpServer.cpp OrthancFramework/Sources/Pkcs11.cpp OrthancFramework/Sources/Toolbox.cpp
diffstat 4 files changed, 23 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/SharedLibrary/CMakeLists.txt	Mon Aug 15 22:13:39 2022 +0200
+++ b/OrthancFramework/SharedLibrary/CMakeLists.txt	Tue Aug 16 11:06:25 2022 +0200
@@ -508,6 +508,14 @@
       )
   endif()
 
+  if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK)
+    list(APPEND Flags
+      # This is necessary to compile "dcmtk/dcmdata/dctagkey.h" because of
+      # macro "DCMTK_DIAGNOSTIC_IGNORE_ATTRIBUTE_REDECLARATION"
+      -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=${DCMTK_SOURCES_DIR}/ofstd/include
+      )
+  endif()
+
   # Build the unit tests, linking them against the just-created
   # "OrthancFramework" library
   externalproject_add(UnitTests
--- a/OrthancFramework/Sources/HttpServer/HttpServer.cpp	Mon Aug 15 22:13:39 2022 +0200
+++ b/OrthancFramework/Sources/HttpServer/HttpServer.cpp	Tue Aug 16 11:06:25 2022 +0200
@@ -75,7 +75,11 @@
 #  include <openssl/err.h>
 
 #  if OPENSSL_VERSION_NUMBER < 0x30000000L
-#    warning You are linking Orthanc against OpenSSL 1.x, whose license is incompatible with the GPLv3+ used by Orthanc >= 1.10.0. Please update to OpenSSL 3.x, that uses the Apache 2 license.
+#    if defined(_MSC_VER)
+#      pragma message("You are linking Orthanc against OpenSSL 1.x, whose license is incompatible with the GPLv3+ used by Orthanc >= 1.10.0. Please update to OpenSSL 3.x, that uses the Apache 2 license.")
+#    else
+#      warning You are linking Orthanc against OpenSSL 1.x, whose license is incompatible with the GPLv3+ used by Orthanc >= 1.10.0. Please update to OpenSSL 3.x, that uses the Apache 2 license.
+#    endif
 #  endif
 
 #endif
--- a/OrthancFramework/Sources/Pkcs11.cpp	Mon Aug 15 22:13:39 2022 +0200
+++ b/OrthancFramework/Sources/Pkcs11.cpp	Tue Aug 16 11:06:25 2022 +0200
@@ -43,7 +43,11 @@
 #include <openssl/engine.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x30000000L
-#  warning You are linking Orthanc against OpenSSL 1.x, whose license is incompatible with the GPLv3+ used by Orthanc. Please update to OpenSSL 3.x, that uses the Apache 2 license.
+#  if defined(_MSC_VER)
+#    pragma message("You are linking Orthanc against OpenSSL 1.x, whose license is incompatible with the GPLv3+ used by Orthanc. Please update to OpenSSL 3.x, that uses the Apache 2 license.")
+#  else
+#    warning You are linking Orthanc against OpenSSL 1.x, whose license is incompatible with the GPLv3+ used by Orthanc. Please update to OpenSSL 3.x, that uses the Apache 2 license.
+#  endif
 #endif
 
 
--- a/OrthancFramework/Sources/Toolbox.cpp	Mon Aug 15 22:13:39 2022 +0200
+++ b/OrthancFramework/Sources/Toolbox.cpp	Tue Aug 16 11:06:25 2022 +0200
@@ -96,7 +96,11 @@
 #  include <openssl/ssl.h>
 
 #  if OPENSSL_VERSION_NUMBER < 0x30000000L
-#    warning You are linking Orthanc against OpenSSL 1.x, whose license is incompatible with the GPLv3+ used by Orthanc >= 1.10.0. Please update to OpenSSL 3.x, that uses the Apache 2 license.
+#    if defined(_MSC_VER)
+#      pragma message("You are linking Orthanc against OpenSSL 1.x, whose license is incompatible with the GPLv3+ used by Orthanc >= 1.10.0. Please update to OpenSSL 3.x, that uses the Apache 2 license.")
+#    else
+#      warning You are linking Orthanc against OpenSSL 1.x, whose license is incompatible with the GPLv3+ used by Orthanc >= 1.10.0. Please update to OpenSSL 3.x, that uses the Apache 2 license.
+#    endif
 #  endif
 
 #endif