diff --git a/.gitmodules b/.gitmodules index 21f4c0c7..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +0,0 @@ -[submodule "cmake"] - branch = master - path = cmake - url = https://github.com/jrl-umi3218/jrl-cmakemodules.git diff --git a/CHANGELOG.md b/CHANGELOG.md index 2391353f..b38f4a67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,8 +14,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Added Centauro ([#346](https://github.com/Gepetto/example-robot-data/pull/346)) ### Changed + - Use coal instead of hppfcl ([#374](https://github.com/Gepetto/example-robot-data/pull/374)) +### Removed + +- removed cmake submodule ([#375](https://github.com/Gepetto/example-robot-data/pull/375)) + ## [4.4.0] - 2025-09-29 - The default git branch is now devel diff --git a/CMakeLists.txt b/CMakeLists.txt index edc566f9..636af33f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,33 +28,23 @@ set(PROJECT_COMPATIBILITY_VERSION AnyNewerVersion) # 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") +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}") 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}" - ) - 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() + 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() # JRL-cmakemodule setup diff --git a/cmake b/cmake deleted file mode 160000 index 330567ca..00000000 --- a/cmake +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 330567ca8c9b342952222a1311a54dbb7ed6608f