Correctly set PATH for test executables

studoot · studoot · commit 2a332883d6ee · 2019-10-07T11:51:05.000+01:00
Use 'cmake -E env ... &lt;test-executable&gt;' to execute the test executable. The '-E env' option allows the environment to be altered for the executed test.

Use generator expressions to retrieve the build directory/file for the sigc++ &amp; test targets
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -61,10 +61,9 @@ function (add_sigcpp_test TEST_SOURCE_FILE)
 	get_filename_component (test_name ${TEST_SOURCE_FILE} NAME_WE)
 	add_executable (${test_name} ${TEST_SOURCE_FILE} testutilities.cc)
 	target_link_libraries (${test_name} sigc-${SIGCXX_API_VERSION})
-	add_test (${test_name} ${CMAKE_CURRENT_BINARY_DIR}/${test_name})
-
-        # Help MSVC to find the library that the tests should link against.
-        set_tests_properties( ${test_name} PROPERTIES ENVIRONMENT "PATH=${sigc++_BINARY_DIR};$ENV{PATH}" )
+  add_test (NAME ${test_name}
+  # Help MSVC to find the library that the tests should link against.
+  COMMAND ${CMAKE_COMMAND} -E env "PATH=$<TARGET_FILE_DIR:sigc-${SIGCXX_API_VERSION}>;$ENV{PATH}" $<TARGET_FILE:${test_name}>)
 endfunction (add_sigcpp_test)
 
 foreach (test_file ${TEST_SOURCE_FILES})
