diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-23 10:36:57 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-23 10:31:15 +0000 |
| commit | e86509016c8940826774f7a803823b2dfd9b6944 (patch) | |
| tree | 67c7183f883ca0b24d4c73efcf06f6e771999c35 /src/testlib | |
| parent | cd408af9bc11881f351b359ebf81f02f0f69ef86 (diff) | |
Fix mapping of Apple platforms in pro2cmake.py
"mac" scope in qmake actually means all mac platforms,
just like "darwin", aka macOS, iOS, watchOS, etc.
Regenerate corelib, gui and testlib after this modification.
This is a requirement for the iOS port.
Change-Id: I029c7e907d13f6ec31816a08602a5930f9ac16a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/.prev_CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/testlib/CMakeLists.txt | 12 |
2 files changed, 19 insertions, 6 deletions
diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt index f7f88ba5f0..036639bf27 100644 --- a/src/testlib/.prev_CMakeLists.txt +++ b/src/testlib/.prev_CMakeLists.txt @@ -94,18 +94,23 @@ extend_target(Test CONDITION embedded -fno-rtti ) -extend_target(Test CONDITION APPLE_OSX +extend_target(Test CONDITION APPLE SOURCES qappletestlogger.cpp qappletestlogger_p.h + PUBLIC_LIBRARIES + ${FWSecurity} +) + +extend_target(Test CONDITION APPLE_OSX + SOURCES qtestutil_macos.mm qtestutil_macos_p.h PUBLIC_LIBRARIES ${FWApplicationServices} ${FWFoundation} ${FWIOKit} - ${FWSecurity} ) -extend_target(Test CONDITION (APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) +extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) SOURCES qxctestlogger.mm qxctestlogger_p.h DEFINES @@ -117,7 +122,7 @@ extend_target(Test CONDITION (APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_V #### Keys ignored in scope 8:.:.:testlib.pro:OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"): # _LOADED = "sdk" -extend_target(Test CONDITION ((APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) +extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) COMPILE_OPTIONS -F/Developer/Library/Frameworks LINK_OPTIONS diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index eba682bdc2..4ee5cdccdb 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -92,17 +92,25 @@ extend_target(Test CONDITION embedded -fno-rtti ) -extend_target(Test CONDITION APPLE_OSX +extend_target(Test CONDITION APPLE SOURCES qappletestlogger.cpp qappletestlogger_p.h + PUBLIC_LIBRARIES + ${FWSecurity} +) + +extend_target(Test CONDITION APPLE_OSX + SOURCES qtestutil_macos.mm qtestutil_macos_p.h PUBLIC_LIBRARIES ${FWApplicationServices} ${FWFoundation} ${FWIOKit} - ${FWSecurity} ) +#### Keys ignored in scope 8:.:.:testlib.pro:OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"): +# _LOADED = "sdk" + # special case begin # Do not bother with disabled stuff: # extend_target(Test CONDITION (APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ... |