Merge pull request #647 from jcarpent/topic/devel

Clean CMake and update license
coal-library · Jan 11, 2025 · 09ccd5f · 09ccd5f
2 parents 5aa4305 + dff9dd8
commit 09ccd5f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git 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 "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
@@ -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)
 

diff --git 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

diff --git a/cmake b/cmake
+1 −1		.docs/examples/minimal-hpp.cmake
+8 −2		.docs/examples/minimal-with-packages.cmake
+1 −0		.gersemirc
+2 −0		.git-blame-ignore-revs
+3 −3		.pre-commit-config.yaml
+2 −1		CMakeLists.txt
+1 −1		_unittests/cpp/CMakeLists.txt
+2 −2		_unittests/dependency/CMakeLists.txt
+3 −3		_unittests/python/CMakeLists.txt
+36 −24		_unittests/test_pkg-config.cmake
+16 −13		base.cmake
+9 −147		boost.cmake
+4 −7		compiler.cmake
+4 −2		cpack.cmake
+1 −1		cxx11.cmake
+39 −25		cython/cython.cmake
+46 −30		doxygen.cmake
+2 −2		eigen.cmake
+30 −13		find-external/OpenMP/FindOpenMP.cmake
+2 −2		geometric-tools.cmake
+25 −17		header.cmake
+3 −3		ide.cmake
+2 −2		kineo.cmake
+1 −1		lapack.cmake
+3 −3		msvc-specific.cmake
+12 −9		package-config.cmake
+70 −46		pkg-config.cmake
+11 −11		post-project.cmake
+9 −6		python-helpers.cmake
+5 −5		python.cmake
+4 −4		qhull.cmake
+1 −1		relpath.cmake
+2 −2		ros.cmake
+1 −1		sdformat.cmake
+1 −1		swig.cmake
+11 −6		test.cmake
+7 −12		tracy.cmake
+1 −1		version-script.cmake
+8 −5		version.cmake
+1 −1		xacro.cmake