reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-30 23:10:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic '16839-better-tvos-support'

Browse Source 
45e30d12 Xcode: Add team to compiler-id project
0be0e02c Xcode: Add tvOS and watchOS toolchain file support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1278
This commit is contained in:
Craig Scott 2017-09-24 12:02:53 +00:00 committed by Kitware Robot
commit c3877b892a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/CMakeDetermineCompilerId.cmake
View File

@ -321,12 +321,19 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
set(id_product_type "com.apple.product-type.tool")
if(CMAKE_OSX_SYSROOT)
set(id_sdkroot "SDKROOT = \"${CMAKE_OSX_SYSROOT}\";")
if(CMAKE_OSX_SYSROOT MATCHES "(^|/)[Ii][Pp][Hh][Oo][Nn][Ee]")
if(CMAKE_OSX_SYSROOT MATCHES "(^|/)[Ii][Pp][Hh][Oo][Nn][Ee]" OR
CMAKE_OSX_SYSROOT MATCHES "(^|/)[Aa][Pp][Pp][Ll][Ee][Tt][Vv]")
set(id_product_type "com.apple.product-type.bundle.unit-test")
endif()
else()
set(id_sdkroot "")
endif()
if(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM)
set(id_development_team
"DEVELOPMENT_TEAM = \"${CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM}\";")
else()
set(id_development_team "")
endif()
configure_file(${CMAKE_ROOT}/Modules/CompilerId/Xcode-3.pbxproj.in
${id_dir}/CompilerId${lang}.xcodeproj/project.pbxproj @ONLY)
unset(_ENV_MACOSX_DEPLOYMENT_TARGET)

1
Modules/CompilerId/Xcode-3.pbxproj.in
View File

@ -72,6 +72,7 @@
1DEB928608733DD80010E9CD = {
isa = XCBuildConfiguration;
buildSettings = {
@id_development_team@
PRODUCT_NAME = CompilerId@id_lang@;
};
name = Debug;