From 3ebdd9c8fcf39d2bbdd931475360d6535803451b Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 13 Mar 2024 13:32:35 +0100
Subject: [PATCH] CMake: allow use of installed jrl-cmakemodule
---
CMakeLists.txt | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca501ed7..1fc16e5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,11 +14,23 @@ set(PROJECT_COMPATIBILITY_VERSION AnyNewerVersion)
# Check if the submodule cmake have been initialized
set(JRL_CMAKE_MODULES "${CMAKE_CURRENT_LIST_DIR}/cmake")
-if(NOT EXISTS "${CMAKE_SOURCE_DIR}/cmake/base.cmake")
- if(${CMAKE_VERSION} VERSION_LESS "3.14.0")
+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
- "\nPlease run the following command first:\ngit submodule update --init\n"
+ "\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.")
--
GitLab