diff --git a/CMakeLists.txt b/CMakeLists.txt index 064598270..86da572d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,9 @@ find_package(ignition-cmake3 REQUIRED) #============================================================================ # Configure the project #============================================================================ -ign_configure_project(VERSION_SUFFIX pre1) +ign_configure_project( + REPLACE_IGNITION_INCLUDE_PATH gz/physics + VERSION_SUFFIX pre1) #============================================================================ # Set project-specific options diff --git a/bullet/CMakeLists.txt b/bullet/CMakeLists.txt index ad1af1d55..90c1e08eb 100644 --- a/bullet/CMakeLists.txt +++ b/bullet/CMakeLists.txt @@ -27,6 +27,11 @@ target_link_libraries(${bullet_plugin} # Note that plugins are currently being installed in 2 places: /lib and the engine-plugins dir install(TARGETS ${bullet_plugin} DESTINATION ${IGNITION_PHYSICS_ENGINE_INSTALL_DIR}) +# Install redirection headers +install( + DIRECTORY include/ + DESTINATION "${IGN_INCLUDE_INSTALL_DIR_FULL}") + # The library created by `ign_add_component` includes the ign-physics version # (i.e. libignition-physics1-name-plugin.so), but for portability, # we also install an unversioned symlink into the same versioned folder. diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 54ca556c0..4b2bdd7bb 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1 +1,2 @@ -add_subdirectory(ignition/physics) +add_subdirectory(gz) +install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) diff --git a/include/gz/CMakeLists.txt b/include/gz/CMakeLists.txt new file mode 100644 index 000000000..8b03bd731 --- /dev/null +++ b/include/gz/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(physics) diff --git a/tpe/CMakeLists.txt b/tpe/CMakeLists.txt index 79d410350..a66e7c3e1 100644 --- a/tpe/CMakeLists.txt +++ b/tpe/CMakeLists.txt @@ -1,2 +1,6 @@ add_subdirectory(lib) add_subdirectory(plugin) + +install( + DIRECTORY include/ + DESTINATION "${IGN_INCLUDE_INSTALL_DIR_FULL}")