build reorganization and experimental clang support

.github/workflows/build-and-test.yml

@@ -33,9 +33,7 @@ jobs:
     - name: cmake
       uses: lukka/run-cmake@v10
       with:
-        configurePreset: "ci-${{matrix.os}}"
+        workflowPreset: "ci-${{matrix.os}}"
-        buildPreset: "ci-${{matrix.os}}"
-        testPreset: "ci-${{matrix.os}}"
     - name: artifacts
       uses: actions/upload-artifact@v3
       with:

CMakePresets.json

@@ -1,8 +1,8 @@
 {
-    "version": 3,
+  "version": 6,
   "cmakeMinimumRequired": {
     "major": 3,
-      "minor": 14,
+    "minor": 25,
     "patch": 0
   },
   "configurePresets": [
@@ -13,42 +13,6 @@
       "binaryDir": "${sourceDir}/build",
       "generator": "Unix Makefiles"
     },
-      {
-        "name": "ci-ubuntu-22.04",
-        "displayName": "CI configure step for Ubuntu",
-        "description": "Same as default, Used in GitHub actions workflow",
-        "inherits": "default",
-        "cacheVariables": {
-          "CMAKE_BUILD_TYPE": "Release"
-        }
-      },
-      {
-        "name": "debug-ubuntu-22.04",
-        "displayName": "Debug configure step for Ubuntu",
-        "description": "Used to generate debug configuration for Ubuntu",
-        "inherits": "default",
-        "cacheVariables": {
-          "CMAKE_BUILD_TYPE": "Debug",
-          "CMAKE_CXX_FLAGS_INIT" : "-Og",
-          "CMAKE_C_FLAGS_INIT" : "-Og"
-        }
-      },
-      {
-        "name": "ci-macos-13",
-        "displayName": "CI configure step for MacOS",
-        "description": "Same as default, Used in GitHub actions workflow",
-        "inherits": "default",
-        "cacheVariables": {
-          "CMAKE_CXX_FLAGS_INIT" : "-O2",
-          "CMAKE_C_FLAGS_INIT" : "-O2"
-        }
-      },
-      {
-        "name": "debug-macos-13",
-        "displayName": "Debug configure step for MacOS",
-        "description": "Used to generate debug configuration for MacOS",
-        "inherits": "default"
-      },
     {
       "name": "ci-windows-2022",
       "displayName": "CI configure step for Windows",
@@ -58,34 +22,109 @@
       "architecture": {
         "value": "x64"
       },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      },
       "cacheVariables": {
-          "CMAKE_BUILD_TYPE": "Release",
         "CMAKE_CXX_FLAGS_INIT": "/Zc:inline"
       }
     },
-      {
-        "name": "debug-windows-2022",
-        "displayName": "Debug configure step for Windows",
-        "description": "Set architecture to 64-bit (b/c RakNet)",
-        "inherits": "default",
-        "generator": "Visual Studio 17 2022",
-        "architecture": {
-          "value": "x64"
-        },
-        "cacheVariables": {
-          "CMAKE_CXX_FLAGS_INIT": "Debug"
-        }
-      },
     {
       "name": "windows-default",
       "inherits": "ci-windows-2022",
       "displayName": "Windows only Configure Settings",
       "description": "Sets build and install directories",
       "generator": "Ninja",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      },
       "architecture": {
         "value": "x64",
         "strategy": "external"
       }
+    },
+    {
+      "name": "linux-base",
+      "displayName": "x86_64-pc-linux-gnu",
+      "description": "Linux base configuration",
+      "hidden": true,
+      "binaryDir": "${sourceDir}/build",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      }
+    },
+    {
+      "name": "linux-clang-debug",
+      "inherits": "linux-base",
+      "displayName": "[Debug] Linux (Clang)",
+      "description": "Create a debug build using the Clang toolchain for Linux",
+      "binaryDir": "${sourceDir}/build",
+      "toolchainFile": "${sourceDir}/cmake/toolchains/linux-clang.cmake",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "linux-clang-release",
+      "inherits": "linux-clang-debug",
+      "displayName": "[Release] Linux (Clang)",
+      "description": "Create a release build using the Clang toolchain for Linux",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "linux-gcc-debug",
+      "displayName": "[Debug] Linux (GCC)",
+      "description": "Create a debug build using the GNU toolchain for Linux",
+      "binaryDir": "${sourceDir}/build",
+      "toolchainFile": "${sourceDir}/cmake/toolchains/linux-gcc.cmake",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "linux-gcc-release",
+      "inherits": "linux-gcc-debug",
+      "displayName": "[Release] Linux (GCC)",
+      "description": "Create a release build using the GNU toolchain for Linux",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "macos-appleclang-debug",
+      "displayName": "[Debug] MacOS (AppleClang)",
+      "description": "Same as default, Used in GitHub actions workflow",
+      "inherits": "default",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
+      },
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "macos-appleclang-release",
+      "displayName": "[Release] MacOS (AppleClang)",
+      "description": "Same as default, Used in GitHub actions workflow",
+      "inherits": "default",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
+      },
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
     }
   ],
   "buildPresets": [
@@ -96,22 +135,6 @@
       "description": "Default Build",
       "jobs": 2
     },
-      {
-        "name": "ci-ubuntu-22.04",
-        "configurePreset": "ci-ubuntu-22.04",
-        "displayName": "Linux CI Build",
-        "description": "This preset is used by the CI build on linux",
-        "configuration": "Release",
-        "jobs": 2
-      },
-      {
-        "name": "debug-ubuntu-22.04",
-        "configurePreset": "debug-ubuntu-22.04",
-        "displayName": "Linux Debug Build ",
-        "description": "This preset is used to debug the build on linux",
-        "configuration": "Debug",
-        "jobs": 2
-      },
     {
       "name": "ci-windows-2022",
       "configurePreset": "ci-windows-2022",
@@ -122,59 +145,17 @@
     },
     {
       "name": "debug-windows-2022",
-        "configurePreset": "debug-windows-2022",
+      "configurePreset": "ci-windows-2022",
       "displayName": "Windows Debug Build",
       "description": "This preset is used to debug the build on windows",
       "configuration": "Release",
       "jobs": 2
-      },
-      {
-        "name": "ci-macos-13",
-        "configurePreset": "ci-macos-13",
-        "displayName": "MacOS CI Build",
-        "description": "This preset is used by the CI build on MacOS",
-        "jobs": 2
-      },
-      {
-        "name": "debug-macos-13",
-        "configurePreset": "debug-macos-13",
-        "displayName": "MacOS Debug Build",
-        "description": "This preset is used to debug the build on MacOS",
-        "jobs": 2
     }
   ],
   "testPresets": [
     {
-        "name": "ci-ubuntu-22.04",
+      "name": "default",
-        "configurePreset": "ci-ubuntu-22.04",
+      "configurePreset": "default",
-        "displayName": "CI Tests on Linux",
-        "description": "Runs all tests on a linux configuration",
-        "configuration": "Release",
-        "execution": {
-          "jobs": 2
-        },
-        "output": {
-          "outputOnFailure": true
-        }
-      },
-      {
-        "name": "debug-ubuntu-22.04",
-        "configurePreset": "debug-ubuntu-22.04",
-        "displayName": "Debug Tests on Linux",
-        "description": "Runs all tests on a linux configuration",
-        "configuration": "Debug",
-        "execution": {
-          "jobs": 2
-        },
-        "output": {
-          "outputOnFailure": true
-        }
-      },
-      {
-        "name": "ci-macos-13",
-        "configurePreset": "ci-macos-13",
-        "displayName": "CI Tests on MacOS",
-        "description": "Runs all tests on a Mac configuration",
       "execution": {
         "jobs": 2
       },
@@ -200,5 +181,64 @@
         }
       }
     }
+  ],
+  "workflowPresets": [
+    {
+      "name": "ci-windows-2022",
+      "displayName": "Windows CI Workflow",
+      "description": "CI workflow preset for Windows",
+      "steps": [
+        {
+          "type": "configure",
+          "name": "ci-windows-2022"
+        },
+        {
+          "type": "build",
+          "name": "default"
+        },
+        {
+          "type": "test",
+          "name": "default"
+        }
+      ]
+    },
+    {
+      "name": "ci-ubuntu-22.04",
+      "displayName": "Ubuntu CI Workflow",
+      "description": "CI workflow preset for Ubuntu",
+      "steps": [
+        {
+          "type": "configure",
+          "name": "linux-gcc-release"
+        },
+        {
+          "type": "build",
+          "name": "default"
+        },
+        {
+          "type": "test",
+          "name": "default"
+        }
+      ]
+    },
+    {
+      "name": "ci-macos-13",
+      "displayName": "MacOS CI Workflow",
+      "description": "CI workflow preset for MacOS",
+      "steps": [
+        {
+          "type": "configure",
+          "name": "macos-appleclang-release"
+        },
+        {
+          "type": "build",
+          "name": "default"
+        },
+        {
+          "type": "test",
+          "name": "default"
+        }
+      ]
+    }
   ]
 }

dCommon/GeneralUtils.cpp

@@ -320,7 +320,7 @@ std::vector<std::string> GeneralUtils::GetSqlFileNamesFromFolder(const std::stri
 	return sortedFiles;
 }
 
-#ifdef DARKFLAME_PLATFORM_MACOS
+#if !(__GNUC__ >= 11 || _MSC_VER >= 1924)
 
 // MacOS floating-point parse function specializations
 namespace GeneralUtils::details {

thirdparty/CMakeLists.txt

@@ -23,6 +23,11 @@ if(NOT WIN32)
 	target_include_directories(bcrypt PRIVATE "libbcrypt/include/bcrypt")
 endif()
 
+# Need to define this on Clang (Linux) for 'strdup' support
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	target_compile_definitions(bcrypt PRIVATE "_POSIX_C_SOURCE=200809L")
+endif()
+
 target_include_directories(bcrypt INTERFACE "libbcrypt/include")
 target_include_directories(bcrypt PRIVATE "libbcrypt/src")