Migrate build files (#249)

Signed-off-by: methylDragon <methylDragon@gmail.com>

Author: methylDragon

CMakeLists.txt

@@ -14,7 +14,9 @@ find_package(ignition-cmake3 REQUIRED)
 #============================================================================
 # Configure the project
 #============================================================================
-ign_configure_project(VERSION_SUFFIX pre1)
+ign_configure_project(
+  REPLACE_IGNITION_INCLUDE_PATH gz/msgs
+  VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options
@@ -115,7 +117,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tutorials.md.in ${CMAKE_BINARY_DIR}/tutorials
 ign_create_docs(
   API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md"
   TUTORIALS_MAINPAGE_MD "${CMAKE_BINARY_DIR}/tutorials.md"
-  AUTOGENERATED_DOC "${CMAKE_BINARY_DIR}/include/ignition/msgs/"
+  AUTOGENERATED_DOC "${CMAKE_BINARY_DIR}/include/gz/msgs/"
   TAGFILES
     "${IGNITION-MATH_DOXYGEN_TAGFILE} = ${IGNITION-MATH_API_URL}"
 )

conf/CMakeLists.txt

@@ -20,4 +20,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/)

include/CMakeLists.txt

@@ -1 +1,2 @@
-add_subdirectory(ignition/msgs)
+add_subdirectory(gz)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})

include/gz/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(msgs)

proto/CMakeLists.txt

@@ -1,3 +1,8 @@
+install(
+  DIRECTORY gz
+  DESTINATION "${IGN_INCLUDE_INSTALL_DIR_FULL}"
+  COMPONENT proto
+  FILES_MATCHING PATTERN "*.proto")
 
 install(
   DIRECTORY ignition

src/CMakeLists.txt

@@ -100,12 +100,12 @@ endfunction()
 
 ##################################################
 # do the code generation
-file (GLOB proto_files ${PROJECT_SOURCE_DIR}/proto/ignition/msgs/*.proto)
+file (GLOB proto_files ${PROJECT_SOURCE_DIR}/proto/gz/msgs/*.proto)
 
 foreach(proto_file ${proto_files})
   ign_msgs_protoc(
     PROTO_PACKAGE
-      .ignition.msgs
+      .gz.msgs
     GENERATE_CPP
     GENERATE_RUBY
     INPUT_PROTO
@@ -150,24 +150,22 @@ message(STATUS "Installing Ruby messages to ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_IN
 install(FILES ${gen_ruby_scripts} DESTINATION ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ruby/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR})
 
 ign_install_includes(
-  "${IGN_INCLUDE_INSTALL_DIR_POSTFIX}/ignition/${IGN_DESIGNATION}"
+  "${IGN_INCLUDE_INSTALL_DIR_POSTFIX}/gz/${IGN_DESIGNATION}"
   ${gen_headers})
 
-
 ##################################################
-# Generate ignition/msgs/MessageTypes.hh
+# Generate gz/msgs/MessageTypes.hh
 foreach (hdr ${gen_headers})
   string(REPLACE "${PROJECT_BINARY_DIR}/include/" "" hdr ${hdr})
   string(CONCAT ign_msgs_headers ${ign_msgs_headers} "#include <${hdr}>\n")
 endforeach()
 
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/MessageTypes.hh.in
-  ${PROJECT_BINARY_DIR}/include/ignition/msgs/MessageTypes.hh)
+  ${PROJECT_BINARY_DIR}/include/gz/msgs/MessageTypes.hh)
 
 ign_install_includes(
-  "${IGN_INCLUDE_INSTALL_DIR_POSTFIX}/ignition/${IGN_DESIGNATION}"
-  "${PROJECT_BINARY_DIR}/include/ignition/${IGN_DESIGNATION}/MessageTypes.hh")
-
+  "${IGN_INCLUDE_INSTALL_DIR_POSTFIX}/gz/${IGN_DESIGNATION}"
+  "${PROJECT_BINARY_DIR}/include/gz/${IGN_DESIGNATION}/MessageTypes.hh")
 
 ##################################################
 # Build the main library

test/BUILD.bazel

@@ -22,7 +22,7 @@ MSGS_DIR = "./ign_msgs/"
 cmake_configure_file(
     name = "test_config",
     src = "test_config.h.in",
-    out = "ignition/msgs/test_config.h",
+    out = "gz/msgs/test_config.h",
     cmakelists = ["CMakeLists.txt"],
     defines = [
         "CMAKE_BINARY_DIR=%s" % (MSGS_DIR),
@@ -34,8 +34,8 @@ cmake_configure_file(
 
 cc_library(
     name = "test_utils",
-    srcs = ["ignition/msgs/test_config.h"],
-    includes = [".", "ignition"],
+    srcs = ["gz/msgs/test_config.h"],
+    includes = [".", "gz"],
 )
 
 [

test/CMakeLists.txt

@@ -5,7 +5,7 @@ include_directories (
 )
 
 configure_file (test_config.h.in
-  ${PROJECT_BINARY_DIR}/include/ignition/msgs/test_config.h)
+  ${PROJECT_BINARY_DIR}/include/gz/msgs/test_config.h)
 
 # Build gtest
 add_library(gtest STATIC gtest/src/gtest-all.cc)