浏览代码

Autogen: Tests: Separate MacOsFW test

Sebastian Holtermann 8 年之前
父节点
当前提交
d7868687c8

+ 0 - 6
Tests/QtAutogen/CMakeLists.txt

@@ -59,12 +59,6 @@ if(NON_ASCII_BDIR AND WIN32)
   set(ALLOW_WRAP_CPP FALSE)
   set(ALLOW_WRAP_CPP FALSE)
 endif()
 endif()
 
 
-# -- Test
-# MacOS Framework
-if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
-  add_subdirectory(macosFW)
-endif()
-
 # -- Test
 # -- Test
 # Source files with the same basename in different subdirectories
 # Source files with the same basename in different subdirectories
 add_subdirectory(sameName)
 add_subdirectory(sameName)

+ 3 - 0
Tests/QtAutogen/CommonTests.cmake

@@ -25,3 +25,6 @@ if(QT_TEST_ALLOW_QT_MACROS)
 endif()
 endif()
 ADD_AUTOGEN_TEST(UicInclude uicInclude)
 ADD_AUTOGEN_TEST(UicInclude uicInclude)
 ADD_AUTOGEN_TEST(ObjectLibrary someProgram)
 ADD_AUTOGEN_TEST(ObjectLibrary someProgram)
+if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
+  ADD_AUTOGEN_TEST(MacOsFW)
+endif()

+ 3 - 2
Tests/QtAutogen/macosFW/CMakeLists.txt → Tests/QtAutogen/MacOsFW/CMakeLists.txt

@@ -1,5 +1,6 @@
-cmake_minimum_required(VERSION 3.8)
-project(macos-fw-test)
+cmake_minimum_required(VERSION 3.10)
+project(MacOsFW)
+include("../AutogenTest.cmake")
 
 
 find_package(Qt5Test REQUIRED)
 find_package(Qt5Test REQUIRED)
 
 

+ 0 - 0
Tests/QtAutogen/macosFW/src/CMakeLists.txt → Tests/QtAutogen/MacOsFW/src/CMakeLists.txt


+ 0 - 0
Tests/QtAutogen/macosFW/src/macos_fw_lib.cpp → Tests/QtAutogen/MacOsFW/src/macos_fw_lib.cpp


+ 0 - 0
Tests/QtAutogen/macosFW/src/macos_fw_lib.h → Tests/QtAutogen/MacOsFW/src/macos_fw_lib.h


+ 0 - 0
Tests/QtAutogen/macosFW/test/CMakeLists.txt → Tests/QtAutogen/MacOsFW/test/CMakeLists.txt


+ 0 - 0
Tests/QtAutogen/macosFW/test/testMacosFWLib.cpp → Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp


+ 0 - 0
Tests/QtAutogen/macosFW/test/testMacosFWLib.h → Tests/QtAutogen/MacOsFW/test/testMacosFWLib.h