Mercurial > hg > orthanc-webviewer
diff CMakeLists.txt @ 282:a8ec00ed9a9b
sync
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 04 Aug 2020 13:07:30 +0200 |
parents | c71595e893ef |
children | bb2c8c4a7945 |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Jul 07 20:43:14 2020 +0200 +++ b/CMakeLists.txt Tue Aug 04 13:07:30 2020 +0200 @@ -51,6 +51,8 @@ # Download and setup the Orthanc framework include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) +include_directories(${ORTHANC_FRAMEWORK_ROOT}) + if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system") link_libraries(${ORTHANC_FRAMEWORK_LIBRARIES}) @@ -59,7 +61,7 @@ mark_as_advanced(USE_GOOGLE_TEST_DEBIAN_PACKAGE) include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake) else() - include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkParameters.cmake) + include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkParameters.cmake) set(ENABLE_LOCALE OFF) # Disable support for locales (notably in Boost) set(ENABLE_GOOGLE_TEST ON) @@ -67,8 +69,7 @@ set(ENABLE_MODULE_JOBS OFF CACHE INTERNAL "") set(ENABLE_MODULE_DICOM OFF CACHE INTERNAL "") - include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake) - include_directories(${ORTHANC_FRAMEWORK_ROOT}/Sources) + include(${ORTHANC_FRAMEWORK_ROOT}/../Resources/CMake/OrthancFrameworkConfiguration.cmake) endif()