Experimenting with the macOS action workflow and default settings.

Author: aregtech

.github/workflows/macos-build.yml

@@ -26,24 +26,14 @@ jobs:
       - name: Ensure Xcode CLI Tools
         run: sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
 
-      - name: Set SDKROOT
-        run: echo "SDKROOT=$(xcrun --show-sdk-path)" >> $GITHUB_ENV
-
       - name: create build directory
         working-directory: ${{github.workspace}}
         run: mkdir build
 
-      - name: Check SDK and architecture
-        run: |
-            clang -v
-            echo $SDKROOT
-            uname -m
-
       - name: Configure CMake for macOS native
         working-directory: ${{github.workspace}}
-        run: |
-             cmake -S . -B build -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_SYSROOT=$(xcrun --show-sdk-path) -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_BUILD_TYPE=Release -DAREG_COMPILER_FAMILY=llvm -DAREG_PROCESSOR=arm64
+        run: cmake -S . -B ./build
 
       - name: Build with CMake
         working-directory: ${{github.workspace}}
-        run: cmake --build build --config ${{env.BUILD_TYPE}} -j16
+        run: cmake --build ./build -j16

conf/cmake/common.cmake

@@ -265,10 +265,10 @@ include_directories(BEFORE "${AREG_FRAMEWORK}" "${AREG_BUILD_ROOT}" "${AREG_GENE
 link_directories(BEFORE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}")
 
 # Only for Linux
-if((UNIX) AND (NOT CYGWIN) AND (NOT MINGW))
+if (AREG_PLATFORM_MACOS)
+    set(CMAKE_EXECUTABLE_SUFFIX ".mac")
+elseif ((UNIX) AND (NOT CYGWIN) AND (NOT MINGW))
     set(CMAKE_EXECUTABLE_SUFFIX ".elf")
-elseif(AREG_PLATFORM_MACOS)
-    set(CMAKE_EXECUTABLE_SUFFIX ".macos")
 endif()
 
 set(COMMON_COMPILE_DEF)

conf/cmake/functions.cmake

@@ -577,7 +577,9 @@ macro(macro_setup_compilers_data
     endif()
 
     # Iterate over known compilers to identify the compiler type
-    foreach(_entry "clang-cl;llvm;clang-cl" "clang++;llvm;clang" "clang;llvm;clang" "appleclang++;llvm;appleclang" "g++;gnu;gcc" "gcc;gnu;gcc" "c++;gnu;cc" "cc;gnu;cc" "cl;msvc;cl")
+    # Note: "c++" and "cc" use "wrapper" family - they need runtime detection since they
+    # can be symlinks/wrappers for either GCC or Clang depending on the system
+    foreach(_entry "clang-cl;llvm;clang-cl" "clang++;llvm;clang" "clang;llvm;clang" "appleclang++;llvm;appleclang" "g++;gnu;gcc" "gcc;gnu;gcc" "c++;wrapper;cc" "cc;wrapper;cc" "cl;msvc;cl")
         list(GET _entry 0 _cxx_comp)
 
         # Check if the provided compiler matches the known C++ compiler
@@ -586,6 +588,27 @@ macro(macro_setup_compilers_data
         if (_found_pos GREATER -1)
             list(GET _entry 1 _family)
             list(GET _entry 2 _cc_comp)
+
+            # Handle cc/c++ wrapper compilers - detect actual compiler by running --version
+            if (${_family} STREQUAL wrapper)
+                execute_process(
+                    COMMAND "${compiler_path}" --version
+                    OUTPUT_VARIABLE _version_output
+                    ERROR_QUIET
+                    OUTPUT_STRIP_TRAILING_WHITESPACE
+                    RESULT_VARIABLE _version_result
+                )
+                string(TOLOWER "${_version_output}" _version_lower)
+
+                if ("${_version_lower}" MATCHES "clang")
+                    # cc/c++ is actually Clang (common on macOS and some Linux distros)
+                    set(_family "llvm")
+                else()
+                    # Assume GNU/GCC
+                    set(_family "gnu")
+                endif()
+            endif()
+
             # Handle special case for CYGWIN and GNU family compilers
             if (${_family} STREQUAL gnu)
                 if (CYGWIN)
@@ -639,6 +662,9 @@ macro(macro_setup_compilers_data
     unset(_family)
     unset(_cc_comp)
     unset(_found_pos)
+    unset(_version_output)
+    unset(_version_lower)
+    unset(_version_result)
 
 endmacro(macro_setup_compilers_data)
 

tools/setup-project.bat

@@ -56,9 +56,9 @@ echo     ^)
 echo     FetchContent_MakeAvailable^(areg^)
 echo.
 echo     # Set the root directory of the fetched Areg SDK
-echo     set^(AREG_SDK_ROOT        "${areg_SOURCE_DIR}"^)
+echo     set^(AREG_SDK_ROOT         "${areg_SOURCE_DIR}"^)
 echo     set^(AREG_CMAKE_CONFIG_DIR "${AREG_SDK_ROOT}/conf/cmake"^)
-echo     set^(AREG_CMAKE          "${AREG_SDK_ROOT}/areg.cmake"^)
+echo     set^(AREG_CMAKE            "${AREG_SDK_ROOT}/areg.cmake"^)
 echo     message^(STATUS ">>> Fetched Areg SDK from GitHub to ${FETCHCONTENT_BASE_DIR}"^)
 echo     message^(STATUS ">>> Location of 'areg.cmake' ${AREG_CMAKE}"^)
 echo else^(^)

tools/setup-project.sh

@@ -58,9 +58,9 @@ if (NOT areg_FOUND)
     FetchContent_MakeAvailable(areg)
 
     # Set the root directory of the fetched Areg SDK
-    set(AREG_SDK_ROOT        "\${areg_SOURCE_DIR}")
+    set(AREG_SDK_ROOT         "\${areg_SOURCE_DIR}")
     set(AREG_CMAKE_CONFIG_DIR "\${AREG_SDK_ROOT}/conf/cmake")
-    set(AREG_CMAKE          "\${AREG_SDK_ROOT}/areg.cmake")
+    set(AREG_CMAKE            "\${AREG_SDK_ROOT}/areg.cmake")
     message(STATUS ">>> Fetched Areg SDK from GitHub to \${FETCHCONTENT_BASE_DIR}")
     message(STATUS ">>> Location of 'areg.cmake' \${AREG_CMAKE}")
 else()