forked from Gepetto/robotpkg
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[math/{py-,}pinocchio] Update to v3.0.0
- Loading branch information
Showing
13 changed files
with
358 additions
and
147 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| SHA1 (pinocchio-2.7.0.tar.gz) = 87bd6f978b654c36addc1ca15109e552258dcbb0 | ||
| RMD160 (pinocchio-2.7.0.tar.gz) = 0ffde8f54f77de1c355abc9db71895737d80e53c | ||
| Size (pinocchio-2.7.0.tar.gz) = 62795168 bytes | ||
| SHA1 (patch-an) = fae437ed4e631debeee19e2aeb11932658bcd5ae | ||
| SHA1 (patch-ao) = 1159bb5ef693a8d1a9fc0d82ab181238cafc9c04 | ||
| SHA1 (pinocchio-3.0.0.tar.gz) = 72192a2ea9914c74413b6ef92f066ced802cd62f | ||
| RMD160 (pinocchio-3.0.0.tar.gz) = 53ab1059dd86c34ae9a2a71af26ef24b2119d186 | ||
| Size (pinocchio-3.0.0.tar.gz) = 100744571 bytes | ||
| SHA1 (patch-an) = 99018d12bd2a563b05685fc25fae0dad02303164 | ||
| SHA1 (patch-ao) = 82388cd763283a6d70581fdabcd1ae1035046ab8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| --- CMakeLists.txt.orig 2023-11-27 22:54:41.000000000 +0100 | ||
| +++ CMakeLists.txt 2023-11-29 12:16:04.396391509 +0100 | ||
| @@ -184,17 +184,7 @@ | ||
| --- CMakeLists.txt.orig 2024-05-27 21:47:00.000000000 +0200 | ||
| +++ CMakeLists.txt 2024-05-28 08:48:46.596303442 +0200 | ||
| @@ -297,17 +297,8 @@ | ||
| # Check whether hpp-fcl python bindings are available. | ||
| SET(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS FALSE) | ||
| IF(BUILD_PYTHON_INTERFACE) | ||
| - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import hppfcl" | ||
| set(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS FALSE) | ||
| if(BUILD_PYTHON_INTERFACE) | ||
| - execute_process( | ||
| - COMMAND ${PYTHON_EXECUTABLE} -c "import hppfcl" | ||
| - RESULT_VARIABLE _hpp_fcl_python_bindings_not_found | ||
| - OUTPUT_QUIET | ||
| - ERROR_QUIET) | ||
| - IF(_hpp_fcl_python_bindings_not_found EQUAL 0) | ||
| SET(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS TRUE) | ||
| - MESSAGE(STATUS "Found hpp-fcl Python bindings.") | ||
| - ELSE() | ||
| - MESSAGE(STATUS "hpp-fcl Python bindings NOT found.") | ||
| - ENDIF() | ||
| - UNSET(_hpp_fcl_python_bindings_not_found) | ||
| ENDIF(BUILD_PYTHON_INTERFACE) | ||
| ENDIF(BUILD_WITH_HPP_FCL_SUPPORT) | ||
| - OUTPUT_QUIET ERROR_QUIET) | ||
| - if(_hpp_fcl_python_bindings_not_found EQUAL 0) | ||
| set(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS TRUE) | ||
| message(STATUS "Found hpp-fcl Python bindings.") | ||
| - else() | ||
| - message(STATUS "hpp-fcl Python bindings NOT found.") | ||
| - endif() | ||
| - unset(_hpp_fcl_python_bindings_not_found) | ||
| endif(BUILD_PYTHON_INTERFACE) | ||
| endif(BUILD_WITH_HPP_FCL_SUPPORT) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,14 @@ | ||
| Install python headers | ||
|
|
||
| --- CMakeLists.txt.orig 2023-11-27 22:54:41.000000000 +0100 | ||
| +++ CMakeLists.txt 2023-11-29 13:51:42.402143222 +0100 | ||
| @@ -245,11 +245,9 @@ | ||
| LIST(APPEND ${PROJECT_NAME}_HEADERS | ||
| ${${PROJECT_NAME}_CORE_PUBLIC_HEADERS} | ||
| ) | ||
| -IF(BUILD_PYTHON_INTERFACE) | ||
| LIST(APPEND ${PROJECT_NAME}_HEADERS | ||
| ${${PROJECT_NAME}_BINDINGS_PYTHON_PUBLIC_HEADERS} | ||
| ) | ||
| -ENDIF(BUILD_PYTHON_INTERFACE) | ||
| --- CMakeLists.txt.orig 2024-05-28 09:00:47.000000000 +0200 | ||
| +++ CMakeLists.txt 2024-05-28 09:03:25.362491811 +0200 | ||
| @@ -406,9 +406,7 @@ | ||
| list(APPEND ${PROJECT_NAME}_HEADERS ${${PROJECT_NAME}_PARALLEL_PUBLIC_HEADERS}) | ||
| endif() | ||
|
|
||
| # Macros to update sources path in subdirs | ||
| FUNCTION(REMOVE_PATH_FROM_LIST list_name path_name dest_list) | ||
| -if(BUILD_PYTHON_INTERFACE) | ||
| list(APPEND ${PROJECT_NAME}_HEADERS ${${PROJECT_NAME}_BINDINGS_PYTHON_PUBLIC_HEADERS}) | ||
| -endif() | ||
|
|
||
| # Define PINOCCHIO_WINDOWS_DLL_PATH environment variable on Windows | ||
| function(ADD_WINDOWS_DLL_PATH_TO_TEST TEST_NAME) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| SHA1 (pinocchio-2.7.0.tar.gz) = 87bd6f978b654c36addc1ca15109e552258dcbb0 | ||
| RMD160 (pinocchio-2.7.0.tar.gz) = 0ffde8f54f77de1c355abc9db71895737d80e53c | ||
| Size (pinocchio-2.7.0.tar.gz) = 62795168 bytes | ||
| SHA1 (patch-af) = 9b5ce426d4e373598310f9861eb05247d4ab5e30 | ||
| SHA1 (patch-ag) = f182489c4b4144f3fb64ea9eebc75e091d17b55c | ||
| SHA1 (patch-ah) = 96b1b614a62b92e0077d803a8bf52548572c733d | ||
| SHA1 (patch-ak) = 13d5a86b847b0e5ca1eb3c43fb18986e0ccf6272 | ||
| SHA1 (pinocchio-3.0.0.tar.gz) = 72192a2ea9914c74413b6ef92f066ced802cd62f | ||
| RMD160 (pinocchio-3.0.0.tar.gz) = 53ab1059dd86c34ae9a2a71af26ef24b2119d186 | ||
| Size (pinocchio-3.0.0.tar.gz) = 100744571 bytes | ||
| SHA1 (patch-af) = bad5bc13f0c93ee5499a9be46d22c52ec00e781a | ||
| SHA1 (patch-ag) = 929490a70c419afe239844b87f556e3789060c63 | ||
| SHA1 (patch-ah) = 365652d212fc8b2e82c7fee33818d08541491893 | ||
| SHA1 (patch-ak) = 59ebee7b94ff79fae81702a21be3763e9502b8ba |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,88 @@ | ||
| py-pinocchio needs pinocchio | ||
|
|
||
| --- CMakeLists.txt.orig 2022-08-09 15:11:05.000000000 +0200 | ||
| +++ CMakeLists.txt 2022-08-16 12:12:11.850288528 +0200 | ||
| @@ -109,6 +108,7 @@ | ||
| --- CMakeLists.txt.orig 2024-05-27 21:47:00.000000000 +0200 | ||
| +++ CMakeLists.txt 2024-05-28 10:17:29.362489152 +0200 | ||
| @@ -183,6 +183,7 @@ | ||
| # ---------------------------------------------------- | ||
| SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/find-external/CppAD/" ${CMAKE_MODULE_PATH}) | ||
| ADD_PROJECT_DEPENDENCY(Eigen3 REQUIRED PKG_CONFIG_REQUIRES "eigen3 >= 3.0.5") | ||
| +ADD_PROJECT_DEPENDENCY(${PROJECT_NAME} REQUIRED) | ||
|
|
||
| # Variable containing all the cflags definition relative to optional dependencies | ||
| SET(CFLAGS_DEPENDENCIES) | ||
| --- bindings/python/CMakeLists.txt.orig 2022-08-16 12:11:31.000000000 +0200 | ||
| +++ bindings/python/CMakeLists.txt 2022-08-16 12:12:57.958530049 +0200 | ||
| @@ -250,7 +246,7 @@ | ||
| ADD_HEADER_GROUP(${PYWRAP}_HEADERS) | ||
| ADD_SOURCE_GROUP(${PYWRAP}_SOURCES) | ||
|
|
||
| - TARGET_LINK_LIBRARIES(${PYWRAP} PUBLIC ${PROJECT_NAME}) | ||
| + TARGET_LINK_LIBRARIES(${PYWRAP} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}) | ||
| IF(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS) | ||
| TARGET_COMPILE_DEFINITIONS(${PYWRAP} PRIVATE -DPINOCCHIO_PYTHON_INTERFACE_WITH_HPP_FCL_PYTHON_BINDINGS) | ||
| ENDIF(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS) | ||
| --- unittest/CMakeLists.txt.orig 2022-08-09 15:11:05.000000000 +0200 | ||
| +++ unittest/CMakeLists.txt 2022-08-16 12:14:21.270963591 +0200 | ||
| @@ -34,9 +34,7 @@ | ||
| ADD_TEST_CFLAGS(${NAME} "-DNOMINMAX -D_USE_MATH_DEFINES") | ||
| ENDIF(WIN32) | ||
|
|
||
| - IF(NOT unit_test_HEADER_ONLY) | ||
| - TARGET_LINK_LIBRARIES(${TEST_NAME} PUBLIC ${PROJECT_NAME}) | ||
| - ENDIF(NOT unit_test_HEADER_ONLY) | ||
| + TARGET_LINK_LIBRARIES(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}) | ||
| MODERNIZE_TARGET_LINK_LIBRARIES(${TEST_NAME} SCOPE PRIVATE | ||
| TARGETS Boost::unit_test_framework | ||
| LIBRARIES ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) | ||
| --- examples/CMakeLists.txt.orig 2024-01-23 22:01:53.000000000 +0100 | ||
| +++ examples/CMakeLists.txt 2024-01-26 14:31:14.946856249 +0100 | ||
| @@ -6,7 +6,7 @@ | ||
| GET_FILENAME_COMPONENT(EXAMPLE_NAME ${EXAMPLE} NAME) | ||
| SET(EXAMPLE_NAME "example-cpp-${EXAMPLE_NAME}") | ||
| ADD_UNIT_TEST(${EXAMPLE_NAME} "${EXAMPLE}.cpp") | ||
| - TARGET_LINK_LIBRARIES(${EXAMPLE_NAME} PUBLIC ${PROJECT_NAME}) | ||
| + TARGET_LINK_LIBRARIES(${EXAMPLE_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}) | ||
|
|
||
| # There is no RPATH in Windows, then we must use the PATH to find the DLL | ||
| IF(WIN32) | ||
| set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/find-external/CppAD/" ${CMAKE_MODULE_PATH}) | ||
| add_project_dependency(Eigen3 REQUIRED PKG_CONFIG_REQUIRES "eigen3 >= 3.0.5") | ||
| +add_project_dependency(${PROJECT_NAME} REQUIRED) | ||
|
|
||
| if(BUILD_WITH_URDF_SUPPORT) | ||
| add_project_dependency(urdfdom_headers REQUIRED) | ||
| --- bindings/python/CMakeLists.txt.orig 2024-05-27 21:47:00.000000000 +0200 | ||
| +++ bindings/python/CMakeLists.txt 2024-05-28 10:18:04.832481756 +0200 | ||
| @@ -76,7 +76,7 @@ | ||
| ${PYTHON_LIB_NAME} | ||
| SCOPE PUBLIC | ||
| TARGETS eigenpy::eigenpy) | ||
| - target_link_libraries(${PYTHON_LIB_NAME} PUBLIC ${PROJECT_NAME}) | ||
| + target_link_libraries(${PYTHON_LIB_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}) | ||
|
|
||
| if(BUILD_WITH_URDF_SUPPORT) | ||
| # Link directly against console_bridge since we bind some enums and call | ||
| --- unittest/CMakeLists.txt.orig 2024-05-27 21:47:00.000000000 +0200 | ||
| +++ unittest/CMakeLists.txt 2024-05-28 10:18:52.605797982 +0200 | ||
| @@ -70,26 +70,26 @@ | ||
| target_include_directories(${TEST_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) | ||
|
|
||
| if(NOT unit_test_HEADER_ONLY) | ||
| - target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_default) | ||
| + target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_default) | ||
| endif() | ||
|
|
||
| if(unit_test_PARSERS OR (unit_test_PARSERS_OPTIONAL AND TARGET ${PROJECT_NAME}_parsers)) | ||
| - target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_parsers) | ||
| + target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_parsers) | ||
| endif() | ||
|
|
||
| if(unit_test_PARALLEL OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}_parallel)) | ||
| - target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_parallel) | ||
| + target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_parallel) | ||
| endif() | ||
|
|
||
| if(unit_test_COLLISION OR (unit_test_COLLISION_OPTIONAL AND TARGET ${PROJECT_NAME}_collision)) | ||
| - target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_collision) | ||
| + target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_collision) | ||
| if(unit_test_PARALLE OR (unit_test_PARALLEL_OPTIONAL AND TARGET ${PROJECT_NAME}_parallel)) | ||
| - target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_collision_parallel) | ||
| + target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_collision_parallel) | ||
| endif() | ||
| endif() | ||
|
|
||
| if(unit_test_EXTRA OR (unit_test_EXTRA_OPTIONAL AND TARGET ${PROJECT_NAME}_extra)) | ||
| - target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}_extra) | ||
| + target_link_libraries(${TEST_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_extra) | ||
| endif() | ||
|
|
||
| modernize_target_link_libraries( | ||
| --- examples/CMakeLists.txt.orig 2024-05-27 21:47:00.000000000 +0200 | ||
| +++ examples/CMakeLists.txt 2024-05-28 10:19:23.895782651 +0200 | ||
| @@ -14,22 +14,22 @@ | ||
| get_filename_component(EXAMPLE_NAME ${EXAMPLE} NAME) | ||
| set(EXAMPLE_NAME "example-cpp-${EXAMPLE_NAME}") | ||
| add_unit_test(${EXAMPLE_NAME} "${EXAMPLE}.cpp") | ||
| - target_link_libraries(${EXAMPLE_NAME} PUBLIC ${PROJECT_NAME}) | ||
| + target_link_libraries(${EXAMPLE_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}) | ||
|
|
||
| if(example_PARSERS) | ||
| - target_link_libraries(${EXAMPLE_NAME} PUBLIC ${PROJECT_NAME}_parsers) | ||
| + target_link_libraries(${EXAMPLE_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_parsers) | ||
| endif() | ||
|
|
||
| if(example_CPPAD) | ||
| - target_link_libraries(${EXAMPLE_NAME} PUBLIC ${PROJECT_NAME}_cppad) | ||
| + target_link_libraries(${EXAMPLE_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_cppad) | ||
| endif() | ||
|
|
||
| if(example_CPPADCG) | ||
| - target_link_libraries(${EXAMPLE_NAME} PUBLIC ${PROJECT_NAME}_cppadcg) | ||
| + target_link_libraries(${EXAMPLE_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_cppadcg) | ||
| endif() | ||
|
|
||
| if(example_CASADI) | ||
| - target_link_libraries(${EXAMPLE_NAME} PUBLIC ${PROJECT_NAME}_casadi) | ||
| + target_link_libraries(${EXAMPLE_NAME} PUBLIC ${PROJECT_NAME}::${PROJECT_NAME}_casadi) | ||
| endif() | ||
|
|
||
| target_compile_definitions(${EXAMPLE_NAME} PRIVATE ${EXAMPLE_PRIVATE_DEFINITIONS} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| --- CMakeLists.txt.orig 2023-11-27 22:54:41.000000000 +0100 | ||
| +++ CMakeLists.txt 2023-11-29 12:21:31.652172488 +0100 | ||
| @@ -276,15 +276,9 @@ | ||
| ADD_DEFINITIONS(-DBOOST_MPL_LIMIT_LIST_SIZE=30) | ||
| ADD_DEFINITIONS(-DBOOST_MPL_LIMIT_VECTOR_SIZE=30) | ||
| --- CMakeLists.txt.orig 2024-05-27 21:47:00.000000000 +0200 | ||
| +++ CMakeLists.txt 2024-05-28 10:20:32.485738666 +0200 | ||
| @@ -430,15 +430,9 @@ | ||
| endif() | ||
| endfunction() | ||
|
|
||
| -# --- MAIN LIBRARY ------------------------------------------------------------- | ||
| -ADD_SUBDIRECTORY(src) | ||
| -add_subdirectory(src) | ||
| - | ||
| # --- BINDINGS ----------------------------------------------------------------- | ||
| ADD_SUBDIRECTORY(bindings) | ||
| add_subdirectory(bindings) | ||
|
|
||
| -# --- EXECUTABLES -------------------------------------------------------------- | ||
| -ADD_SUBDIRECTORY(utils) | ||
| -add_subdirectory(utils) | ||
| - | ||
| # --- UNIT TESTS --------------------------------------------------------------- | ||
| ADD_SUBDIRECTORY(unittest) | ||
| add_subdirectory(unittest) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,31 @@ | ||
| Don't install files already installed by pinocchio | ||
|
|
||
| --- CMakeLists.txt.orig 2022-08-09 15:11:05.000000000 +0200 | ||
| +++ CMakeLists.txt 2022-08-16 12:23:52.073950086 +0200 | ||
| @@ -9,7 +9,6 @@ | ||
| SET(PROJECT_DESCRIPTION "A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives") | ||
| SET(PROJECT_URL "http://github.com/stack-of-tasks/pinocchio") | ||
| SET(PROJECT_CUSTOM_HEADER_EXTENSION "hpp") | ||
| -SET(PROJECT_USE_CMAKE_EXPORT TRUE) | ||
| SET(PROJECT_USE_KEYWORD_LINK_LIBRARIES TRUE) | ||
|
|
||
| # Disable -Werror on Unix for now. | ||
| @@ -336,13 +335,3 @@ | ||
| FOREACH(cflags ${CFLAGS_DEPENDENCIES}) | ||
| PKG_CONFIG_APPEND_CFLAGS(${cflags}) | ||
| ENDFOREACH(cflags ${CFLAGS_DEPENDENCIES}) | ||
| --- CMakeLists.txt.orig 2024-05-27 21:47:00.000000000 +0200 | ||
| +++ CMakeLists.txt 2024-05-28 10:22:24.912306337 +0200 | ||
| @@ -11,7 +11,6 @@ | ||
| ) | ||
| set(PROJECT_URL "http://github.com/stack-of-tasks/pinocchio") | ||
| set(PROJECT_CUSTOM_HEADER_EXTENSION "hpp") | ||
| -set(PROJECT_USE_CMAKE_EXPORT TRUE) | ||
| set(PROJECT_USE_KEYWORD_LINK_LIBRARIES TRUE) | ||
| set(PROJECT_COMPATIBILITY_VERSION AnyNewerVersion) | ||
| set(PINOCCHIO_PROJECT_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}) | ||
| @@ -499,18 +498,3 @@ | ||
| endforeach() | ||
| pkg_config_append_cflags("${CFLAGS_DEPENDENCIES}") | ||
| pkg_config_append_cflags("${CFLAGS_OPTIONS}") | ||
| - | ||
| -# Install catkin package.xml | ||
| -INSTALL(FILES package.xml DESTINATION share/${PROJECT_NAME}) | ||
| -install(FILES package.xml DESTINATION share/${PROJECT_NAME}) | ||
| -# Allows Colcon to find non-Ament packages when using workspace underlays | ||
| -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME} "") | ||
| -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME} DESTINATION share/ament_index/resource_index/packages) | ||
| -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv "prepend-non-duplicate;AMENT_PREFIX_PATH;") | ||
| -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv DESTINATION share/${PROJECT_NAME}/hook) | ||
| -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv "prepend-non-duplicate;PYTHONPATH;${PYTHON_SITELIB}") | ||
| -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv DESTINATION share/${PROJECT_NAME}/hook) | ||
| -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME} | ||
| - DESTINATION share/ament_index/resource_index/packages) | ||
| -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv | ||
| - "prepend-non-duplicate;AMENT_PREFIX_PATH;") | ||
| -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv | ||
| - DESTINATION share/${PROJECT_NAME}/hook) | ||
| -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv | ||
| - "prepend-non-duplicate;PYTHONPATH;${PYTHON_SITELIB}") | ||
| -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv | ||
| - DESTINATION share/${PROJECT_NAME}/hook) |