Mercurial > hg > orthanc

changeset 4043:6c6239aec462

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 Jun 2020 18:49:21 +0200
parents f5c86a00cae0
children d25f4c0fa160 7176ebf08765
files Resources/CMake/DownloadOrthancFramework.cmake
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/DownloadOrthancFramework.cmake	Wed Jun 10 16:44:29 2020 +0200
+++ b/Resources/CMake/DownloadOrthancFramework.cmake	Wed Jun 10 18:49:21 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