diff options
| author | meme <meme@users.noreply.github.com> | 2020-12-28 22:38:52 -0500 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-12-29 17:42:04 +0100 |
| commit | 23b23cee5a8e7b0666de3d5a0991bc1b3bb8d244 (patch) | |
| tree | b91e24f2839c2ff8b27545c11e084a4cb19e886c /Meta/CLion/CMakeLists.txt | |
| parent | 8ca0e8325a5e2cc94b0a54d3ea9995fe33b75cde (diff) | |
| download | serenity-23b23cee5a8e7b0666de3d5a0991bc1b3bb8d244.zip | |
Build: Support non-i686 toolchains
* Add SERENITY_ARCH option to CMake for selecting the target toolchain
* Port all build scripts but continue to use i686
* Update GitHub Actions cache to include BuildIt.sh
Diffstat (limited to 'Meta/CLion/CMakeLists.txt')
| -rw-r--r-- | Meta/CLion/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Meta/CLion/CMakeLists.txt b/Meta/CLion/CMakeLists.txt index f0161cc960..82a60501bf 100644 --- a/Meta/CLion/CMakeLists.txt +++ b/Meta/CLion/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0) project(serenity) set(CMAKE_CXX_STANDARD 20) +set(SERENITY_ARCH "i686" CACHE STRING "Target architecture for SerenityOS.") + file(GLOB_RECURSE AK_SOURCES "serenity/AK/*.cpp") file(GLOB_RECURSE APPLICATIONS_SOURCES "serenity/Applications/*.cpp") file(GLOB_RECURSE BASE_SOURCES "serenity/Base/*.cpp") @@ -26,7 +28,7 @@ set(INCLUDE_DIRS "serenity/Libraries/LibPthread" "serenity/Libraries/LibM" "serenity/Services" - "serenity/Toolchain/Local/i686-pc-serenity/include/c++/10.2.0" + "serenity/Toolchain/Local/${SERENITY_ARCH}/${SERENITY_ARCH}-pc-serenity/include/c++/10.2.0" "serenity/Build/Services" "serenity/Build/Libraries") |