Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
coal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Coal
coal
Commits
09ccd5f6
Unverified
Commit
09ccd5f6
authored
3 months ago
by
Justin Carpentier
Committed by
GitHub
3 months ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #647 from jcarpent/topic/devel
Clean CMake and update license
parents
5aa4305d
dff9dd89
No related branches found
No related tags found
No related merge requests found
Pipeline
#48829
passed
3 months ago
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+6
-5
6 additions, 5 deletions
CMakeLists.txt
LICENSE
+1
-1
1 addition, 1 deletion
LICENSE
cmake
+1
-1
1 addition, 1 deletion
cmake
with
8 additions
and
7 deletions
CMakeLists.txt
+
6
−
5
View file @
09ccd5f6
#
# Software License Agreement (BSD License)
#
# Copyright (c) 2014-202
3
CNRS-LAAS, INRIA
# Copyright (c) 2014-202
5
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
)
...
...
This diff is collapsed.
Click to expand it.
LICENSE
+
1
−
1
View file @
09ccd5f6
...
...
@@ -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-202
4
, INRIA
Copyright (c) 2018-202
5
, INRIA
All rights reserved.
Redistribution and use in source and binary forms, with or without
...
...
This diff is collapsed.
Click to expand it.
cmake
@
b8c5ab9a
Compare
f1f95f94
...
b8c5ab9a
Subproject commit
f1f95f942fabd3d4dc7e39aa7f1c20a5b0735165
Subproject commit
b8c5ab9a1acebc0504969d3c0a2cd95ed620bc89
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment