Migrate CMake files

Signed-off-by: methylDragon <[email protected]>
gazebosim · May 6, 2022 · e7bc135 · e7bc135
1 parent 66b52fb
commit e7bc135
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,9 @@ set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR})
 #============================================================================
 # Set up the project
 #============================================================================
-ign_configure_project(VERSION_SUFFIX pre1)
+ign_configure_project(
+  REPLACE_IGNITION_INCLUDE_PATH gz/rendering
+  VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -31,5 +31,5 @@ if (DOXYGEN_FOUND)
     COMMENT "Generating API documentation with Doxygen" VERBATIM)
 
   install(FILES ${CMAKE_BINARY_DIR}/doc/${PROJECT_NAME_LOWER}.tag.xml
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ignition/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR})
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gz/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR})
 endif()
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/ogre/include/CMakeLists.txt b/ogre/include/CMakeLists.txt
@@ -1 +1,2 @@
-add_subdirectory(ignition/rendering)
+add_subdirectory(gz)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
diff --git a/ogre/include/gz/CMakeLists.txt b/ogre/include/gz/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(rendering)
diff --git a/ogre2/include/CMakeLists.txt b/ogre2/include/CMakeLists.txt
@@ -1 +1,2 @@
-add_subdirectory(ignition/rendering)
+add_subdirectory(gz)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
diff --git a/ogre2/include/gz/CMakeLists.txt b/ogre2/include/gz/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(rendering)
diff --git a/ogre2/src/terrain/Terra/CMakeLists.txt b/ogre2/src/terrain/Terra/CMakeLists.txt
@@ -8,7 +8,7 @@ file( GLOB_RECURSE TERRA_SOURCES
 
 add_library(${PROJECT_NAME} STATIC ${TERRA_SOURCES})
 
-if(IGN_ADD_fPIC_TO_LIBRARIES AND NOT _ign_add_library_INTERFACE)
+if(IGN_ADD_fPIC_TO_LIBRARIES AND NOT _gz_add_library_INTERFACE)
   target_compile_options(${PROJECT_NAME} PRIVATE -fPIC)
 endif()
 

diff --git a/optix/include/CMakeLists.txt b/optix/include/CMakeLists.txt
@@ -1 +1,2 @@
-add_subdirectory(ignition/rendering)
+add_subdirectory(gz)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
diff --git a/optix/include/gz/CMakeLists.txt b/optix/include/gz/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(rendering)