Merge branch 'update/cmake' into 'develop'

Renaming release deps and removing develop deps See merge request njoy/ENDFtk!2
njoy · Oct 9, 2024 · 2cb6834 · 2cb6834
2 parents 6c6cb9d + d6261a8
commit 2cb6834
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 50 deletions.
diff --git 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 → cmake/dependencies.cmake b/cmake/release_dependencies.cmake → 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