From 4799ce14d9b07b7b8f95be2229f67527e0b34efa Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Fri, 10 Jan 2025 11:38:36 +0100 Subject: [PATCH 1/4] cmake: sync submodule --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index f1f95f942..b8c5ab9a1 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit f1f95f942fabd3d4dc7e39aa7f1c20a5b0735165 +Subproject commit b8c5ab9a1acebc0504969d3c0a2cd95ed620bc89 From 23808f8e5852eb73a1010f460bf45660b5ee47f8 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Fri, 10 Jan 2025 11:39:03 +0100 Subject: [PATCH 2/4] cmake: remove reference to hpp framework --- CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3bbc7eb11..30829f295 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # # Software License Agreement (BSD License) # -# Copyright (c) 2014-2023 CNRS-LAAS, INRIA +# Copyright (c) 2014-2025 CNRS-LAAS, INRIA # Author: Florent Lamiraux, Joseph Mirabel # All rights reserved. # @@ -40,6 +40,7 @@ set(PROJECT_ORG "coal-library") set(PROJECT_DESCRIPTION "Coal, The Collision Detection Library. Previously known as HPP-FCL, fork of FCL -- The Flexible Collision Library" ) +set(PROJECT_URL "http://github.com/coal-library/coal") SET(PROJECT_USE_CMAKE_EXPORT TRUE) SET(PROJECT_COMPATIBILITY_VERSION AnyNewerVersion) # To enable jrl-cmakemodules compatibility with workspace we must define the two @@ -102,9 +103,12 @@ IF(NOT WIN32 OR NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") ENDIF() ENDIF() +include("${JRL_CMAKE_MODULES}/base.cmake") +COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX) +PROJECT(${PROJECT_NAME} ${PROJECT_ARGS}) + include("${JRL_CMAKE_MODULES}/boost.cmake") include("${JRL_CMAKE_MODULES}/python.cmake") -include("${JRL_CMAKE_MODULES}/hpp.cmake") include("${JRL_CMAKE_MODULES}/apple.cmake") include("${JRL_CMAKE_MODULES}/ide.cmake") include(CMakeDependentOption) @@ -128,9 +132,6 @@ set_default_cmake_build_type("RelWithDebInfo") # If needed, fix CMake policy for APPLE systems APPLY_DEFAULT_APPLE_CONFIGURATION() -COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX) -PROJECT(${PROJECT_NAME} ${PROJECT_ARGS}) - OPTION(BUILD_PYTHON_INTERFACE "Build the python bindings" ON) CMAKE_DEPENDENT_OPTION(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" OFF BUILD_PYTHON_INTERFACE OFF) From 0ad790626009a7077f100c89eda00e6185866ad6 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Fri, 10 Jan 2025 11:39:26 +0100 Subject: [PATCH 3/4] license: we are in 2025 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 5bcdb5462..c548a9f23 100644 --- a/LICENSE +++ b/LICENSE @@ -3,7 +3,7 @@ Software License Agreement (BSD License) Copyright (c) 2008-2014, Willow Garage, Inc. Copyright (c) 2014-2015, Open Source Robotics Foundation Copyright (c) 2014-2023, CNRS - Copyright (c) 2018-2024, INRIA + Copyright (c) 2018-2025, INRIA All rights reserved. Redistribution and use in source and binary forms, with or without From dff9dd8927c3cbcde17bf4b08c9662c16a7333f8 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Fri, 10 Jan 2025 11:43:18 +0100 Subject: [PATCH 4/4] cmake: fix project URL --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30829f295..0ec77b4ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ set(PROJECT_ORG "coal-library") set(PROJECT_DESCRIPTION "Coal, The Collision Detection Library. Previously known as HPP-FCL, fork of FCL -- The Flexible Collision Library" ) -set(PROJECT_URL "http://github.com/coal-library/coal") +set(PROJECT_URL "https://github.com/coal-library/coal") SET(PROJECT_USE_CMAKE_EXPORT TRUE) SET(PROJECT_COMPATIBILITY_VERSION AnyNewerVersion) # To enable jrl-cmakemodules compatibility with workspace we must define the two