give up using toolchain

bemanproject · Nov 15, 2024 · b000f40 · b000f40
1 parent f4932e9
commit b000f40
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 51 deletions.
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -51,10 +51,10 @@ jobs:
             args: ""
           - description: "TSan"
             config: "Debug"
-            args: "-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain.cmake -DBEMAN_BUILDSYS_SANITIZER=TSan"
+            args: "-DBEMAN_BUILDSYS_SANITIZER=TSan"
           - description: "ASan"
             config: "Debug"
-            args: "-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain.cmake -DBEMAN_BUILDSYS_SANITIZER=ASan"
+            args: "-DBEMAN_BUILDSYS_SANITIZER=ASan"
         include:
           - platform: ubuntu-latest
             compiler:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,6 +23,10 @@ option(
     ${PROJECT_IS_TOP_LEVEL}
 )
 
+if(DEFINED BEMAN_BUILDSYS_SANITIZER)
+    include(cmake/apply_santizers.cmake)
+endif()
+
 include(CTest)
 include(FetchContent)
 include(GNUInstallDirs)

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -15,7 +15,6 @@
       "hidden": true,
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_TOOLCHAIN_FILE": "cmake/toolchain.cmake",
         "BEMAN_BUILDSYS_SANITIZER": "ASan"
       }
     },
@@ -24,7 +23,6 @@
       "hidden": true,
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "CMAKE_TOOLCHAIN_FILE": "cmake/toolchain.cmake",
         "BEMAN_BUILDSYS_SANITIZER": "OFF"
       }
     },

diff --git a/cmake/toolchain.cmake b/cmake/toolchain.cmake