Fix Mac Build (#3165)

.github/workflows/main.yml

@@ -145,9 +145,9 @@ jobs:
         continue-on-error: ${{ !startsWith(github.ref, 'refs/tags/') }}
   macOS:
     name: 🍏
-    runs-on: latest
+    runs-on: macos-latest
     needs: init
-    if: false && needs.init.outputs.skip == '0' && github.event_name != 'repository_dispatch'
+    if: needs.init.outputs.skip == '0' && github.event_name != 'repository_dispatch'
     strategy:
       fail-fast: false
       matrix:
@@ -168,7 +168,7 @@ jobs:
         uses: actions/checkout@v3
         with: { fetch-depth: 0 }
       - name: Select xcode
-        run: sudo xcode-select -s '/Applications/Xcode_12.app'
+        run: sudo xcode-select --switch /Applications/Xcode_14.0.1.app
       - name: Install dependencies
         run: while ! brew install doxygen graphviz; do sleep 1; done
       - name: CMake

Source/ThirdParty/Assimp/CMakeLists.txt

@@ -207,6 +207,7 @@ CONFIGURE_FILE(
 
 # Urho3D: added
 # Urho3D: pulled up from zlib's CMakeLists.txt
+check_include_file(unistd.h Z_HAVE_UNISTD_H)
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/contrib/zlib/zconf.h.cmakein
   ${CMAKE_CURRENT_BINARY_DIR}/contrib/zlib/zconf.h @ONLY

Source/ThirdParty/Assimp/code/CMakeLists.txt

@@ -993,9 +993,6 @@ set (TARGET_NAME Assimp)
 # Define source files
 set (SOURCE_FILES ${assimp_src})
 
-# Since we only build AssetImporter as a single-arch native tool, there is no point to build Assimp as universal binary library
-list (APPEND TARGET_PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH YES)
-
 # Setup target
 setup_library ()
 

Source/Tools/Tests/Main.cpp

@@ -3,6 +3,7 @@
 // License: MIT
 
 #include <iostream>
+#include <clocale>
 
 void Test_Container_Str();
 void Test_Math_BigInt();

Source/Urho3D/CMakeLists.txt

@@ -243,8 +243,7 @@ if (URHO3D_BINDINGS)
     include (ExternalProject)
     if (IOS OR TVOS)
         # When cross-compiling for iOS/tvOS the host environment has been altered by xcodebuild for the said platform, the following fix is required to reset the host environment before spawning another process to configure/generate project file for external project
-        # Also workaround a known CMake/Xcode generator bug which prevents it from installing native tool binaries correctly
-        set (ALTERNATE_COMMAND CMAKE_COMMAND /usr/bin/env -i PATH=$ENV{PATH} CC=${SAVED_CC} CXX=${SAVED_CXX} CI=$ENV{CI} ${CMAKE_COMMAND} BUILD_COMMAND bash -c "sed -i '' 's/\$$\(EFFECTIVE_PLATFORM_NAME\)//g' CMakeScripts/install_postBuildPhase.make*")
+        set (ALTERNATE_COMMAND CMAKE_COMMAND /usr/bin/env -i PATH=$ENV{PATH} CC=${SAVED_CC} CXX=${SAVED_CXX} CI=$ENV{CI} ${CMAKE_COMMAND})
     else ()
         set (ALTERNATE_COMMAND CMAKE_COMMAND ${CMAKE_COMMAND} -E env CC=${SAVED_CC} CXX=${SAVED_CXX} CI=$ENV{CI} ${CMAKE_COMMAND})
     endif ()
@@ -279,16 +278,17 @@ if (URHO3D_LUA)
             set (TRAVIS_ANDROID_FIX -DURHO3D_DEPLOYMENT_TARGET=generic)
         endif ()
         if (IOS OR TVOS)
-            set (ALTERNATE_COMMAND CMAKE_COMMAND /usr/bin/env -i PATH=$ENV{PATH} CC=${SAVED_CC} CXX=${SAVED_CXX} CI=$ENV{CI} ${CMAKE_COMMAND} BUILD_COMMAND bash -c "sed -i '' 's/\$$\(EFFECTIVE_PLATFORM_NAME\)//g' CMakeScripts/install_postBuildPhase.make*")
+            set (ALTERNATE_COMMAND CMAKE_COMMAND /usr/bin/env -i PATH=$ENV{PATH} CC=${SAVED_CC} CXX=${SAVED_CXX} CI=$ENV{CI} ${CMAKE_COMMAND} BUILD_COMMAND )
         else ()
             set (ALTERNATE_COMMAND CMAKE_COMMAND ${CMAKE_COMMAND} -E env CC=${SAVED_CC} CXX=${SAVED_CXX} CI=$ENV{CI} ${CMAKE_COMMAND})
         endif ()
-        ExternalProject_Add (tolua++
+        ExternalProject_Add (tolua++bin
             SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/ThirdParty/toluapp/src/bin
             CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D URHO3D_UPDATE_SOURCE_TREE=${URHO3D_UPDATE_SOURCE_TREE} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
             ${TRAVIS_ANDROID_FIX}
             ${ALTERNATE_COMMAND})
         add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/tolua++)
+        message("Added tolua++ as an external project")
     else ()
         # Otherwise, build it internally as per normal
         add_subdirectory (../ThirdParty/toluapp/src/bin ../ThirdParty/toluapp/src/bin)
@@ -310,7 +310,7 @@ if (URHO3D_LUA)
         file (GLOB PKG_FILES LuaScript/pkgs/${DIR}/*.pkg)
         add_custom_command (OUTPUT ${GEN_CPP_FILE}
             COMMAND ${CMAKE_BINARY_DIR}/bin/tool/tolua++ -E ${CMAKE_PROJECT_NAME} -L ToCppHook.lua -o ${GEN_CPP_FILE} ${NAME}
-            DEPENDS tolua++ ${API_PKG_FILE} ${PKG_FILES} LuaScript/pkgs/ToCppHook.lua
+            DEPENDS tolua++bin ${API_PKG_FILE} ${PKG_FILES} LuaScript/pkgs/ToCppHook.lua 
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/LuaScript/pkgs
             COMMENT "Generating tolua++ API binding on the fly for ${DIR}")
     endforeach ()
@@ -354,6 +354,13 @@ if (IOS OR TVOS)
 endif ()
 setup_library (${URHO3D_LIB_TYPE} ${EXCLUDE_FROM_ALL})
 
+# Workaround for Xcode parrallel build failing: Add the generated sources as a custom target that Urho3D depends on so they are generated first.
+if (URHO3D_LUA)
+    add_custom_target (LuaGenCppFiles
+        DEPENDS tolua++bin ${LUA_GEN_CPP_FILES})
+    add_dependencies(${TARGET_NAME} LuaGenCppFiles)
+endif()
+
 # Generate platform specific export header file (can only be called after the target has been added)
 if (MSVC)
     set (APPENDIX "\n#pragma warning(disable: 4251)\n#pragma warning(disable: 4275)\n\n#if _MSC_VER < 1900\n#define strtoll _strtoi64\n#define strtoull _strtoui64\n#endif\n")
@@ -400,18 +407,18 @@ endif ()
 if (IOS)
     # Add a custom target to build Mach-O universal binary consisting of both iPhoneOS and iPhoneSimulator SDKs
     add_custom_target (${TARGET_NAME}_universal ALL
-        COMMAND if [ '$(CONFIGURATION)' != 'Debug' ]\; then if lipo -info $<TARGET_FILE:${TARGET_NAME}> 2>/dev/null |egrep -cq 'x86_64.*arm64|arm64.*x86_64'\; then echo $<TARGET_FILE:${TARGET_NAME}> is already a Mach-O universal binary consisting of both iphoneos and iphonesimulator SDKs\; else mv $<TARGET_FILE:${TARGET_NAME}>{,.ori} && if lipo -info $<TARGET_FILE:${TARGET_NAME}>.ori 2>/dev/null |egrep -cq x86_64\; then sdk=iphoneos\; else sdk=iphonesimulator\; fi && xcodebuild -target ${TARGET_NAME} -configuration $(CONFIGURATION) -sdk $$sdk 2>&1 && mv $<TARGET_FILE:${TARGET_NAME}>{,.$$sdk} && if lipo -info $<TARGET_FILE:${TARGET_NAME}>.$$sdk 2>/dev/null |egrep -cq 'x86_64.*arm64|arm64.*x86_64'\; then echo 'Skip on Xcode 12 due to arch conflict' && mv $<TARGET_FILE:${TARGET_NAME}>{.ori,} && rm $<TARGET_FILE:${TARGET_NAME}>.$$sdk\; else lipo -create -output $<TARGET_FILE:${TARGET_NAME}>{,.ori,.$$sdk} && rm $<TARGET_FILE:${TARGET_NAME}>{.ori,.$$sdk}\; fi\; fi\; fi
+        COMMAND true #if [ '$(CONFIGURATION)' != 'Debug' ]\; then if lipo -info $<TARGET_FILE:${TARGET_NAME}> 2>/dev/null |egrep -cq 'x86_64.*arm64|arm64.*x86_64'\; then echo $<TARGET_FILE:${TARGET_NAME}> is already a Mach-O universal binary consisting of both iphoneos and iphonesimulator SDKs\; else mv $<TARGET_FILE:${TARGET_NAME}>{,.ori} && if lipo -info $<TARGET_FILE:${TARGET_NAME}>.ori 2>/dev/null |egrep -cq x86_64\; then sdk=iphoneos\; else sdk=iphonesimulator\; fi && xcodebuild -target ${TARGET_NAME} -configuration $(CONFIGURATION) -sdk $$sdk 2>&1 && mv $<TARGET_FILE:${TARGET_NAME}>{,.$$sdk} && if lipo -info $<TARGET_FILE:${TARGET_NAME}>.$$sdk 2>/dev/null |egrep -cq 'x86_64.*arm64|arm64.*x86_64'\; then echo 'Skip on Xcode 12 due to arch conflict' && mv $<TARGET_FILE:${TARGET_NAME}>{.ori,} && rm $<TARGET_FILE:${TARGET_NAME}>.$$sdk\; else lipo -create -output $<TARGET_FILE:${TARGET_NAME}>{,.ori,.$$sdk} && rm $<TARGET_FILE:${TARGET_NAME}>{.ori,.$$sdk}\; fi\; fi\; fi
         DEPENDS ${TARGET_NAME}
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        COMMENT "Creating Mach-O universal binary library consisting of both iPhoneOS and iPhoneSimulator SDks")
+        COMMENT "DISABLED: Creating Mach-O universal binary library consisting of both iPhoneOS and iPhoneSimulator SDks")
     install (FILES $<TARGET_FILE:${TARGET_NAME}> DESTINATION ${DEST_LIBRARY_DIR})
 elseif (TVOS)
     # Add a custom target to build Mach-O universal binary consisting of both AppleTVOS and AppleTVSimulator SDKs
     add_custom_target (${TARGET_NAME}_universal ALL
-        COMMAND if [ '$(CONFIGURATION)' != 'Debug' ]\; then if lipo -info $<TARGET_FILE:${TARGET_NAME}> 2>/dev/null |egrep -cq 'x86_64.*arm64|arm64.*x86_64'\; then echo $<TARGET_FILE:${TARGET_NAME}> is already a Mach-O universal binary consisting of both AppleTVOS and AppleTVSimulator SDKs\; else mv $<TARGET_FILE:${TARGET_NAME}>{,.ori} && if lipo -info $<TARGET_FILE:${TARGET_NAME}>.ori 2>/dev/null |grep -cq x86_64\; then sdk=appletvos\; else sdk=appletvsimulator\; fi && xcodebuild -target ${TARGET_NAME} -configuration $(CONFIGURATION) -sdk $$sdk 2>&1 && mv $<TARGET_FILE:${TARGET_NAME}>{,.$$sdk} && if lipo -info $<TARGET_FILE:${TARGET_NAME}>.$$sdk 2>/dev/null |egrep -cq 'x86_64.*arm64|arm64.*x86_64'\; then echo 'Skip on Xcode 12 due to arch conflict' && mv $<TARGET_FILE:${TARGET_NAME}>{.ori,} && rm $<TARGET_FILE:${TARGET_NAME}>.$$sdk\; else lipo -create -output $<TARGET_FILE:${TARGET_NAME}>{,.ori,.$$sdk} && rm $<TARGET_FILE:${TARGET_NAME}>{.ori,.$$sdk}\; fi\; fi\; fi
+        COMMAND true #if [ '$(CONFIGURATION)' != 'Debug' ]\; then if lipo -info $<TARGET_FILE:${TARGET_NAME}> 2>/dev/null |egrep -cq 'x86_64.*arm64|arm64.*x86_64'\; then echo $<TARGET_FILE:${TARGET_NAME}> is already a Mach-O universal binary consisting of both AppleTVOS and AppleTVSimulator SDKs\; else mv $<TARGET_FILE:${TARGET_NAME}>{,.ori} && if lipo -info $<TARGET_FILE:${TARGET_NAME}>.ori 2>/dev/null |grep -cq x86_64\; then sdk=appletvos\; else sdk=appletvsimulator\; fi && xcodebuild -target ${TARGET_NAME} -configuration $(CONFIGURATION) -sdk $$sdk 2>&1 && mv $<TARGET_FILE:${TARGET_NAME}>{,.$$sdk} && if lipo -info $<TARGET_FILE:${TARGET_NAME}>.$$sdk 2>/dev/null |egrep -cq 'x86_64.*arm64|arm64.*x86_64'\; then echo 'Skip on Xcode 12 due to arch conflict' && mv $<TARGET_FILE:${TARGET_NAME}>{.ori,} && rm $<TARGET_FILE:${TARGET_NAME}>.$$sdk\; else lipo -create -output $<TARGET_FILE:${TARGET_NAME}>{,.ori,.$$sdk} && rm $<TARGET_FILE:${TARGET_NAME}>{.ori,.$$sdk}\; fi\; fi\; fi
         DEPENDS ${TARGET_NAME}
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        COMMENT "Creating Mach-O universal binary library consisting of both AppleTVOS and AppleTVSimulator SDKs")
+        COMMENT "DISABLED: Creating Mach-O universal binary library consisting of both AppleTVOS and AppleTVSimulator SDKs")
     install (FILES $<TARGET_FILE:${TARGET_NAME}> DESTINATION ${DEST_LIBRARY_DIR})
     # TODO: Temporary workaround as CMake does not recognize AppleTV platform yet
     add_dependencies (${TARGET_NAME} APPLETV_POST_CMAKE_FIX)

Source/Urho3D/IO/File.cpp

@@ -50,6 +50,8 @@ static i32 FSeek64(FILE* stream, i64 offset, i32 origin)
 {
 #ifdef _MSC_VER
     return _fseeki64(stream, offset, origin);
+#elif defined(__APPLE__)
+    return fseeko(stream, offset, origin);
 #else
     return fseeko64(stream, offset, origin);
 #endif
@@ -59,6 +61,8 @@ static i64 FTell64(FILE* stream)
 {
 #ifdef _MSC_VER
     return _ftelli64(stream);
+#elif defined(__APPLE__)
+    return ftello(stream);
 #else
     return ftello64(stream);
 #endif
@@ -479,6 +483,8 @@ bool File::OpenInternal(const String& fileName, FileMode mode, bool fromPackage)
 
 #ifdef _WIN32
     handle_ = _wfopen(GetWideNativePath(fileName).CString(), openMode[mode]);
+#elif defined(__APPLE__)
+    handle_ = fopen(GetNativePath(fileName).CString(), openMode[mode]);
 #else
     handle_ = fopen64(GetNativePath(fileName).CString(), openMode[mode]);
 #endif
@@ -488,6 +494,8 @@ bool File::OpenInternal(const String& fileName, FileMode mode, bool fromPackage)
     {
 #ifdef _WIN32
         handle_ = _wfopen(GetWideNativePath(fileName).CString(), openMode[mode + 1]);
+#elif defined(__APPLE__)
+        handle_ = fopen(GetNativePath(fileName).CString(), openMode[mode + 1]);
 #else
         handle_ = fopen64(GetNativePath(fileName).CString(), openMode[mode + 1]);
 #endif

cmake/Modules/UrhoCommon.cmake

@@ -499,28 +499,28 @@ if (APPLE)
         # iOS-specific setup
         add_definitions (-DIOS)
         if (URHO3D_64BIT)
-            set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD))
+            set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD) CACHE STRING "OSX Architectures to build for. Default $(ARCHS_STANDARD)")
         else ()
             message (WARNING "URHO3D_64BIT=0 for iOS is a deprecated option and should not be used as we are phasing out 32-bit only mode")
-            set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD_32_BIT))
+            set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD_32_BIT) CACHE STRING "OSX Architectures to build for. Default $(ARCHS_STANDARD_32_BIT)")
         endif ()
     elseif (TVOS)
         # tvOS-specific setup
         add_definitions (-DTVOS)
-        set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD))
+        set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD) CACHE STRING "OSX Architectures to build for. Default $(ARCHS_STANDARD)")
     else ()
         if (XCODE)
             # macOS-specific setup
             if (URHO3D_64BIT)
                 if (URHO3D_UNIVERSAL)
                     message (WARNING "URHO3D_UNIVERSAL=1 for macOS is a deprecated option and should not be used as we are phasing out macOS universal binary mode")
-                    set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD_32_64_BIT))
+                    set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD_32_64_BIT) CACHE STRING "OSX Architectures to build for. Default $(ARCHS_STANDARD_32_64_BIT)")
                 else ()
-                    set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD))
+                    set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD) CACHE STRING "OSX Architectures to build for. Default $(ARCHS_STANDARD)")
                 endif ()
             else ()
                 message (WARNING "URHO3D_64BIT=0 for macOS is a deprecated option and should not be used as we are phasing out 32-bit only mode")
-                set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD_32_BIT))
+                set (CMAKE_OSX_ARCHITECTURES $(ARCHS_STANDARD_32_BIT) CACHE STRING "OSX Architectures to build for. Default $(ARCHS_STANDARD_32_BIT)")
             endif ()
         endif ()
     endif ()
@@ -1917,11 +1917,13 @@ if (IOS)
         # (see http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=12506&graph=dependency),
         # below temporary fix is required to work around the bug
         list (APPEND POST_CMAKE_FIXES COMMAND sed -i '' 's/\$$\(EFFECTIVE_PLATFORM_NAME\)//g' ${CMAKE_BINARY_DIR}/CMakeScripts/install_postBuildPhase.make* || exit 0)
+        message (WARNING "Added a possibly broken 'fix' to an Xcode generator bug as ${CMAKE_VERSION} VERSION_LESS 3.4. See https://discourse.urho3d.io/t/ios-xcode-sed-cant-read-s-effective-platform-name-g-n/1629 for more info.")
     endif ()
 elseif (TVOS)
     # Almost the same bug as iOS one above but not quite, most probably because CMake does not support AppleTV platform yet
     list (APPEND POST_CMAKE_FIXES COMMAND sed -i '' 's/\)\$$\(EFFECTIVE_PLATFORM_NAME\)/\) -DEFFECTIVE_PLATFORM_NAME=$$\(EFFECTIVE_PLATFORM_NAME\)/g' ${CMAKE_BINARY_DIR}/CMakeScripts/install_postBuildPhase.make* || exit 0)
     add_custom_target (APPLETV_POST_CMAKE_FIX COMMAND sed -i '' -E 's,\(Debug|RelWithDebInfo|Release\)/,$$\(CONFIGURATION\)$$\(EFFECTIVE_PLATFORM_NAME\)/,g' ${CMAKE_BINARY_DIR}/Source/Urho3D/CMakeScripts/Urho3D_cmakeRulesBuildPhase.make* || exit 0)
+	message (WARNING "Added a possibly broken 'fix' to an Xcode generator bug as ${CMAKE_VERSION} VERSION_LESS 3.4. See https://discourse.urho3d.io/t/ios-xcode-sed-cant-read-s-effective-platform-name-g-n/1629 for more info.")
 endif ()
 if (POST_CMAKE_FIXES)
     add_custom_target (POST_CMAKE_FIXES ALL ${POST_CMAKE_FIXES} COMMENT "Applying post-cmake fixes")

rakefile

@@ -38,6 +38,7 @@ task :cmake => [:init] do
     var.chomp!
     build_options = "#{build_options} -D #{var}=#{ENV[var]}" if ENV[var]
   }
+  print %Q{#{script} "#{build_tree}" #{build_options}}
   system %Q{#{script} "#{build_tree}" #{build_options}} or abort
 end
 
@@ -73,7 +74,7 @@ task :build, [:target] => [:cmake] do |_, args|
   case ENV['GENERATOR']
   when 'xcode'
     concurrent = '' # Assume xcodebuild will do the right things without the '-jobs'
-    filter = '|xcpretty -c && exit ${PIPESTATUS[0]}' if system('xcpretty -v >/dev/null 2>&1')
+    filter = '|xcpretty -c && exit ${PIPESTATUS[0]}' if system('xcpretty -v >/dev/null 2>&1') && ENV['USE_XCPRETTY']
   when 'vs'
     concurrent = '/maxCpuCount'
   else

script/.bash_helpers.sh

@@ -4,7 +4,8 @@
 # Define helpers
 post_cmake() {
     if [ -e "$BUILD"/*.xcodeproj/project.pbxproj ] && perl -v >/dev/null 2>&1; then
-        echo -- post_cmake: Fix generated Xcode project
+        echo -- DISABLED: post_cmake: Fix generated Xcode project
+    elif false; then
         # Speed up build for Debug build configuration by building only active arch (currently this is not doable via CMake generator-expression as it only works for individual target instead of global)
         perl -i -pe 'BEGIN {$/=undef} s/(Debug \*\/ = {[^}]+?)SDKROOT/\1ONLY_ACTIVE_ARCH = YES; SDKROOT/s' "$BUILD"/*.xcodeproj/project.pbxproj
         # Speed up build for Debug build configuration by skipping dSYM file generation

script/cmake_ios.sh

@@ -3,6 +3,6 @@
 # Copyright (c) 2008-2023 the Urho3D project
 # License: MIT
 
-$(dirname $0)/cmake_generic.sh "$@" -G Xcode -D IOS=1 -T buildsystem=1
+$(dirname $0)/cmake_generic.sh "$@" -G Xcode -D IOS=1
 
 # vi: set ts=4 sw=4 expandtab:

script/cmake_tvos.sh

@@ -3,6 +3,6 @@
 # Copyright (c) 2008-2023 the Urho3D project
 # License: MIT
 
-$(dirname $0)/cmake_generic.sh "$@" -G Xcode -D TVOS=1 -T buildsystem=1
+$(dirname $0)/cmake_generic.sh "$@" -G Xcode -D TVOS=1
 
 # vi: set ts=4 sw=4 expandtab:

script/cmake_xcode.sh

@@ -3,6 +3,6 @@
 # Copyright (c) 2008-2023 the Urho3D project
 # License: MIT
 
-$(dirname $0)/cmake_generic.sh "$@" -G Xcode -T buildsystem=1
+$(dirname $0)/cmake_generic.sh "$@" -G Xcode
 
 # vi: set ts=4 sw=4 expandtab: