niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix export of CYCLONEDDS_URI in test environment

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2018-08-06 14:50:25 +02:00
parent 3752f93e78
commit 70f208cbd3
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/core/ddsc/tests/CMakeLists.txt
View file

@ -20,14 +20,18 @@ target_include_directories(criterion_ddsc PRIVATE
target_link_libraries(criterion_ddsc RoundTrip Space TypesArrayKey ddsc OSAPI) target_link_libraries(criterion_ddsc RoundTrip Space TypesArrayKey ddsc OSAPI)
# Setup environment for config-tests # Setup environment for config-tests
get_test_property(Criterion_ddsc_config_simple_udp ENVIRONMENT ENVIRON) get_test_property(Criterion_ddsc_config_simple_udp ENVIRONMENT Criterion_ddsc_config_simple_udp_env)
set(CONFIG_FILE "${CMAKE_CURRENT_LIST_DIR}/config_simple_udp.xml") set(Criterion_ddsc_config_simple_udp_file "${CMAKE_CURRENT_LIST_DIR}/config_simple_udp.xml")
set(ENVIRON "${CMAKE_PROJECT_NAME_CAPS}_URI=file://${CONFIG_FILE};MAX_PARTICIPANTS=0;${ENVIRON}") set(Criterion_ddsc_config_simple_udp_uri "file://${Criterion_ddsc_config_simple_udp_file}")
set(Criterion_ddsc_config_simple_udp_max_participants "0")
set(Criterion_ddsc_config_simple_udp_env "${CMAKE_PROJECT_NAME_CAPS}_URI=${Criterion_ddsc_config_simple_udp_uri};MAX_PARTICIPANTS=${Criterion_ddsc_config_simple_udp_max_participants};${Criterion_ddsc_config_simple_udp_env}")
message(STATUS "ENV: ${Criterion_ddsc_config_simple_udp_env}")
set_tests_properties( set_tests_properties(
Criterion_ddsc_config_simple_udp Criterion_ddsc_config_simple_udp
PROPERTIES PROPERTIES
REQUIRED_FILES ${CONFIG_FILE} REQUIRED_FILES ${Criterion_ddsc_config_simple_udp_file}
ENVIRONMENT "${ENVIRON}") ENVIRONMENT "${Criterion_ddsc_config_simple_udp_env}")
configure_file("config_env.h.in" "config_env.h") configure_file("config_env.h.in" "config_env.h")