diff options
| author | David Faure <faure@kde.org> | 2019-03-31 20:29:13 +0200 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2019-03-31 20:30:16 +0200 |
| commit | ada1664ba2e04a3ecb7cf32faacebd6006473526 (patch) | |
| tree | ee7b78607b5b8e218cd1be513a44d2977fbf8b54 | |
| parent | 6b27bbf0b954fe68c1611be3a5ca146e3e3c859a (diff) | |
| download | extra-cmake-modules-5.57.0.tar.gz extra-cmake-modules-5.57.0.tar.bz2 | |
Re-enable the setting of QT_PLUGIN_PATH, without the strange backslash.v5.57.0-rc1v5.57.0
Let's see if purpose unittests still work on Windows (which was the
reason this got commented out, kio_file wasn't found anymore).
CCMAIL: bcooksley@kde.org, kfunk@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 da6217df..eb9601ce 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() |