fix(ci): reenable gcc-14 by turning off modules

wravery · wravery · commit 4c94d19697e4 · 2024-09-15T21:43:52.000-07:00
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -3,10 +3,11 @@ name: Linux
 on: [push, pull_request]
 
 jobs:
-  clang-18:
+  Linux:
     strategy:
       fail-fast: false
       matrix:
+        compiler: [gcc-14, clang-18]
         config: [debug, release]
 
     runs-on: ubuntu-24.04
@@ -34,10 +35,10 @@ jobs:
       run: cmake -E make_directory build
 
     - name: Configure CMake
-      run: cmake --preset clang-18-${{ matrix.config }} -DCMAKE_TOOLCHAIN_FILE=
+      run: cmake --preset ${{ matrix.compiler }}-${{ matrix.config }} -DCMAKE_TOOLCHAIN_FILE=
 
     - name: Build
-      run: cmake --build --preset clang-18-${{ matrix.config }} -j -v
+      run: cmake --build --preset ${{ matrix.compiler }}-${{ matrix.config }} -j -v
 
     - name: Test
-      run: ctest --preset clang-18-${{ matrix.config }} --output-on-failure
+      run: ctest --preset ${{ matrix.compiler }}-${{ matrix.config }} --output-on-failure
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,6 +33,7 @@ if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
   endif()
 endif()
 
+option(GRAPHQL_BUILD_MODULES "Build the C++20 module interface libraries." ON)
 option(GRAPHQL_BUILD_SCHEMAGEN "Build the schemagen tool." ON)
 option(GRAPHQL_BUILD_CLIENTGEN "Build the clientgen tool." ON)
 option(GRAPHQL_BUILD_TESTS "Build the tests and sample schema library." ON)
@@ -102,11 +103,6 @@ else()
   add_compile_options(-Wall -Wextra -pedantic -Werror)
 endif()
 
-# Workaround name mangling compatibility in GCC.
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  add_compile_options(-fabi-compat-version=19)
-endif()
-
 function(add_bigobj_flag target)
   if(MSVC)
     # MSVC requires the /bigobj flag if the number of sections gets too big.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -32,7 +32,8 @@
             },
             "cacheVariables": {
                 "CMAKE_C_COMPILER": "/usr/bin/gcc-14",
-                "CMAKE_CXX_COMPILER": "/usr/bin/g++-14"
+                "CMAKE_CXX_COMPILER": "/usr/bin/g++-14",
+                "GRAPHQL_BUILD_MODULES": false
             }
         },
         {
diff --git a/cmake/cppgraphqlgen-functions.cmake b/cmake/cppgraphqlgen-functions.cmake
@@ -44,24 +44,21 @@ function(add_graphql_schema_target SCHEMA_TARGET)
 
   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_TARGET}_schema_files)
     file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_TARGET}_schema_files SCHEMA_FILES)
-    file(GLOB SCHEMA_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
-    file(GLOB SCHEMA_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/*.ixx)
     add_library(${SCHEMA_TARGET}_schema STATIC ${SCHEMA_FILES})
     add_dependencies(${SCHEMA_TARGET}_schema ${SCHEMA_TARGET}_update_schema)
     target_compile_features(${SCHEMA_TARGET}_schema PUBLIC cxx_std_20)
     target_include_directories(${SCHEMA_TARGET}_schema PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
     target_link_libraries(${SCHEMA_TARGET}_schema PUBLIC cppgraphqlgen::graphqlservice)
-    target_sources(${SCHEMA_TARGET}_schema
-      PUBLIC FILE_SET HEADERS
-      BASE_DIRS
-        ${CMAKE_CURRENT_SOURCE_DIR}
-      FILES
-        ${SCHEMA_HEADERS}
-      PUBLIC FILE_SET CXX_MODULES
-      BASE_DIRS
-        ${CMAKE_CURRENT_SOURCE_DIR}
-      FILES
-        ${SCHEMA_MODULES})
+    file(GLOB SCHEMA_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+    target_sources(${SCHEMA_TARGET}_schema PUBLIC FILE_SET HEADERS
+      BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
+      FILES ${SCHEMA_HEADERS})
+    if(GRAPHQL_BUILD_MODULES)
+      file(GLOB SCHEMA_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/*.ixx)
+      target_sources(${SCHEMA_TARGET}_schema PUBLIC FILE_SET CXX_MODULES
+        BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
+        FILES ${SCHEMA_MODULES})
+    endif()
   endif()
 endfunction()
 
@@ -100,23 +97,20 @@ function(add_graphql_client_target CLIENT_TARGET)
 
   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${CLIENT_TARGET}_client_files)
     file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/${CLIENT_TARGET}_client_files CLIENT_FILES)
-    file(GLOB CLIENT_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
-    file(GLOB CLIENT_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/*.ixx)
     add_library(${CLIENT_TARGET}_client STATIC ${CLIENT_FILES})
     add_dependencies(${CLIENT_TARGET}_client ${CLIENT_TARGET}_update_client)
     target_compile_features(${CLIENT_TARGET}_client PUBLIC cxx_std_20)
     target_include_directories(${CLIENT_TARGET}_client PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
     target_link_libraries(${CLIENT_TARGET}_client PUBLIC cppgraphqlgen::graphqlclient)
-    target_sources(${CLIENT_TARGET}_client
-      PUBLIC FILE_SET HEADERS
-      BASE_DIRS
-        ${CMAKE_CURRENT_SOURCE_DIR}
-      FILES
-        ${CLIENT_HEADERS}
-      PUBLIC FILE_SET CXX_MODULES
-      BASE_DIRS
-        ${CMAKE_CURRENT_SOURCE_DIR}
-      FILES
-        ${CLIENT_MODULES})
+    file(GLOB CLIENT_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+    target_sources(${CLIENT_TARGET}_client PUBLIC FILE_SET HEADERS
+      BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
+      FILES ${CLIENT_HEADERS})
+    if(GRAPHQL_BUILD_MODULES)
+      file(GLOB CLIENT_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/*.ixx)
+      target_sources(${CLIENT_TARGET}_client PUBLIC FILE_SET CXX_MODULES
+        BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
+        FILES ${CLIENT_MODULES})
+    endif()
   endif()
 endfunction()
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
@@ -5,9 +5,12 @@ cmake_minimum_required(VERSION 3.28)
 
 add_subdirectory(client)
 add_subdirectory(learn)
-add_subdirectory(today)
 add_subdirectory(validation)
 
+if(GRAPHQL_BUILD_MODULES)
+  add_subdirectory(today)
+endif()
+
 if(GRAPHQL_BUILD_HTTP_SAMPLE)
   find_package(boost_beast CONFIG QUIET)
   if(Boost_FOUND)
diff --git a/samples/client/CMakeLists.txt b/samples/client/CMakeLists.txt
@@ -11,30 +11,32 @@ add_subdirectory(multiple)
 
 add_subdirectory(benchmark)
 
-# client_benchmark
-add_executable(client_benchmark benchmark.cpp)
-target_link_libraries(client_benchmark PRIVATE
-  todaygraphql
-  benchmark_client)
+if(GRAPHQL_BUILD_MODULES)
+  # client_benchmark
+  add_executable(client_benchmark benchmark.cpp)
+  target_link_libraries(client_benchmark PRIVATE
+    todaygraphql
+    benchmark_client)
 
-if(WIN32 AND BUILD_SHARED_LIBS)
-  add_custom_command(OUTPUT copied_sample_dlls
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-      $<TARGET_FILE:graphqlservice>
-      $<TARGET_FILE:graphqljson>
-      $<TARGET_FILE:graphqlpeg>
-      $<TARGET_FILE:graphqlresponse>
-      $<TARGET_FILE:graphqlclient>
-      ${CMAKE_CURRENT_BINARY_DIR}
-    COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/copied_sample_dlls
-    DEPENDS
-      graphqlservice
-      graphqljson
-      graphqlpeg
-      graphqlresponse
-      graphqlclient)
+  if(WIN32 AND BUILD_SHARED_LIBS)
+    add_custom_command(OUTPUT copied_sample_dlls
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        $<TARGET_FILE:graphqlservice>
+        $<TARGET_FILE:graphqljson>
+        $<TARGET_FILE:graphqlpeg>
+        $<TARGET_FILE:graphqlresponse>
+        $<TARGET_FILE:graphqlclient>
+        ${CMAKE_CURRENT_BINARY_DIR}
+      COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/copied_sample_dlls
+      DEPENDS
+        graphqlservice
+        graphqljson
+        graphqlpeg
+        graphqlresponse
+        graphqlclient)
 
-  add_custom_target(copy_client_sample_dlls DEPENDS copied_sample_dlls)
+    add_custom_target(copy_client_sample_dlls DEPENDS copied_sample_dlls)
 
-  add_dependencies(client_benchmark copy_client_sample_dlls)
+    add_dependencies(client_benchmark copy_client_sample_dlls)
+  endif()
 endif()
diff --git a/samples/today/CMakeLists.txt b/samples/today/CMakeLists.txt
@@ -8,26 +8,28 @@ add_subdirectory(schema)
 add_library(todaygraphql STATIC TodayMock.cpp)
 target_compile_features(todaygraphql PUBLIC cxx_std_20)
 target_link_libraries(todaygraphql PUBLIC today_schema)
-target_sources(todaygraphql
-  PUBLIC FILE_SET HEADERS
-    BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
-    FILES ${CMAKE_CURRENT_SOURCE_DIR}/TodayMock.h
-  PUBLIC FILE_SET CXX_MODULES
+target_sources(todaygraphql PUBLIC FILE_SET HEADERS
+  BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
+  FILES ${CMAKE_CURRENT_SOURCE_DIR}/TodayMock.h)
+if(GRAPHQL_BUILD_MODULES)
+  target_sources(todaygraphql PUBLIC FILE_SET CXX_MODULES
     BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/TodayMock.ixx)
+endif()
 
 # todaygraphql_nointrospection
 add_subdirectory(nointrospection)
 add_library(todaygraphql_nointrospection STATIC TodayMock.cpp)
 target_compile_features(todaygraphql_nointrospection PUBLIC cxx_std_20)
 target_link_libraries(todaygraphql_nointrospection PUBLIC today_nointrospection_schema)
-target_sources(todaygraphql_nointrospection
-  PUBLIC FILE_SET HEADERS
-    BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
-    FILES ${CMAKE_CURRENT_SOURCE_DIR}/TodayMock.h
-  PUBLIC FILE_SET CXX_MODULES
+target_sources(todaygraphql_nointrospection PUBLIC FILE_SET HEADERS
+  BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
+  FILES ${CMAKE_CURRENT_SOURCE_DIR}/TodayMock.h)
+if(GRAPHQL_BUILD_MODULES)
+  target_sources(todaygraphql_nointrospection PUBLIC FILE_SET CXX_MODULES
     BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/TodayMock.ixx)
+endif()
 
 if(MSVC)
   # warning C4702: unreachable code
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@`
`32`	`32`	`},`
`33`	`33`	`"cacheVariables": {`
`34`	`34`	`"CMAKE_C_COMPILER": "/usr/bin/gcc-14",`
`35`		`- "CMAKE_CXX_COMPILER": "/usr/bin/g++-14"`
	`35`	`+ "CMAKE_CXX_COMPILER": "/usr/bin/g++-14",`
	`36`	`+ "GRAPHQL_BUILD_MODULES": false`
`36`	`37`	`}`
`37`	`38`	`},`
`38`	`39`	`{`