From 7ec9f16c7b987ff2a8314d558d8d9da497ddd904 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 21 Mar 2024 21:43:22 +0100
Subject: [PATCH] CMake: allow use of installed JRL-cmakemodules
---
CMakeLists.txt | 37 ++++++++++++++++++++++++++++++++++---
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6a3b377..b932d7f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,9 +31,40 @@ set(PROJECT_DESCRIPTION "Classes for manipulation planning.")
set(PROJECT_USE_CMAKE_EXPORT TRUE)
set(CXX_DISABLE_WERROR TRUE)
-include(cmake/hpp.cmake)
-include(cmake/boost.cmake)
-include(cmake/test.cmake)
+# Check if the submodule cmake have been initialized
+set(JRL_CMAKE_MODULES "${CMAKE_CURRENT_LIST_DIR}/cmake")
+if(EXISTS "${JRL_CMAKE_MODULES}/base.cmake")
+ message(STATUS "JRL cmakemodules found in 'cmake/' git submodule")
+else()
+ find_package(jrl-cmakemodules QUIET CONFIG)
+ if(jrl-cmakemodules_FOUND)
+ get_property(
+ JRL_CMAKE_MODULES
+ TARGET jrl-cmakemodules::jrl-cmakemodules
+ PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+ message(STATUS "JRL cmakemodules found on system at ${JRL_CMAKE_MODULES}")
+ elseif(${CMAKE_VERSION} VERSION_LESS "3.14.0")
+ message(
+ FATAL_ERROR
+ "\nCan't find jrl-cmakemodules. Please either:\n"
+ " - use git submodule: 'git submodule update --init'\n"
+ " - or install https://github.com/jrl-umi3218/jrl-cmakemodules\n"
+ " - or upgrade your CMake version to >= 3.14 to allow automatic fetching\n"
+ )
+ else()
+ message(STATUS "JRL cmakemodules not found. Let's fetch it.")
+ include(FetchContent)
+ FetchContent_Declare(
+ "jrl-cmakemodules"
+ GIT_REPOSITORY "https://github.com/jrl-umi3218/jrl-cmakemodules.git")
+ FetchContent_MakeAvailable("jrl-cmakemodules")
+ FetchContent_GetProperties("jrl-cmakemodules" SOURCE_DIR JRL_CMAKE_MODULES)
+ endif()
+endif()
+
+include("${JRL_CMAKE_MODULES}/hpp.cmake")
+include("${JRL_CMAKE_MODULES}/boost.cmake")
+include("${JRL_CMAKE_MODULES}/test.cmake")
compute_project_args(PROJECT_ARGS LANGUAGES CXX)
project(${PROJECT_NAME} ${PROJECT_ARGS})
--
GitLab