diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6cfe4bf..5c21383 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,12 +21,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Environment Info - run: | - clang --version - cmake --version - ls -R /usr/aarch64-linux-gnu/sys-root | head -n 20 - - name: Configure run: cmake --preset ${{ matrix.target }} diff --git a/CMake/FindDeps.cmake b/CMake/FindDeps.cmake index 3693c0b..508a315 100644 --- a/CMake/FindDeps.cmake +++ b/CMake/FindDeps.cmake @@ -3,8 +3,8 @@ include(FetchContent) set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Force static libs") find_package(OpenSSL REQUIRED) -find_package(zstd REQUIRED) -find_package(ZLIB REQUIRED) +find_package(zstd CONFIG REQUIRED) +find_package(zlib-ng CONFIG REQUIRED) FetchContent_Declare( httplib diff --git a/CMake/Triplets/arm64-linux-clang.cmake b/CMake/Triplets/linux-arm64-clang.cmake similarity index 73% rename from CMake/Triplets/arm64-linux-clang.cmake rename to CMake/Triplets/linux-arm64-clang.cmake index abf83ad..ac00af1 100644 --- a/CMake/Triplets/arm64-linux-clang.cmake +++ b/CMake/Triplets/linux-arm64-clang.cmake @@ -5,3 +5,5 @@ 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") diff --git a/CMake/Triplets/x64-linux-clang.cmake b/CMake/Triplets/linux-x64-clang.cmake similarity index 71% rename from CMake/Triplets/x64-linux-clang.cmake rename to CMake/Triplets/linux-x64-clang.cmake index 89245d1..fea043b 100644 --- a/CMake/Triplets/x64-linux-clang.cmake +++ b/CMake/Triplets/linux-x64-clang.cmake @@ -5,3 +5,5 @@ 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") \ No newline at end of file diff --git a/CMake/Triplets/wasm32-emscripten-clang.cmake b/CMake/Triplets/wasm32-emscripten-clang.cmake index 7b90f8c..6498e2c 100644 --- a/CMake/Triplets/wasm32-emscripten-clang.cmake +++ b/CMake/Triplets/wasm32-emscripten-clang.cmake @@ -5,3 +5,5 @@ 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") diff --git a/CMake/Triplets/arm64-windows-clang.cmake b/CMake/Triplets/windows-arm64-clang.cmake similarity index 74% rename from CMake/Triplets/arm64-windows-clang.cmake rename to CMake/Triplets/windows-arm64-clang.cmake index 1871ea0..713fef5 100644 --- a/CMake/Triplets/arm64-windows-clang.cmake +++ b/CMake/Triplets/windows-arm64-clang.cmake @@ -7,3 +7,5 @@ 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") \ No newline at end of file diff --git a/CMake/Triplets/x64-windows-clang.cmake b/CMake/Triplets/windows-x64-clang.cmake similarity index 67% rename from CMake/Triplets/x64-windows-clang.cmake rename to CMake/Triplets/windows-x64-clang.cmake index d1a4477..8cc3355 100644 --- a/CMake/Triplets/x64-windows-clang.cmake +++ b/CMake/Triplets/windows-x64-clang.cmake @@ -5,3 +5,5 @@ set(VCPKG_CMAKE_SYSTEM_NAME Windows) set(VCPKG_C_FLAGS "/arch:AVX2") set(VCPKG_CXX_FLAGS "/arch:AVX2") + +set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../Toolchains/windows-x64.cmake") diff --git a/CMakePresets.json b/CMakePresets.json index d58eda0..9737b00 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -24,7 +24,7 @@ "displayName": "Linux x64 (Clang)", "inherits": "base-common", "cacheVariables": { - "VCPKG_TARGET_TRIPLET": "x64-linux-clang" + "VCPKG_TARGET_TRIPLET": "linux-x64-clang" } }, { @@ -32,7 +32,7 @@ "displayName": "Linux ARM64 (Clang Cross)", "inherits": "base-common", "cacheVariables": { - "VCPKG_TARGET_TRIPLET": "arm64-linux-clang" + "VCPKG_TARGET_TRIPLET": "linux-arm64-clang" } }, { @@ -40,7 +40,7 @@ "displayName": "Windows x64 (Clang)", "inherits": "base-common", "cacheVariables": { - "VCPKG_TARGET_TRIPLET": "x64-windows-clang" + "VCPKG_TARGET_TRIPLET": "windows-x64-clang" } }, { @@ -48,7 +48,7 @@ "displayName": "Windows ARM64 (Clang Cross)", "inherits": "base-common", "cacheVariables": { - "VCPKG_TARGET_TRIPLET": "arm64-windows-clang" + "VCPKG_TARGET_TRIPLET": "windows-arm64-clang" } }, { diff --git a/Src/IACore/CMakeLists.txt b/Src/IACore/CMakeLists.txt index d0d7f99..56d9f7d 100644 --- a/Src/IACore/CMakeLists.txt +++ b/Src/IACore/CMakeLists.txt @@ -22,8 +22,8 @@ target_include_directories(IACore PUBLIC inc/) target_include_directories(IACore PRIVATE imp/hpp/) target_link_libraries(IACore PUBLIC - ZLIB::ZLIB - zstd::libzstd_static + zlib-ng::zlib + zstd::libzstd tl::expected glaze::glaze pugixml::pugixml