Skip to content

Commit 23568cb

Browse files
remove variables that depend on CMAKE_BINARY_DIR being set (#398)
* remove variables that depend on CMAKE_BINARY_DIR being set * Update cmake.yml
1 parent 6e2cc03 commit 23568cb

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

.github/workflows/cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ jobs:
4848
- name: run test (Linux)
4949
if: matrix.os == 'ubuntu-latest'
5050
working-directory: ${{github.workspace}}/build
51-
run: ./bin/behaviortree_cpp_v3_test
51+
run: ./tests/behaviortree_cpp_v3_test
5252

CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,12 @@ else()
252252
set( BEHAVIOR_TREE_INC_DESTINATION include )
253253
set( BEHAVIOR_TREE_BIN_DESTINATION bin )
254254

255-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${BEHAVIOR_TREE_BIN_DESTINATION}" )
256-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${BEHAVIOR_TREE_LIB_DESTINATION}" )
257-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${BEHAVIOR_TREE_BIN_DESTINATION}" )
258255
endif()
259256

260257
message( STATUS "BEHAVIOR_TREE_LIB_DESTINATION: ${BEHAVIOR_TREE_LIB_DESTINATION} " )
261258
message( STATUS "BEHAVIOR_TREE_BIN_DESTINATION: ${BEHAVIOR_TREE_BIN_DESTINATION} " )
262-
message( STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} " )
263-
message( STATUS "CMAKE_LIBRARY_OUTPUT_DIRECTORY: ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} " )
264-
message( STATUS "CMAKE_ARCHIVE_OUTPUT_DIRECTORY: ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} " )
259+
message( STATUS "BUILD_UNIT_TESTS: ${BUILD_UNIT_TESTS} " )
260+
265261

266262
######################################################
267263
# Samples

tests/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ elseif(BUILD_UNIT_TESTS)
6262
add_custom_command(TARGET ${BEHAVIOR_TREE_LIBRARY}_test POST_BUILD
6363
COMMAND ${CMAKE_COMMAND} -E copy_directory
6464
${CMAKE_SOURCE_DIR}/tests/trees
65-
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/trees)
65+
trees)
6666

67-
add_test(BehaviorTreeCoreTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${BEHAVIOR_TREE_LIBRARY}_test)
67+
add_test(BehaviorTreeCoreTest ${BEHAVIOR_TREE_LIBRARY}_test)
6868

6969
endif()

0 commit comments

Comments
 (0)