Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
eigenpy
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
Stack Of Tasks
eigenpy
Commits
eab7eed3
Unverified
Commit
eab7eed3
authored
9 months ago
by
Joris Vaillant
Browse files
Options
Downloads
Patches
Plain Diff
cmake: Apply change to be compatible with workspace
parent
615b4278
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+5
-0
5 additions, 0 deletions
CMakeLists.txt
doc/Doxyfile.extra.in
+3
-3
3 additions, 3 deletions
doc/Doxyfile.extra.in
python/CMakeLists.txt
+7
-7
7 additions, 7 deletions
python/CMakeLists.txt
with
15 additions
and
10 deletions
CMakeLists.txt
+
5
−
0
View file @
eab7eed3
...
...
@@ -11,6 +11,7 @@ set(PROJECT_USE_CMAKE_EXPORT TRUE)
set
(
PROJECT_USE_KEYWORD_LINK_LIBRARIES TRUE
)
set
(
PROJECT_CUSTOM_HEADER_EXTENSION
"hpp"
)
set
(
PROJECT_COMPATIBILITY_VERSION AnyNewerVersion
)
set
(
PROJECT_AUTO_RUN_FINALIZE FALSE
)
# Check if the submodule cmake have been initialized
set
(
JRL_CMAKE_MODULES
"
${
CMAKE_CURRENT_LIST_DIR
}
/cmake"
)
...
...
@@ -344,10 +345,12 @@ set(${PROJECT_NAME}_SOURCES
add_library
(
${
PROJECT_NAME
}
SHARED
${${
PROJECT_NAME
}
_SOURCES
}
${${
PROJECT_NAME
}
_HEADERS
}
)
add_library
(
${
PROJECT_NAME
}
::
${
PROJECT_NAME
}
ALIAS
${
PROJECT_NAME
}
)
set_standard_output_directory
(
${
PROJECT_NAME
}
)
target_include_directories
(
${
PROJECT_NAME
}
SYSTEM
PUBLIC $<BUILD_INTERFACE:
${
CMAKE_CURRENT_BINARY_DIR
}
/include>
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/include>
$<INSTALL_INTERFACE:
${
CMAKE_INSTALL_INCLUDEDIR
}
>
)
modernize_target_link_libraries
(
...
...
@@ -450,3 +453,5 @@ pkg_config_append_libs(${PROJECT_NAME})
pkg_config_append_cflags
(
"-I
${
PYTHON_INCLUDE_DIRS
}
"
)
pkg_config_append_cflags
(
"-I
${
NUMPY_INCLUDE_DIRS
}
"
)
pkg_config_append_boost_libs
(
${
BOOST_COMPONENTS
}
)
setup_project_finalize
()
This diff is collapsed.
Click to expand it.
doc/Doxyfile.extra.in
+
3
−
3
View file @
eab7eed3
INPUT = @
CMAKE
_SOURCE_DIR@/src \
@
CMAKE
_SOURCE_DIR@/doc/additionalDoc
IMAGE_PATH = @
CMAKE
_SOURCE_DIR@/doc/pictures
INPUT = @
PROJECT
_SOURCE_DIR@/src \
@
PROJECT
_SOURCE_DIR@/doc/additionalDoc
IMAGE_PATH = @
PROJECT
_SOURCE_DIR@/doc/pictures
FILE_PATTERNS = *.cc *.cpp *.h *.hpp *.hxx
...
...
This diff is collapsed.
Click to expand it.
python/CMakeLists.txt
+
7
−
7
View file @
eab7eed3
...
...
@@ -12,11 +12,11 @@ make_directory("${${PROJECT_NAME}_BINARY_DIR}/python/${PROJECT_NAME}")
include
(
${
JRL_CMAKE_MODULES
}
/python-helpers.cmake
)
include
(
"
${
JRL_CMAKE_MODULES
}
/stubs.cmake"
)
add_custom_target
(
python
)
set_target_properties
(
python PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD True
)
add_custom_target
(
${
PROJECT_NAME
}
_
python
)
set_target_properties
(
${
PROJECT_NAME
}
_
python PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD True
)
add_library
(
${
PYWRAP
}
MODULE main.cpp
)
add_dependencies
(
python
${
PYWRAP
}
)
add_dependencies
(
${
PROJECT_NAME
}
_
python
${
PYWRAP
}
)
target_link_libraries
(
${
PYWRAP
}
PUBLIC
${
PROJECT_NAME
}
)
python_build_get_target
(
python_build_target
)
...
...
@@ -40,13 +40,13 @@ set_target_properties(
PROPERTIES PREFIX
""
SUFFIX
${
PYTHON_EXT_SUFFIX
}
LIBRARY_OUTPUT_DIRECTORY
"
${
CMAKE
_BINARY_DIR
}
/python/
${
PROJECT_NAME
}
"
"
${
PROJECT
_BINARY_DIR
}
/python/
${
PROJECT_NAME
}
"
LIBRARY_OUTPUT_DIRECTORY_<CONFIG>
"
${
CMAKE
_BINARY_DIR
}
/python/
${
PROJECT_NAME
}
"
"
${
PROJECT
_BINARY_DIR
}
/python/
${
PROJECT_NAME
}
"
RUNTIME_OUTPUT_DIRECTORY
"
${
CMAKE
_BINARY_DIR
}
/python/
${
PROJECT_NAME
}
"
"
${
PROJECT
_BINARY_DIR
}
/python/
${
PROJECT_NAME
}
"
RUNTIME_OUTPUT_DIRECTORY_<CONFIG>
"
${
CMAKE
_BINARY_DIR
}
/python/
${
PROJECT_NAME
}
"
)
"
${
PROJECT
_BINARY_DIR
}
/python/
${
PROJECT_NAME
}
"
)
if
(
UNIX
)
get_relative_rpath
(
${${
PYWRAP
}
_INSTALL_DIR
}
${
PYWRAP
}
_INSTALL_RPATH
)
...
...
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