diff options
| -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() |