Mercurial > hg > orthanc-dicomweb
changeset 65:da70170d367e
merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 13 Aug 2015 12:52:51 +0200 |
| parents | 88e551855cb2 (current diff) 146252a250d1 (diff) |
| children | 25eac9cbe5c6 |
| files | Orthanc/Core/Enumerations.h |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Thu Aug 13 12:52:32 2015 +0200 +++ b/CMakeLists.txt Thu Aug 13 12:52:51 2015 +0200 @@ -35,7 +35,8 @@ set(USE_SYSTEM_LIBJPEG ON CACHE BOOL "Use the system version of libjpeg") set(USE_SYSTEM_LIBPNG ON CACHE BOOL "Use the system version of libpng") set(USE_SYSTEM_ZLIB ON CACHE BOOL "Use the system version of zlib") -SET(USE_SYSTEM_PUGIXML ON CACHE BOOL "Use the system version of Pugixml") +set(USE_SYSTEM_PUGIXML ON CACHE BOOL "Use the system version of Pugixml") +set(USE_SYSTEM_ORTHANC_SDK ON CACHE BOOL "Use the system version of the Orthanc plugin SDK") # Distribution-specific settings set(USE_GTEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)") @@ -61,7 +62,7 @@ include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibJpegConfiguration.cmake) -if (STATIC_BUILD) +if (STATIC_BUILD OR NOT USE_SYSTEM_ORTHANC_SDK) include_directories(${ORTHANC_ROOT}/Sdk-0.9.1) else () CHECK_INCLUDE_FILE_CXX(orthanc/OrthancCPlugin.h HAVE_ORTHANC_H)