mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Autogen: Tests: Use non inverting Qt version tests

Browse Source
This commit is contained in:
Sebastian Holtermann
2018-08-07 16:30:52 +02:00
parent e7fb85d00d
commit 52676e3794
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/QtAutogen/AutogenTest.cmake
+2 -2
View File
@@ -6,7 +6,7 @@ if(QT_QMAKE_EXECUTABLE)
list(APPEND CMAKE_PREFIX_PATH ${Qt_PREFIX_DIR}) list(APPEND CMAKE_PREFIX_PATH ${Qt_PREFIX_DIR})
endif() endif()
if (QT_TEST_VERSION STREQUAL 4) if (QT_TEST_VERSION EQUAL 4)
find_package(Qt4 REQUIRED) find_package(Qt4 REQUIRED)
include(UseQt4) include(UseQt4)
@@ -21,7 +21,7 @@ if (QT_TEST_VERSION STREQUAL 4)
qt4_generate_moc(${ARGN}) qt4_generate_moc(${ARGN})
endmacro() endmacro()
elseif(QT_TEST_VERSION STREQUAL 5) elseif(QT_TEST_VERSION EQUAL 5)
find_package(Qt5Widgets REQUIRED) find_package(Qt5Widgets REQUIRED)
set(QT_QTCORE_TARGET Qt5::Core) set(QT_QTCORE_TARGET Qt5::Core)
Tests/QtAutogen/CommonTests.cmake
+4 -4
View File
@@ -12,7 +12,7 @@ if(QT_TEST_ALLOW_QT_MACROS)
endif() endif()
ADD_AUTOGEN_TEST(UicSkipSource) ADD_AUTOGEN_TEST(UicSkipSource)
ADD_AUTOGEN_TEST(RccSkipSource) ADD_AUTOGEN_TEST(RccSkipSource)
if(NOT QT_TEST_VERSION STREQUAL 4) if(QT_TEST_VERSION GREATER 4)
ADD_AUTOGEN_TEST(MocMacroName mocMacroName) ADD_AUTOGEN_TEST(MocMacroName mocMacroName)
endif() endif()
ADD_AUTOGEN_TEST(MocDepends) ADD_AUTOGEN_TEST(MocDepends)
@@ -23,13 +23,13 @@ endif()
if(QT_TEST_ALLOW_QT_MACROS) if(QT_TEST_ALLOW_QT_MACROS)
ADD_AUTOGEN_TEST(MocCMP0071) ADD_AUTOGEN_TEST(MocCMP0071)
endif() endif()
if(NOT QT_TEST_VERSION STREQUAL 4) if(QT_TEST_VERSION GREATER 4)
ADD_AUTOGEN_TEST(MocOsMacros) ADD_AUTOGEN_TEST(MocOsMacros)
endif() endif()
ADD_AUTOGEN_TEST(UicInclude uicInclude) ADD_AUTOGEN_TEST(UicInclude uicInclude)
ADD_AUTOGEN_TEST(UicInterface QtAutoUicInterface) ADD_AUTOGEN_TEST(UicInterface QtAutoUicInterface)
ADD_AUTOGEN_TEST(ObjectLibrary someProgram) ADD_AUTOGEN_TEST(ObjectLibrary someProgram)
if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4)) if(APPLE AND (QT_TEST_VERSION GREATER 4))
ADD_AUTOGEN_TEST(MacOsFW) ADD_AUTOGEN_TEST(MacOsFW)
endif() endif()
ADD_AUTOGEN_TEST(Parallel parallel) ADD_AUTOGEN_TEST(Parallel parallel)
@@ -42,7 +42,7 @@ ADD_AUTOGEN_TEST(SameName sameName)
ADD_AUTOGEN_TEST(StaticLibraryCycle slc) ADD_AUTOGEN_TEST(StaticLibraryCycle slc)
# Rerun tests # Rerun tests
ADD_AUTOGEN_TEST(RerunMocBasic) ADD_AUTOGEN_TEST(RerunMocBasic)
if(NOT QT_TEST_VERSION STREQUAL 4) if(QT_TEST_VERSION GREATER 4)
ADD_AUTOGEN_TEST(RerunMocPlugin) ADD_AUTOGEN_TEST(RerunMocPlugin)
endif() endif()
ADD_AUTOGEN_TEST(RerunRccDepends) ADD_AUTOGEN_TEST(RerunRccDepends)
Tests/QtAutogen/DefinesTest/CMakeLists.txt
+1 -1
View File
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
project(DefinesTest) project(DefinesTest)
# Qt4 only definitions test # Qt4 only definitions test
if(NOT QT_TEST_VERSION STREQUAL 4) if(NOT QT_TEST_VERSION EQUAL 4)
message(ERROR "Invalid Qt test version. This test is for Qt4 only.") message(ERROR "Invalid Qt test version. This test is for Qt4 only.")
endif() endif()
Tests/QtAutogen/RerunMocPlugin/MocPlugin/CMakeLists.txt
+2 -2
View File
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10)
project(MocPlugin) project(MocPlugin)
include("../../AutogenTest.cmake") include("../../AutogenTest.cmake")
if (NOT QT_TEST_VERSION STREQUAL 5) if (QT_TEST_VERSION LESS 5)
message(SEND_ERROR "Invalid Qt version specified.") message(SEND_ERROR "Qt 5 or higher required.")
endif() endif()
set(CMAKE_AUTOMOC_DEPEND_FILTERS set(CMAKE_AUTOMOC_DEPEND_FILTERS
Tests/QtAutogen/SameName/CMakeLists.txt
+1 -1
View File
@@ -28,7 +28,7 @@ set_target_properties(sameName PROPERTIES
) )
# Set different compression levels # Set different compression levels
if (QT_TEST_VERSION STREQUAL 4) if (QT_TEST_VERSION EQUAL 4)
set(rccCompress "-compress") set(rccCompress "-compress")
else() else()
set(rccCompress "--compress") set(rccCompress "--compress")
Tests/QtAutogen/TestMacros.cmake
+1 -1
View File
@@ -50,7 +50,7 @@ if(NON_ASCII_BDIR)
# Qt4 moc does not support utf8 paths in _parameter files generated by # Qt4 moc does not support utf8 paths in _parameter files generated by
# qtx_wrap_cpp # qtx_wrap_cpp
# https://bugreports.qt.io/browse/QTBUG-35480 # https://bugreports.qt.io/browse/QTBUG-35480
if(QT_TEST_VERSION STREQUAL 4) if(QT_TEST_VERSION EQUAL 4)
set(QT_TEST_ALLOW_QT_MACROS FALSE) set(QT_TEST_ALLOW_QT_MACROS FALSE)
endif() endif()
# On windows qtx_wrap_cpp also fails in Qt5 when used on a path that # On windows qtx_wrap_cpp also fails in Qt5 when used on a path that