Skip to content

Commit 9b7714c

Browse files
committed
Migrate build files
Signed-off-by: methylDragon <methylDragon@gmail.com>
1 parent 768191e commit 9b7714c

6 files changed

Lines changed: 10 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ find_package(ignition-cmake3 REQUIRED)
1616
#============================================================================
1717
set (c++standard 17)
1818
set (CMAKE_CXX_STANDARD 17)
19-
ign_configure_project(VERSION_SUFFIX pre1)
19+
ign_configure_project(
20+
REPLACE_IGNITION_INCLUDE_PATH gz/math
21+
VERSION_SUFFIX pre1)
2022

2123
#============================================================================
2224
# Set project-specific options

eigen3/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ package(
1111
licenses(["notice"])
1212

1313
public_headers = glob([
14-
"include/ignition/math/eigen3/*.hh",
14+
"include/gz/math/eigen3/*.hh",
1515
])
1616

1717
cc_library(

eigen3/include/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
add_subdirectory(gz)
2+
install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})

eigen3/include/gz/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
add_subdirectory(math)

include/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
add_subdirectory(ignition)
1+
add_subdirectory(gz)
2+
install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})

include/gz/math/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# 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.
22
ign_install_all_headers(EXCLUDE_DIRS detail)
3-
install(DIRECTORY detail DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/ignition/${IGN_DESIGNATION})
3+
install(DIRECTORY detail DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/gz/${IGN_DESIGNATION})

0 commit comments

Comments
 (0)