Enables ruby commands on Windows

Signed-off-by: Voldivh <eloyabmfcv@gmail.com>
gazebosim · Oct 16, 2023 · c63dbd7 · c63dbd7
1 parent f425694
commit c63dbd7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
@@ -1,12 +1,16 @@
 # Used only for internal testing.
-set(gz_library_path "${CMAKE_BINARY_DIR}/test/lib/ruby/gz/cmd${PROJECT_NAME}")
+set(gz_library_path "${CMAKE_BINARY_DIR}/test/lib/$<CONFIG>/ruby/gz/cmd${PROJECT_NAME}")
 
 # Generate a configuration file for internal testing.
 # Note that the major version of the library is included in the name.
 # Ex: sdformat0.yaml
 configure_file(
   "${PROJECT_NAME_NO_VERSION_LOWER}.yaml.in"
-    "${CMAKE_BINARY_DIR}/test/conf/${PROJECT_NAME}.yaml" @ONLY)
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.yaml.configured" @ONLY)
+
+file(GENERATE
+  OUTPUT "${CMAKE_BINARY_DIR}/test/conf/$<CONFIG>/${PROJECT_NAME}.yaml"
+  INPUT "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.yaml.configured")
 
 # Used for the installed version.
 set(gz_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/gz/cmd${PROJECT_NAME}")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -126,6 +126,4 @@ target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-if(NOT WIN32)
-  add_subdirectory(cmd)
-endif()
+add_subdirectory(cmd)
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
@@ -2,8 +2,10 @@
 # Generate the ruby script for internal testing.
 # Note that the major version of the library is included in the name.
 # Ex: cmdsdformat0.rb
-set(cmd_script_generated_test "${CMAKE_BINARY_DIR}/test/lib/ruby/gz/cmd${PROJECT_NAME}.rb")
-set(cmd_script_configured_test "${cmd_script_generated_test}.configured")
+set(cmd_script_generated_test 
+  "${CMAKE_BINARY_DIR}/test/lib/$<CONFIG>/ruby/gz/cmd${PROJECT_NAME}.rb")
+set(cmd_script_configured_test 
+  "${CMAKE_CURRENT_BINARY_DIR}/test_cmd${PROJECT_NAME}.rb.configured")
 
 # Set the library_location variable to the full path of the library file within
 # the build directory.
@@ -24,8 +26,8 @@ file(GENERATE
 # Generate the ruby script that gets installed.
 # Note that the major version of the library is included in the name.
 # Ex: cmdsdformat0.rb
-set(cmd_script_generated "${CMAKE_CURRENT_BINARY_DIR}/cmd${PROJECT_NAME}.rb")
-set(cmd_script_configured "${cmd_script_generated}.configured")
+set(cmd_script_generated "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/cmd${PROJECT_NAME}.rb")
+set(cmd_script_configured "${CMAKE_CURRENT_BINARY_DIR}/cmd${PROJECT_NAME}.rb.configured")
 
 # Set the library_location variable to the relative path to the library file
 # within the install directory structure.

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,4 +1,9 @@
-configure_file(test_config.hh.in ${PROJECT_BINARY_DIR}/include/test_config.hh)
+configure_file(test_config.hh.in ${PROJECT_BINARY_DIR}/include/test_config.hh.configured)
+
+file(GENERATE
+OUTPUT ${PROJECT_BINARY_DIR}/include/test_config.hh
+INPUT ${PROJECT_BINARY_DIR}/include/test_config.hh.configured)
+
 include_directories(
   ${PROJECT_BINARY_DIR}/include
 )

diff --git a/test/test_config.hh.in b/test/test_config.hh.in
@@ -18,7 +18,7 @@
 #ifndef SDF_TEST_CONFIG_HH_
 #define SDF_TEST_CONFIG_HH_
 
-#define GZ_CONFIG_PATH "@CMAKE_BINARY_DIR@/test/conf"
+#define GZ_CONFIG_PATH "@CMAKE_BINARY_DIR@/test/conf/$<CONFIG>"
 #define GZ_PATH "@GZ_PROGRAM@"
 #define GZ_TEST_LIBRARY_PATH "${PROJECT_BINARY_DIR}/src:"\
   "@GZ-MSGS_LIBRARY_DIRS@:"