Browse Source

Tweek to iOS intall_name_tool for CI box issue

JoshEngebretson 9 years ago
parent
commit
2d6563496f
2 changed files with 3 additions and 5 deletions
  1. 1 1
      Build/Scripts/BuildIOS.js
  2. 2 4
      Source/AtomicNET/NETNative/CMakeLists.txt

+ 1 - 1
Build/Scripts/BuildIOS.js

@@ -27,7 +27,7 @@ namespace('build', function() {
 
         cmds.push("cmake -DIOS=1 -DATOMIC_DEV_BUILD=0 -G Xcode ../../../");
         cmds.push("xcodebuild -configuration " + (debug ? "Debug" : "Release") + " -parallelizeTargets -jobs 4");
-        //cmds.push("cd \"" + NETNativeSrcDir + "\" && install_name_tool -id @rpath/AtomicNETNative.framework/AtomicNETNative AtomicNETNative.framework/AtomicNETNative");
+        cmds.push("cd \"" + NETNativeSrcDir + "\" && install_name_tool -id @rpath/AtomicNETNative.framework/AtomicNETNative AtomicNETNative.framework/AtomicNETNative");
         //cmds.push("cd \"" + NETNativeSrcDir + "\" && codesign --deep --force --verify --sign \"iPhone Developer\" ./AtomicNETNative.framework/");
         cmds.push("cd \"" + NETNativeSrcDir + "\" && zip -r AtomicNETNative.framework.zip AtomicNETNative.framework");
 

+ 2 - 4
Source/AtomicNET/NETNative/CMakeLists.txt

@@ -90,10 +90,8 @@ add_custom_command( TARGET AtomicNETNative POST_BUILD
 
 else()
 
-    # iOS: We need to copy/zip the framework on iOS, the framework must also be code signed and POST_BUILD is triggered before this occurs,
-    # so handled in BuildIOS.js
-    add_custom_command( TARGET AtomicNETNative POST_BUILD
-                        COMMAND install_name_tool -id @rpath/AtomicNETNative.framework/AtomicNETNative \"$<TARGET_FILE:AtomicNETNative>\")
+    # See BuildIOS.js for handling of the AtomicNETNative framework, including install_name_tool modification, etc
+    # Handling it here was causing issues with certain builds of XCode and where it thought the TARGET_FILE was...
 
 endif()