From fb41fb8a206b2a0b6cbb064fa876346469c656c1 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Sat, 1 Jun 2019 18:45:58 +0200 Subject: [PATCH] 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 --- src/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c52f4fd9093..01fb642e910 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 $) + if (TARGET libclang) + list(APPEND env_path $) + endif() string(REPLACE "/" "\\" env_path "${env_path}") string(REPLACE ";" "\\;" env_path "${env_path}")