# HG changeset patch # User Sebastien Jodogne # Date 1594029727 -7200 # Node ID 24a48e7118e5ca77be723587a479fdf19c082f95 # Parent cc42e8ca659b18d77a87488bd52da37760332ad0 simplification diff -r cc42e8ca659b -r 24a48e7118e5 CMakeLists.txt --- a/CMakeLists.txt Mon Jul 06 11:35:39 2020 +0200 +++ b/CMakeLists.txt Mon Jul 06 12:02:07 2020 +0200 @@ -54,8 +54,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") @@ -64,7 +65,6 @@ 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 ON) # Enable support for locales (notably in Boost)