浏览代码

allow building without codesigning

Andrey Filipenkov 3 年之前
父节点
当前提交
fae295da88
共有 5 个文件被更改,包括 5 次插入4 次删除
  1. 1 0
      CMakeLists.txt
  2. 1 1
      apple_codesign.sh
  3. 1 1
      client/CMakeLists.txt
  4. 1 1
      launcher/CMakeLists.txt
  5. 1 1
      server/CMakeLists.txt

+ 1 - 0
CMakeLists.txt

@@ -156,6 +156,7 @@ set(CMAKE_MAP_IMPORTED_CONFIG_RELEASE Release RelWithDebInfo MinSizeRel "")
 if(APPLE_IOS)
 	set(CMAKE_MACOSX_RPATH 1)
 	set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED NO)
+	set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED_FOR_APPS YES)
 	set(CMAKE_XCODE_ATTRIBUTE_MARKETING_VERSION ${APP_SHORT_VERSION})
 	set(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${BUNDLE_IDENTIFIER_PREFIX}.$(PRODUCT_NAME)")
 	set(SYSTEM_LIBS ${SYSTEM_LIBS} iconv) # boost.locale

+ 1 - 1
apple_codesign.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [[ "$PLATFORM_NAME" == *simulator* || -z "$EXPANDED_CODE_SIGN_IDENTITY" ]]; then
+if [[ "$PLATFORM_NAME" == *simulator* || "$CODE_SIGNING_ALLOWED_FOR_APPS" == 'NO' || -z "$EXPANDED_CODE_SIGN_IDENTITY" ]]; then
   exit 0
 fi
 

+ 1 - 1
client/CMakeLists.txt

@@ -196,7 +196,7 @@ elseif(APPLE_IOS)
 	set_target_properties(vcmiclient PROPERTIES
 		MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_LIST_DIR}/ios/Info.plist"
 		XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/Frameworks"
-		XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED YES
+		XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "$(CODE_SIGNING_ALLOWED_FOR_APPS)"
 		XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME AppIcon
 		XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${ENTITLEMENTS_OUT_PATH}
 	)

+ 1 - 1
launcher/CMakeLists.txt

@@ -111,7 +111,7 @@ if(APPLE_IOS)
 	set_target_properties(vcmilauncher PROPERTIES
 		MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_LIST_DIR}/ios/Info.plist"
 		XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/Frameworks"
-		XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED YES
+		XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "$(CODE_SIGNING_ALLOWED_FOR_APPS)"
 		XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME AppIcon
 		XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${ENTITLEMENTS_OUT_PATH}
 	)

+ 1 - 1
server/CMakeLists.txt

@@ -54,7 +54,7 @@ elseif(APPLE_IOS)
 	set_target_properties(vcmiserver PROPERTIES
 		MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_LIST_DIR}/ios/Info.plist"
 		XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/Frameworks"
-		XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED YES
+		XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "$(CODE_SIGNING_ALLOWED_FOR_APPS)"
 		XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME AppIcon
 		XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${ENTITLEMENTS_OUT_PATH}
 	)