Migrate CMake files

Signed-off-by: methylDragon <[email protected]>
gazebosim · May 6, 2022 · 75c3257 · 75c3257
1 parent 942a327
commit 75c3257
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1 @@
+add_subdirectory(physics)
diff --git 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}")