|
|
@@ -1029,6 +1029,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
|
|
|
)
|
|
|
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/QtAutomocNoQt")
|
|
|
|
|
|
+ # On Windows there is no RPATH, so while Qt might be available for building,
|
|
|
+ # the required dlls may not be in the PATH, so we can't run the executables
|
|
|
+ # on that platform.
|
|
|
+ if(WIN32)
|
|
|
+ set(run_autogen_test ${CMAKE_CTEST_COMMAND} -V)
|
|
|
+ else()
|
|
|
+ set(run_autogen_test QtAutogen)
|
|
|
+ endif()
|
|
|
+
|
|
|
find_package(Qt5Widgets QUIET NO_MODULE)
|
|
|
if(Qt5Widgets_FOUND)
|
|
|
add_test(Qt5Autogen ${CMAKE_CTEST_COMMAND}
|
|
|
@@ -1040,7 +1049,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
|
|
|
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt5Autogen"
|
|
|
--force-new-ctest-process
|
|
|
--build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=5
|
|
|
- --test-command ${CMAKE_CTEST_COMMAND} -V
|
|
|
+ --test-command ${run_autogen_test}
|
|
|
)
|
|
|
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5Autogen")
|
|
|
endif()
|
|
|
@@ -1054,7 +1063,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
|
|
|
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4Autogen"
|
|
|
--force-new-ctest-process
|
|
|
--build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=4
|
|
|
- --test-command ${CMAKE_CTEST_COMMAND} -V
|
|
|
+ --test-command ${run_autogen_test}
|
|
|
)
|
|
|
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Autogen")
|
|
|
|