diff options
| author | Ben Cooksley <bcooksley@kde.org> | 2018-08-31 20:46:36 +1200 |
|---|---|---|
| committer | Ben Cooksley <bcooksley@kde.org> | 2018-08-31 20:46:58 +1200 |
| commit | 7d6d5b1e705f54a216f8d5235b66bbf2035d7448 (patch) | |
| tree | c539a22716def78e80faa82babd0c3f4f9d3e066 | |
| parent | 6684cb99bdf408fc491e547393dbd7aac4d151f2 (diff) | |
| download | extra-cmake-modules-7d6d5b1e705f54a216f8d5235b66bbf2035d7448.tar.gz extra-cmake-modules-7d6d5b1e705f54a216f8d5235b66bbf2035d7448.tar.bz2 | |
Disable alteration of QT_PLUGIN_PATH by ECM when running tests.
On Windows at least this is simply broken and leads to tests failing because plugins from other modules cannot be found at all.
Based on this it is likely that it is broken on other platforms as well, it's just being hidden there by other logic.
CCMAIL: kde-frameworks-devel@kde.org
| -rw-r--r-- | modules/ECMAddTests.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake index 571874d5..da6217df 100644 --- a/modules/ECMAddTests.cmake +++ b/modules/ECMAddTests.cmake @@ -114,15 +114,15 @@ function(ecm_add_test) add_test(NAME ${_testname} COMMAND ${_targetname}) target_link_libraries(${_targetname} ${ARG_LINK_LIBRARIES}) ecm_mark_as_test(${_targetname}) - if (CMAKE_LIBRARY_OUTPUT_DIRECTORY) - if(CMAKE_HOST_SYSTEM MATCHES "Windows") - set(PATHSEP "\\;") - else() # e.g. Linux - set(PATHSEP ":") - endif() - set(_plugin_path $ENV{QT_PLUGIN_PATH}) - set_property(TEST ${_testname} PROPERTY ENVIRONMENT QT_PLUGIN_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}${PATHSEP}${_plugin_path}) - endif() + #if (CMAKE_LIBRARY_OUTPUT_DIRECTORY) + # if(CMAKE_HOST_SYSTEM MATCHES "Windows") + # set(PATHSEP "\\;") + # else() # e.g. Linux + # set(PATHSEP ":") + # endif() + # set(_plugin_path $ENV{QT_PLUGIN_PATH}) + # set_property(TEST ${_testname} PROPERTY ENVIRONMENT QT_PLUGIN_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}${PATHSEP}${_plugin_path}) + #endif() if (ARG_TARGET_NAME_VAR) set(${ARG_TARGET_NAME_VAR} "${_targetname}" PARENT_SCOPE) endif() |