Skip to content

Commit 53d31f3

Browse files
authored
Fix CMake error when entire ament projects are added via add_subdirectory (#484)
Signed-off-by: Silvio Traversaro <[email protected]>
1 parent c5eb2cd commit 53d31f3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ament_cmake_core/cmake/environment_hooks/ament_environment_hooks.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ function(ament_environment_hooks)
8282
get_filename_component(hook_basename "${hook}" NAME_WE)
8383
if(DEFINED AMENT_CMAKE_ENVIRONMENT_HOOKS_DESC_${hook_basename})
8484
# write .dsv file containing the descriptor of the environment hook
85-
set(dsv_file "${CMAKE_BINARY_DIR}/ament_cmake_environment_hooks/${hook_basename}.dsv")
85+
set(dsv_file "${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_environment_hooks/${hook_basename}.dsv")
8686
file(GENERATE OUTPUT "${dsv_file}" CONTENT "${AMENT_CMAKE_ENVIRONMENT_HOOKS_DESC_${hook_basename}}\n")
8787
install(
8888
FILES "${dsv_file}"

ament_cmake_core/cmake/environment_hooks/ament_generate_package_environment.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ function(ament_generate_package_environment)
102102
endforeach()
103103
endif()
104104
list(APPEND all_package_level_extensions "dsv")
105-
set(dsv_file "${CMAKE_BINARY_DIR}/ament_cmake_environment_hooks/local_setup.dsv")
105+
set(dsv_file "${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_environment_hooks/local_setup.dsv")
106106
file(GENERATE OUTPUT "${dsv_file}" CONTENT "${all_hooks}")
107107
install(
108108
FILES "${dsv_file}"
@@ -111,7 +111,7 @@ function(ament_generate_package_environment)
111111

112112
# generate package.dsv file
113113
list(SORT all_package_level_extensions)
114-
set(dsv_file "${CMAKE_BINARY_DIR}/ament_cmake_environment_hooks/package.dsv")
114+
set(dsv_file "${CMAKE_CURRENT_BINARY_DIR}/ament_cmake_environment_hooks/package.dsv")
115115
set(dsv_content "")
116116
foreach(ext ${all_package_level_extensions})
117117
set(dsv_content "${dsv_content}source;share/${PROJECT_NAME}/local_setup.${ext}\n")

0 commit comments

Comments
 (0)