Skip to content

Commit 09ccd5f

Browse files
authored
Merge pull request #647 from jcarpent/topic/devel
Clean CMake and update license
2 parents 5aa4305 + dff9dd8 commit 09ccd5f

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

CMakeLists.txt

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Software License Agreement (BSD License)
33
#
4-
# Copyright (c) 2014-2023 CNRS-LAAS, INRIA
4+
# Copyright (c) 2014-2025 CNRS-LAAS, INRIA
55
# Author: Florent Lamiraux, Joseph Mirabel
66
# All rights reserved.
77
#
@@ -40,6 +40,7 @@ set(PROJECT_ORG "coal-library")
4040
set(PROJECT_DESCRIPTION
4141
"Coal, The Collision Detection Library. Previously known as HPP-FCL, fork of FCL -- The Flexible Collision Library"
4242
)
43+
set(PROJECT_URL "https://github.com/coal-library/coal")
4344
SET(PROJECT_USE_CMAKE_EXPORT TRUE)
4445
SET(PROJECT_COMPATIBILITY_VERSION AnyNewerVersion)
4546
# 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")
102103
ENDIF()
103104
ENDIF()
104105

106+
include("${JRL_CMAKE_MODULES}/base.cmake")
107+
COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
108+
PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
109+
105110
include("${JRL_CMAKE_MODULES}/boost.cmake")
106111
include("${JRL_CMAKE_MODULES}/python.cmake")
107-
include("${JRL_CMAKE_MODULES}/hpp.cmake")
108112
include("${JRL_CMAKE_MODULES}/apple.cmake")
109113
include("${JRL_CMAKE_MODULES}/ide.cmake")
110114
include(CMakeDependentOption)
@@ -128,9 +132,6 @@ set_default_cmake_build_type("RelWithDebInfo")
128132
# If needed, fix CMake policy for APPLE systems
129133
APPLY_DEFAULT_APPLE_CONFIGURATION()
130134

131-
COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
132-
PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
133-
134135
OPTION(BUILD_PYTHON_INTERFACE "Build the python bindings" ON)
135136
CMAKE_DEPENDENT_OPTION(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" OFF BUILD_PYTHON_INTERFACE OFF)
136137

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Software License Agreement (BSD License)
33
Copyright (c) 2008-2014, Willow Garage, Inc.
44
Copyright (c) 2014-2015, Open Source Robotics Foundation
55
Copyright (c) 2014-2023, CNRS
6-
Copyright (c) 2018-2024, INRIA
6+
Copyright (c) 2018-2025, INRIA
77
All rights reserved.
88

99
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)