diff options
author | Cristian Adam <cristian.adam@qt.io> | 2019-06-01 18:45:58 +0200 |
---|---|---|
committer | Cristian Adam <cristian.adam@qt.io> | 2019-06-03 08:34:19 +0000 |
commit | fb41fb8a206b2a0b6cbb064fa876346469c656c1 (patch) | |
tree | 1ca33094f925e36f9d8ef64255b863d1a8497032 /src/CMakeLists.txt | |
parent | 4742216febedb9f6fb6e8147e9a333abe236ab2f (diff) |
CMake Build: Add Qt and clang in PATH variable for Windows tests
Windows doesn't have RPATH support, and Qt and clang directories
need to be set into PATH environment variable for tests to be able
to run.
On my work machine I had the directories set into the global PATH
environment.
Change-Id: I91e0adc5999479e7dcf3cf0a734ed31e6edc402f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c52f4fd909..01fb642e91 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -486,6 +486,10 @@ function(fix_test_environment test_name) list(APPEND env_path $ENV{PATH}) list(APPEND env_path ${CMAKE_BINARY_DIR}/${IDE_PLUGIN_PATH}) list(APPEND env_path ${CMAKE_BINARY_DIR}/${IDE_BIN_PATH}) + list(APPEND env_path $<TARGET_FILE_DIR:Qt5::Test>) + if (TARGET libclang) + list(APPEND env_path $<TARGET_FILE_DIR:libclang>) + endif() string(REPLACE "/" "\\" env_path "${env_path}") string(REPLACE ";" "\\;" env_path "${env_path}") |