feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake Build: Add Qt and clang in PATH variable for Windows tests

Browse Source 
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>
This commit is contained in:
Cristian Adam
2019-06-01 18:45:58 +02:00
parent 4742216feb
commit fb41fb8a20
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@@ -486,6 +486,10 @@ function(fix_test_environment test_name)
list(APPEND env_path $ENV{PATH}) list(APPEND env_path $ENV{PATH})
list(APPEND env_path ${CMAKE_BINARY_DIR}/${IDE_PLUGIN_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 ${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}")
string(REPLACE ";" "\\;" env_path "${env_path}") string(REPLACE ";" "\\;" env_path "${env_path}")