ENH: Update build-matrix.yml to include Ubuntu in the matrix

.github/workflows/build-matrix.yml

@@ -5,49 +5,23 @@ on:
     branches: ["main"]
   pull_request:
     branches: ["main"]
-
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, macos-latest] # , ubuntu-latest
+        os: [windows-latest, ubuntu-latest, macos-latest] #
         include:
           - os: windows-latest
             compiler: msvc
-          # - os: ubuntu-latest
-          #   compiler: gcc
+          - os: ubuntu-latest
+            compiler: gcc
           - os: macos-latest
             compiler: clang
     steps:
       - name: Checkout code
         uses: actions/[email protected]
 
-      - name: Install Ninja
-        shell: bash
-        run: |
-          if [[ "${{ runner.os }}" == "Windows" ]]; then
-            choco install ninja --yes --force
-          elif [[ "${{ runner.os }}" == "Linux" ]]; then
-            sudo apt-get install -y ninja-build
-          elif [[ "${{ runner.os }}" == "macOS" ]]; then
-            brew upgrade ninja || brew install ninja
-          fi
-
-      - name: Install LLVM (macOS only)
-        if: matrix.os == 'macos-latest'
-        run: |
-          brew install llvm
-          echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH
-
-      - name: Cache vcpkg
-        uses: actions/[email protected]
-        with:
-          path: |
-            vcpkg
-            vcpkg_installed
-          key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }}
-
       - name: vcpkg installation
         shell: bash
         run: |
@@ -63,12 +37,8 @@ jobs:
 
       - name: Configure CMake
         run: |
-          if [[ "${{ runner.os }}" == "macOS" ]]; then
-            cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++
-          else
-            cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
-          fi
-
+          cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
+      # cmake -B build -DCMAKE_BUILD_TYPE=Release -DCPM_SOURCE_CACHE=~/cpm-cache
       - name: Build
         run: |
           cmake --build build --config Release

CMakeLists.txt

@@ -10,11 +10,11 @@ if (CMAKE_CXX_STANDARD LESS 23)
 endif ()
 
 if (MSVC)
-    add_compile_options(/W4 /WX /experimental:module /std:c++latest)
+    add_compile_options(/W4 /WX /std:c++latest)
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     add_compile_options(-Wall -Wextra -pedantic -Werror -std=c++23)
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-    add_compile_options(-Wall -Wextra -pedantic -Werror -fmodules -fbuiltin-module-map -c -std=c++2b)
+    add_compile_options(-Wall -Wextra -pedantic -Werror -std=c++2b)
 else ()
     message(WARNING "You are using an unsupported compiler! Compilation has only been tested with MSVC, GCC and Clang.")
 endif ()
@@ -25,7 +25,6 @@ configure_file(
 )
 
 set(BUILD_SHARED_LIBS ON)
-set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
 
 set(CPM_DOWNLOAD_LOCATION "${CMAKE_SOURCE_DIR}/cmake/CPM.cmake")
 

gtfs/CMakeLists.txt

@@ -26,11 +26,11 @@ add_library(${PROJECT_NAME} SHARED
         src/strategies/GtfsCalendarReader.h
 )
 
-target_sources(${PROJECT_NAME}
-        PUBLIC
-        FILE_SET all_my_modules TYPE CXX_MODULES FILES
-        src/mod.test.cppm
-)
+# target_sources(${PROJECT_NAME}
+#         PUBLIC
+#         FILE_SET all_my_modules TYPE CXX_MODULES FILES
+#         src/mod.test.cppm
+# )
 
 message("CU_LIST_DIR UO: ${CMAKE_CURRENT_LIST_DIR}")