Merge branch 'osx' into ci

Author: mmcgr

.github/workflows/CI-Tests.yml

@@ -158,8 +158,7 @@ jobs:
     - name: cmake-test-64bit
       uses: ./.github/actions/cmake-test
       with:
-        # disable openmp on ARM architecture, see souffle-lang/souffle#2476
-        cmake-flags: -DSOUFFLE_DOMAIN_64BIT=ON -DSOUFFLE_USE_OPENMP=OFF
+        cmake-flags: -DSOUFFLE_DOMAIN_64BIT=ON -DOpenMP_ROOT=/opt/homebrew/opt/libomp
         n-chunks: ${{ needs.Test-Setup.outputs.n-chunks }}
         chunk: ${{ matrix.chunk }}
 

CMakeLists.txt

@@ -233,6 +233,26 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
         message(STATUS "Found Flex keg installed by Homebrew at ${BREW_FLEX_PREFIX}")
         set(FLEX_EXECUTABLE "${BREW_FLEX_PREFIX}/bin/flex")
     endif()
+
+    # Xcode 15 needs the -ld_classic flag to be set. In Xcode 26 it is no longer
+    # needed but does generate deprecation warnings.
+    execute_process(
+        COMMAND xcodebuild -version
+        OUTPUT_VARIABLE XCODE_OUT
+        ERROR_VARIABLE XCODE_ERR
+        RESULT_VARIABLE XCODE_SUCCESS
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    if (XCODE_SUCCESS EQUAL 0)
+        string(REGEX MATCH "Xcode[ ]+([0-9]+(\\.[0-9]+)+)" XCODE_VERSION "${XCODE_OUT}")
+        set(XCODE_VERSION "${CMAKE_MATCH_1}")
+        message(STATUS "Xcode version ${XCODE_VERSION} found")
+    else()
+        message(STATUS "xcodebuild -version failed. -ld_classic will not be used.")
+        set(XCODE_VERSION "0")
+    endif()
+
 endif()
 find_package(FLEX REQUIRED)
 find_package(BISON "3.2" REQUIRED)
@@ -257,6 +277,9 @@ endif()
 # --------------------------------------------------
 if (SOUFFLE_USE_SQLITE)
     find_package(SQLite3 REQUIRED)
+    if(NOT TARGET SQLite3::SQLite3) # CMake < 4.3
+        add_library(SQLite3::SQLite3 ALIAS SQLite::SQLite3)
+    endif()
     if (SOUFFLE_ENABLE_TESTING)
         find_program(SQLITE3_BINARY sqlite3 REQUIRED)
     endif()

sh/setup/install_macos_arm_deps.sh

@@ -8,7 +8,7 @@ set -e
 set -x
 
 # Install requirements of MAC OS X
-brew install libtool mcpp swig bison libffi
+brew install libtool mcpp swig bison libffi libomp
 #brew install gcc@13
 #brew link gcc@13
 

sh/setup/install_macos_deps.sh

@@ -8,7 +8,7 @@ set -e
 set -x
 
 # Install requirements of MAC OS X
-brew install bison libtool mcpp libffi swig
+brew install bison libtool mcpp libffi swig libomp
 brew install gcc@12
 brew link gcc@12
 

src/CMakeLists.txt

@@ -309,8 +309,8 @@ endif()
 if (SOUFFLE_USE_SQLITE)
     target_compile_definitions(libsouffle PUBLIC USE_SQLITE)
     target_compile_definitions(compiled PUBLIC USE_SQLITE)
-    target_link_libraries(libsouffle PUBLIC SQLite::SQLite3)
-    target_link_libraries(compiled PUBLIC SQLite::SQLite3)
+    target_link_libraries(libsouffle PUBLIC SQLite3::SQLite3)
+    target_link_libraries(compiled PUBLIC SQLite3::SQLite3)
     target_include_directories(compiled PUBLIC ${SQLite3_INCLUDE_DIRS})
 endif()
 
@@ -440,12 +440,14 @@ endif (MSVC)
 
 if (APPLE)
   if ("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64")
-    # work around a known issue with xcode15 linker
-    # c++ exceptions handling is broken otherwise
-    set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,-ld_classic")
-    target_link_options(libsouffle PUBLIC "-ld_classic")
-    target_link_options(compiled PUBLIC "-ld_classic")
-    target_link_options(souffleprof PUBLIC "-ld_classic")
+    if (XCODE_VERSION VERSION_LESS "26" AND NOT XCODE_VERSION VERSION_LESS "15")
+      # work around a known issue with xcode15 linker
+      # c++ exceptions handling is broken otherwise
+      set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,-ld_classic")
+      target_link_options(libsouffle PUBLIC "-ld_classic")
+      target_link_options(compiled PUBLIC "-ld_classic")
+      target_link_options(souffleprof PUBLIC "-ld_classic")
+    endif()
   endif()
 endif()
 
@@ -474,6 +476,9 @@ endif()
 
 if (OPENMP_FOUND)
   string(APPEND SOUFFLE_COMPILED_CXX_FLAGS " ${OpenMP_CXX_FLAGS}")
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    string(APPEND SOUFFLE_COMPILED_CXX_FLAGS " ${OpenMP_CXX_LIBRARIES}")
+  endif()
   list(APPEND SOUFFLE_COMPILED_INCS ${OpenMP_CXX_INCLUDE_DIRS})
 endif()
 
@@ -560,6 +565,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   set(SOUFFLE_COMPILED_LINK_OPTIONS "/link ${SOUFFLE_COMPILED_LINK_OPTIONS}")
 endif ()
 
+list(REMOVE_DUPLICATES SOUFFLE_COMPILED_RPATHS)
 list(JOIN SOUFFLE_COMPILED_RPATHS "${OS_PATH_DELIMITER}" SOUFFLE_COMPILED_RPATH_LIST)
 
 list(TRANSFORM SOUFFLE_COMPILED_INCS PREPEND "-I")

tests/interface/CMakeLists.txt

@@ -25,7 +25,19 @@ function(SOUFFLE_RUN_CPP_TEST)
   set(ADDITIONNAL_FLAGS)
 
   if (OPENMP_FOUND)
+    # CXX_FLAGS may be space separated, e.g., '-Xclang -fopenmp'
     list(APPEND ADDITIONNAL_FLAGS ${OpenMP_CXX_FLAGS})
+    separate_arguments(ADDITIONNAL_FLAGS)
+
+    # AppleClang needs a little more help to find omp
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+      if (NOT OpenMP_CXX_INCLUDE_DIRS STREQUAL "")
+        list(APPEND ADDITIONNAL_FLAGS "-I${OpenMP_CXX_INCLUDE_DIRS}")
+      endif()
+      if (NOT OpenMP_CXX_LIBRARIES STREQUAL "")
+        list(APPEND ADDITIONNAL_FLAGS "${OpenMP_CXX_LIBRARIES}")
+      endif()
+    endif()
   endif()
 
   if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")