From ba87a788fc93eec84898bf440ed92f7de7b01099 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 28 Apr 2022 15:10:48 -0700 Subject: [PATCH] Migrate CMake files Signed-off-by: methylDragon --- CMakeLists.txt | 4 +++- core/CMakeLists.txt | 3 ++- loader/conf/CMakeLists.txt | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05a1b39c..14e65800 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,9 @@ set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR}) #============================================================================ # Configure the project #============================================================================ -ign_configure_project(VERSION_SUFFIX pre0) +ign_configure_project( + REPLACE_IGNITION_INCLUDE_PATH gz/plugin + VERSION_SUFFIX pre0) #============================================================================ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index fd239c4d..75cfc2a8 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -17,4 +17,5 @@ ign_build_tests( SOURCES ${tests}) -add_subdirectory(include/ignition/plugin) +add_subdirectory(include/gz/plugin) +install(DIRECTORY include/ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) diff --git a/loader/conf/CMakeLists.txt b/loader/conf/CMakeLists.txt index bb7f7078..ede62b71 100644 --- a/loader/conf/CMakeLists.txt +++ b/loader/conf/CMakeLists.txt @@ -1,5 +1,5 @@ # Used only for internal testing. -set(ign_library_path "${CMAKE_BINARY_DIR}/test/lib/$/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}") +set(ign_library_path "${CMAKE_BINARY_DIR}/test/lib/$/ruby/gz/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}") # Generate a configuration file for internal testing. # Note that the major version of the library is included in the name. @@ -13,7 +13,7 @@ file(GENERATE INPUT "${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml.configured") # Used for the installed version. -set(ign_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}") +set(ign_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/gz/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}") # Generate the configuration file that is installed. # Note that the major version of the library is included in the name. @@ -24,4 +24,4 @@ configure_file( # Install the yaml configuration files in an unversioned location. install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml - DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/) + DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/)