Mercurial > hg > orthanc-webviewer

diff Resources/Orthanc/CMake/DownloadOrthancFramework.cmake @ 271:d3b58d11e3ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed global variable "context_"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 30 Jun 2020 10:28:05 +0200
parents 938257eebc03
children ae2049a3616a
line wrap: on
line diff
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Wed Jun 10 18:49:07 2020 +0200
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Tue Jun 30 10:28:05 2020 +0200
@@ -399,7 +399,8 @@
   include(${CMAKE_CURRENT_LIST_DIR}/AutoGeneratedCode.cmake)
   set(EMBED_RESOURCES_PYTHON ${CMAKE_CURRENT_LIST_DIR}/EmbedResources.py)
 
-  if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+  if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" AND
+      NOT ORTHANC_FRAMEWORK_STATIC)
     # Look for mandatory dependency JsonCpp (cf. JsonCppConfiguration.cmake)
     find_path(JSONCPP_INCLUDE_DIR json/reader.h
       /usr/include/jsoncpp