Skip to content

Commit

Permalink
set append_library_dir inside the macro to avoid accumulating values …
Browse files Browse the repository at this point in the history
…over macro calls

Signed-off-by: Mikael Arguedas <[email protected]>
  • Loading branch information
mikaelarguedas committed Aug 25, 2020
1 parent f9c4233 commit 4d72c71
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions test_security/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,11 @@ if(BUILD_TESTING)
set(ENV_PATH "$ENV{PATH}")
file(TO_CMAKE_PATH "${ENV_PATH}" ENV_PATH)
set(TEST_PATH "${ENV_PATH}")
set(append_library_dirs "${CMAKE_CURRENT_BINARY_DIR}")
if(WIN32)
set(append_library_dirs "${append_library_dirs}/$<CONFIG>")
endif()

if(rmw_implementation STREQUAL "rmw_connext_cpp")
# Connext 5.3.1 needs RTI's OpenSSL binaries (based on EOL 1.0.2) to be
# on the PATH at runtime as the system version of OpenSSL is not supported
Expand Down Expand Up @@ -316,11 +321,6 @@ if(BUILD_TESTING)
custom_executable(test_secure_subscriber_cpp
"test/test_secure_subscriber.cpp")

set(append_library_dirs "${CMAKE_CURRENT_BINARY_DIR}")
if(WIN32)
set(append_library_dirs "${append_library_dirs}/$<CONFIG>")
endif()

# finding gtest once in the highest scope
# prevents finding it repeatedly in each local scope
ament_find_gtest()
Expand Down

0 comments on commit 4d72c71

Please sign in to comment.