From d6261a87bdb829e4f6efdcd0a8d85c849cc556aa Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Tue, 8 Oct 2024 14:29:11 -0600 Subject: [PATCH] Renaming release deps and removing develop deps --- CMakeLists.txt | 20 ++---------- ..._dependencies.cmake => dependencies.cmake} | 1 - cmake/develop_dependencies.cmake | 31 ------------------- 3 files changed, 2 insertions(+), 50 deletions(-) rename cmake/{release_dependencies.cmake => dependencies.cmake} (93%) delete mode 100644 cmake/develop_dependencies.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index b896fd18..d1df81e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,24 +47,8 @@ option( ENDFtk.installation "Install ENDFtk" ON ) # Dependencies ######################################################################## -set( REPOSITORIES "release" - CACHE STRING - "Options for where to fetch repositories: develop, release, local" - ) - -message( STATUS "Using ${REPOSITORIES} repositories" ) - -if( REPOSITORIES STREQUAL "develop" ) - include( cmake/develop_dependencies.cmake ) - -elseif( REPOSITORIES STREQUAL "release" ) - include( cmake/release_dependencies.cmake ) - -elseif( REPOSITORIES STREQUAL "local" ) - include( cmake/local_dependencies.cmake ) - -endif() - +list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/.cmake) +include( cmake/dependencies.cmake ) ######################################################################## # Project targets diff --git a/cmake/release_dependencies.cmake b/cmake/dependencies.cmake similarity index 93% rename from cmake/release_dependencies.cmake rename to cmake/dependencies.cmake index d10d7a66..eb68fc2c 100644 --- a/cmake/release_dependencies.cmake +++ b/cmake/dependencies.cmake @@ -1,5 +1,4 @@ cmake_minimum_required( VERSION 3.27 ) -list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/.cmake) include( FetchContent ) FetchContent_Declare( tools diff --git a/cmake/develop_dependencies.cmake b/cmake/develop_dependencies.cmake deleted file mode 100644 index 551c80b9..00000000 --- a/cmake/develop_dependencies.cmake +++ /dev/null @@ -1,31 +0,0 @@ -cmake_minimum_required( VERSION 3.14 ) -include( FetchContent ) - -####################################################################### -# Declare project dependencies -####################################################################### - -FetchContent_Declare( tools - GIT_REPOSITORY https://github.com/njoy/tools - GIT_TAG develop - GIT_SHALLOW TRUE - ) - -FetchContent_Declare( Catch2 - GIT_REPOSITORY https://github.com/catchorg/Catch2 - GIT_TAG v3.3.2 - GIT_SHALLOW TRUE - ) - -FetchContent_Declare( pybind11 - GIT_REPOSITORY https://github.com/pybind/pybind11 - GIT_TAG v2.10.4 - ) - -####################################################################### -# Load dependencies -####################################################################### - -FetchContent_MakeAvailable( - tools - )