diff options
| author | Craig Scott <craig.scott@crascit.com> | 2017-09-24 12:02:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-24 12:02:57 (GMT) |
| commit | c3877b892a79c37d5b39f2c6e7269906ce536191 (patch) | |
| tree | 2242cbf9e3d947995df2a7fcc86d87c99ebdd2bd /Modules | |
| parent | e2a57a438d25e45e117493b8d95396040fe39252 (diff) | |
| parent | 45e30d128cc96edce96c499a1d6a201d4442d05f (diff) | |
| download | CMake-c3877b892a79c37d5b39f2c6e7269906ce536191.zip CMake-c3877b892a79c37d5b39f2c6e7269906ce536191.tar.gz CMake-c3877b892a79c37d5b39f2c6e7269906ce536191.tar.bz2 | |
Merge topic '`16839-better-tvos-support`'
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
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 9 | ||||
| -rw-r--r-- | Modules/CompilerId/Xcode-3.pbxproj.in | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 0a93e5f..cddc966 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -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) diff --git a/Modules/CompilerId/Xcode-3.pbxproj.in b/Modules/CompilerId/Xcode-3.pbxproj.in index 84f48ae..1cbaa57 100644 --- a/Modules/CompilerId/Xcode-3.pbxproj.in +++ b/Modules/CompilerId/Xcode-3.pbxproj.in @@ -72,6 +72,7 @@ 1DEB928608733DD80010E9CD = { isa = XCBuildConfiguration; buildSettings = { + @id_development_team@ PRODUCT_NAME = CompilerId@id_lang@; }; name = Debug; |