Mercurial > hg > orthanc-webviewer
comparison Resources/Orthanc/CMake/DownloadOrthancFramework.cmake @ 271:d3b58d11e3ec
removed global variable "context_"
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 30 Jun 2020 10:28:05 +0200 |
parents | 938257eebc03 |
children | ae2049a3616a |
comparison
equal
deleted
inserted
replaced
270:3e9307f6da67 | 271:d3b58d11e3ec |
---|---|
397 include(${CMAKE_CURRENT_LIST_DIR}/Compiler.cmake) | 397 include(${CMAKE_CURRENT_LIST_DIR}/Compiler.cmake) |
398 include(${CMAKE_CURRENT_LIST_DIR}/DownloadPackage.cmake) | 398 include(${CMAKE_CURRENT_LIST_DIR}/DownloadPackage.cmake) |
399 include(${CMAKE_CURRENT_LIST_DIR}/AutoGeneratedCode.cmake) | 399 include(${CMAKE_CURRENT_LIST_DIR}/AutoGeneratedCode.cmake) |
400 set(EMBED_RESOURCES_PYTHON ${CMAKE_CURRENT_LIST_DIR}/EmbedResources.py) | 400 set(EMBED_RESOURCES_PYTHON ${CMAKE_CURRENT_LIST_DIR}/EmbedResources.py) |
401 | 401 |
402 if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") | 402 if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" AND |
403 NOT ORTHANC_FRAMEWORK_STATIC) | |
403 # Look for mandatory dependency JsonCpp (cf. JsonCppConfiguration.cmake) | 404 # Look for mandatory dependency JsonCpp (cf. JsonCppConfiguration.cmake) |
404 find_path(JSONCPP_INCLUDE_DIR json/reader.h | 405 find_path(JSONCPP_INCLUDE_DIR json/reader.h |
405 /usr/include/jsoncpp | 406 /usr/include/jsoncpp |
406 /usr/local/include/jsoncpp | 407 /usr/local/include/jsoncpp |
407 ) | 408 ) |