diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-08 18:49:32 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-13 12:50:17 (GMT) |
| commit | a2c4e3489d9ccd7150b6fda2ea7254c21dcde1b2 (patch) | |
| tree | 24189d25c031ccd25aef407d55aaa42e8cdf04c1 /Tests | |
| parent | cc66d356510c51b5240239a212a511fb0d23dc9a (diff) | |
| download | CMake-a2c4e3489d9ccd7150b6fda2ea7254c21dcde1b2.zip CMake-a2c4e3489d9ccd7150b6fda2ea7254c21dcde1b2.tar.gz CMake-a2c4e3489d9ccd7150b6fda2ea7254c21dcde1b2.tar.bz2 | |
Autogen: Tests: Separate MocCMP0071 test
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tests/QtAutogen/CommonTests.cmake | 3 | ||||
| -rw-r--r-- | Tests/QtAutogen/MocCMP0071/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tests/QtAutogen/MocCMP0071/NEW/CMakeLists.txt (renamed from Tests/QtAutogen/mocCMP0071/NEW/CMakeLists.txt) | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/MocCMP0071/OLD/CMakeLists.txt (renamed from Tests/QtAutogen/mocCMP0071/OLD/CMakeLists.txt) | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/MocCMP0071/Obj.cpp (renamed from Tests/QtAutogen/mocCMP0071/Obj.cpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/MocCMP0071/Obj.hpp (renamed from Tests/QtAutogen/mocCMP0071/Obj.hpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/MocCMP0071/Obj_p.h (renamed from Tests/QtAutogen/mocCMP0071/Obj_p.h) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/MocCMP0071/main.cpp (renamed from Tests/QtAutogen/mocCMP0071/main.cpp) | 0 | ||||
| -rw-r--r-- | Tests/QtAutogen/mocCMP0071/CMakeLists.txt | 4 |
10 files changed, 11 insertions, 12 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 5775117..1f50931 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -60,12 +60,6 @@ if(NON_ASCII_BDIR AND WIN32) endif() # -- Test -# Tests policy 0071 -if(ALLOW_WRAP_CPP) - add_subdirectory(mocCMP0071) -endif() - -# -- Test # Tests various .ui include directories add_subdirectory(uicInclude) diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake index 4d89eae..932169b 100644 --- a/Tests/QtAutogen/CommonTests.cmake +++ b/Tests/QtAutogen/CommonTests.cmake @@ -20,3 +20,6 @@ if(QT_TEST_ALLOW_QT_MACROS) ADD_AUTOGEN_TEST(MocIncludeStrict mocIncludeStrict) ADD_AUTOGEN_TEST(MocIncludeRelaxed mocIncludeRelaxed) endif() +if(QT_TEST_ALLOW_QT_MACROS) + ADD_AUTOGEN_TEST(MocCMP0071) +endif() diff --git a/Tests/QtAutogen/MocCMP0071/CMakeLists.txt b/Tests/QtAutogen/MocCMP0071/CMakeLists.txt new file mode 100644 index 0000000..a79f36e --- /dev/null +++ b/Tests/QtAutogen/MocCMP0071/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.10) +project(MocCMP0071) +include("../AutogenTest.cmake") + +add_subdirectory(OLD) +add_subdirectory(NEW) diff --git a/Tests/QtAutogen/mocCMP0071/NEW/CMakeLists.txt b/Tests/QtAutogen/MocCMP0071/NEW/CMakeLists.txt index 0237afc..954fe3d 100644 --- a/Tests/QtAutogen/mocCMP0071/NEW/CMakeLists.txt +++ b/Tests/QtAutogen/MocCMP0071/NEW/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.9) +cmake_minimum_required(VERSION 3.10) cmake_policy(SET CMP0071 NEW) # *Generate* files diff --git a/Tests/QtAutogen/mocCMP0071/OLD/CMakeLists.txt b/Tests/QtAutogen/MocCMP0071/OLD/CMakeLists.txt index 5699433..68fa067 100644 --- a/Tests/QtAutogen/mocCMP0071/OLD/CMakeLists.txt +++ b/Tests/QtAutogen/MocCMP0071/OLD/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.9) +cmake_minimum_required(VERSION 3.10) cmake_policy(SET CMP0071 OLD) # *Generate* files diff --git a/Tests/QtAutogen/mocCMP0071/Obj.cpp b/Tests/QtAutogen/MocCMP0071/Obj.cpp index 1ae50ed..1ae50ed 100644 --- a/Tests/QtAutogen/mocCMP0071/Obj.cpp +++ b/Tests/QtAutogen/MocCMP0071/Obj.cpp diff --git a/Tests/QtAutogen/mocCMP0071/Obj.hpp b/Tests/QtAutogen/MocCMP0071/Obj.hpp index f064e47..f064e47 100644 --- a/Tests/QtAutogen/mocCMP0071/Obj.hpp +++ b/Tests/QtAutogen/MocCMP0071/Obj.hpp diff --git a/Tests/QtAutogen/mocCMP0071/Obj_p.h b/Tests/QtAutogen/MocCMP0071/Obj_p.h index cb1e5df..cb1e5df 100644 --- a/Tests/QtAutogen/mocCMP0071/Obj_p.h +++ b/Tests/QtAutogen/MocCMP0071/Obj_p.h diff --git a/Tests/QtAutogen/mocCMP0071/main.cpp b/Tests/QtAutogen/MocCMP0071/main.cpp index 3887840..3887840 100644 --- a/Tests/QtAutogen/mocCMP0071/main.cpp +++ b/Tests/QtAutogen/MocCMP0071/main.cpp diff --git a/Tests/QtAutogen/mocCMP0071/CMakeLists.txt b/Tests/QtAutogen/mocCMP0071/CMakeLists.txt deleted file mode 100644 index 003fa08..0000000 --- a/Tests/QtAutogen/mocCMP0071/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -cmake_minimum_required(VERSION 3.9) -project(mocCMP0071 CXX) -add_subdirectory(OLD) -add_subdirectory(NEW) |