dev0/IACore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BUILDSYS]: Update CMake Triplet and Toolchain Naming

Browse Source
This commit is contained in:
dev0
2025-12-26 01:38:21 +05:30
parent 2f8f7025db
commit 8a417e1ec2
14 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yaml vendored
View File

@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
target: [linux-x64]
target: [x64-linux]
steps:
- uses: actions/checkout@v4

3
CMake/FindDeps.cmake
View File

@ -100,3 +100,6 @@ set(HTTPLIB_TEST OFF CACHE BOOL "" FORCE)
set(HTTPLIB_EXAMPLE OFF CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(httplib pugixml nlohmann_json glaze simdjson tl-expected unordered_dense mimalloc highway)
get_target_property(HWY_INCLUDE_DIRS hwy INTERFACE_INCLUDE_DIRECTORIES)
target_include_directories(hwy SYSTEM INTERFACE ${HWY_INCLUDE_DIRS})

0
CMake/Toolchains/linux-arm64.cmake → CMake/Toolchains/arm64-linux-clang.cmake
View File

0
CMake/Toolchains/windows-arm64.cmake → CMake/Toolchains/arm64-windows-clang.cmake
View File

0
CMake/Toolchains/wasm.cmake → CMake/Toolchains/wasm32-emscripten-clang.cmake
View File

0
CMake/Toolchains/linux-x64.cmake → CMake/Toolchains/x64-linux-clang.cmake
View File

0
CMake/Toolchains/windows-x64.cmake → CMake/Toolchains/x64-windows.cmake
View File

2
CMake/Triplets/linux-arm64-clang.cmake → CMake/Triplets/arm64-linux.cmake
View File

@ -6,4 +6,4 @@ set(VCPKG_CMAKE_SYSTEM_NAME Linux)
set(VCPKG_C_FLAGS "--gcc-toolchain=/usr -march=armv8-a+simd")
set(VCPKG_CXX_FLAGS " --gcc-toolchain=/usr -march=armv8-a+simd")
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../Toolchains/linux-arm64.cmake")
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../Toolchains/arm64-linux-clang.cmake")

2
CMake/Triplets/windows-arm64-clang.cmake → CMake/Triplets/arm64-windows.cmake
View File

@ -8,4 +8,4 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
set(VCPKG_C_FLAGS "--target=arm64-pc-windows-msvc")
set(VCPKG_CXX_FLAGS "--target=arm64-pc-windows-msvc")
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../Toolchains/windows-arm64.cmake")
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../Toolchains/arm64-windows-clang.cmake")

2
CMake/Triplets/wasm32-emscripten-clang.cmake → CMake/Triplets/wasm32-emscripten.cmake
View File

@ -6,4 +6,4 @@ set(VCPKG_CMAKE_SYSTEM_NAME Emscripten)
set(VCPKG_C_FLAGS "-msimd128 -pthread")
set(VCPKG_CXX_FLAGS "-msimd128 -pthread")
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../Toolchains/wasm.cmake")
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../Toolchains/wasm32-emscripten-clang.cmake")

2
CMake/Triplets/linux-x64-clang.cmake → CMake/Triplets/x64-linux.cmake
View File

@ -6,4 +6,4 @@ set(VCPKG_CMAKE_SYSTEM_NAME Linux)
set(VCPKG_C_FLAGS "-mavx2 -mfma -mxsave -msse4.2")
set(VCPKG_CXX_FLAGS "-mavx2 -mfma -mxsave -msse4.2")
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../Toolchains/linux-x64.cmake")
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../Toolchains/x64-linux-clang.cmake")

2
CMake/Triplets/windows-x64-clang.cmake → CMake/Triplets/x64-windows.cmake
View File

@ -6,4 +6,4 @@ set(VCPKG_CMAKE_SYSTEM_NAME Windows)
set(VCPKG_C_FLAGS "/arch:AVX2 /clang:-mfma")
set(VCPKG_CXX_FLAGS "/arch:AVX2 /clang:-mfma")
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../Toolchains/windows-x64.cmake")
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../Toolchains/x64-windows-clang.cmake")

48
CMakePresets.json
View File

@ -6,7 +6,7 @@
},
"configurePresets": [
{
"name": "base-common",
"name": "iacore-base",
"hidden": true,
"generator": "Ninja Multi-Config",
"binaryDir": "${sourceDir}/out/build/${presetName}",
@ -16,41 +16,41 @@
"VCPKG_MANIFEST_MODE": "ON",
"VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/CMake/Triplets",
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/CMake/Toolchains/${presetName}.cmake"
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/CMake/Toolchains/${presetName}-clang.cmake"
}
},
{
"name": "linux-x64",
"name": "x64-linux",
"displayName": "Linux x64 (Clang)",
"inherits": "base-common",
"inherits": "iacore-base",
"cacheVariables": {
"VCPKG_TARGET_TRIPLET": "linux-x64-clang"
"VCPKG_TARGET_TRIPLET": "x64-linux"
}
},
{
"name": "linux-arm64",
"name": "arm64-linux",
"displayName": "Linux ARM64 (Clang Cross)",
"inherits": "base-common",
"inherits": "iacore-base",
"cacheVariables": {
"VCPKG_TARGET_TRIPLET": "linux-arm64-clang"
"VCPKG_TARGET_TRIPLET": "arm64-linux"
}
},
{
"name": "windows-x64",
"name": "x64-windows",
"displayName": "Windows x64 (Clang)",
"inherits": "base-common",
"inherits": "iacore-base",
"cacheVariables": {
"VCPKG_TARGET_TRIPLET": "windows-x64-clang",
"VCPKG_TARGET_TRIPLET": "x64-windows",
"CMAKE_C_COMPILER": "clang-cl",
"CMAKE_CXX_COMPILER": "clang-cl"
}
},
{
"name": "windows-arm64",
"name": "arm64-windows",
"displayName": "Windows ARM64 (Clang Cross)",
"inherits": "base-common",
"inherits": "iacore-base",
"cacheVariables": {
"VCPKG_TARGET_TRIPLET": "windows-arm64-clang",
"VCPKG_TARGET_TRIPLET": "arm64-windows",
"CMAKE_C_COMPILER": "clang-cl",
"CMAKE_CXX_COMPILER": "clang-cl"
}
@ -58,28 +58,28 @@
{
"name": "wasm",
"displayName": "WebAssembly (Clang)",
"inherits": "base-common",
"inherits": "iacore-base",
"cacheVariables": {
"VCPKG_TARGET_TRIPLET": "wasm32-emscripten-clang"
"VCPKG_TARGET_TRIPLET": "wasm32-emscripten"
}
}
],
"buildPresets": [
{
"name": "linux-x64",
"configurePreset": "linux-x64"
"name": "x64-linux",
"configurePreset": "x64-linux"
},
{
"name": "linux-arm64",
"configurePreset": "linux-arm64"
"name": "arm64-linux",
"configurePreset": "arm64-linux"
},
{
"name": "windows-x64",
"configurePreset": "windows-x64"
"name": "x64-windows",
"configurePreset": "x64-windows"
},
{
"name": "windows-arm64",
"configurePreset": "windows-arm64"
"name": "arm64-windows",
"configurePreset": "arm64-windows"
},
{
"name": "wasm",

2
Src/IACore/CMakeLists.txt
View File

@ -78,7 +78,7 @@ if(IACORE_ARCH_X64)
if(MSVC)
target_compile_options(IACore INTERFACE /arch:AVX2)
else()
target_compile_options(IACore INTERFACE -mavx2 -mfma -mpclmul -maes)
target_compile_options(IACore INTERFACE -mavx2 -mfma -mpclmul -maes -mbmi)
endif()
target_compile_definitions(IACore INTERFACE HWY_BASELINE_TARGETS=HWY_AVX2)
elseif(IACORE_ARCH_ARM64)