# HG changeset patch # User Sebastien Jodogne # Date 1594029743 -7200 # Node ID d5b46b450b54186526389f15587ee8987ef5183f # Parent 1d360b8229732cfc74633603fac74cf6f8987e5e simplification diff -r 1d360b822973 -r d5b46b450b54 CMakeLists.txt --- a/CMakeLists.txt Mon Jul 06 11:35:31 2020 +0200 +++ b/CMakeLists.txt Mon Jul 06 12:02:23 2020 +0200 @@ -49,8 +49,9 @@ # Download and setup the Orthanc framework +include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) + if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system") - include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) link_libraries(${ORTHANC_FRAMEWORK_LIBRARIES}) set(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test") @@ -58,7 +59,6 @@ mark_as_advanced(USE_GOOGLE_TEST_DEBIAN_PACKAGE) include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/GoogleTestConfiguration.cmake) else() - include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake) include(${ORTHANC_FRAMEWORK_ROOT}/Resources/CMake/OrthancFrameworkParameters.cmake) set(ENABLE_LOCALE OFF) # Disable support for locales (notably in Boost)