Migrate build files

Signed-off-by: methylDragon <methylDragon@gmail.com>
gazebosim · May 2, 2022 · 9b7714c · 9b7714c
1 parent 768191e
commit 9b7714c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,9 @@ find_package(ignition-cmake3 REQUIRED)
 #============================================================================
 set (c++standard 17)
 set (CMAKE_CXX_STANDARD 17)
-ign_configure_project(VERSION_SUFFIX pre1)
+ign_configure_project(
+  REPLACE_IGNITION_INCLUDE_PATH gz/math
+  VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options

diff --git a/eigen3/BUILD.bazel b/eigen3/BUILD.bazel
@@ -11,7 +11,7 @@ package(
 licenses(["notice"])
 
 public_headers = glob([
-    "include/ignition/math/eigen3/*.hh",
+    "include/gz/math/eigen3/*.hh",
 ])
 
 cc_library(

diff --git a/eigen3/include/CMakeLists.txt b/eigen3/include/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(gz)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
diff --git a/eigen3/include/gz/CMakeLists.txt b/eigen3/include/gz/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(math)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -1 +1,2 @@
-add_subdirectory(ignition)
+add_subdirectory(gz)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
diff --git a/include/gz/math/CMakeLists.txt b/include/gz/math/CMakeLists.txt
@@ -1,3 +1,3 @@
 # Exclude the detail directory from inclusion. The purpose is to prevent the detail/* header files from being included in math.hh. A side effect is that the detail headers are not installed. The next install line solves this problem.
 ign_install_all_headers(EXCLUDE_DIRS detail)
-install(DIRECTORY detail DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/ignition/${IGN_DESIGNATION})
+install(DIRECTORY detail DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/gz/${IGN_DESIGNATION})
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		add_subdirectory(gz)
		install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})