Skip to content
This repository was archived by the owner on Jul 4, 2025. It is now read-only.

Commit 457a382

Browse files
committed
chore: cmake
1 parent 163ef9e commit 457a382

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

.github/workflows/cortex-cpp-quality-gate.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ jobs:
107107
if: runner.os == 'Linux'
108108
run: |
109109
cd engine
110-
if [ "${{ matrix.name }}" == "arm64" ]; then
111-
export VCPKG_FORCE_SYSTEM_BINARIES=1
112-
fi
113110
make build CMAKE_EXTRA_FLAGS="${{ matrix.cmake-flags }}" BUILD_DEPS_CMAKE_EXTRA_FLAGS="${{ matrix.build-deps-cmake-flags }}"
114111
115112
@@ -392,9 +389,6 @@ jobs:
392389
if: runner.os == 'Linux'
393390
run: |
394391
cd engine
395-
if [ "${{ matrix.name }}" == "arm64" ]; then
396-
export VCPKG_FORCE_SYSTEM_BINARIES=1
397-
fi
398392
make build CMAKE_EXTRA_FLAGS="${{ matrix.cmake-flags }}" BUILD_DEPS_CMAKE_EXTRA_FLAGS="${{ matrix.build-deps-cmake-flags }}"
399393
400394
- name: Run setup config

.github/workflows/nightly-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
public_provider: ${{ needs.set-public-provider.outputs.public_provider }}
6868
new_version: ${{ needs.get-update-version.outputs.new_version }}
6969
runs-on: windows-cuda-11-7
70-
cmake-flags: "-DCORTEX_VARIANT=nightly -DCORTEX_CPP_VERSION='v${{ needs.get-update-version.outputs.new_version }}' -DBUILD_SHARED_LIBS=OFF -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
70+
cmake-flags: "-DCORTEX_VARIANT=nightly -DCORTEX_CPP_VERSION='v${{ needs.get-update-version.outputs.new_version }}' -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
7171
build-deps-cmake-flags: "-DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
7272
ccache-dir: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'
7373
channel: nightly

.github/workflows/template-build-linux.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@ jobs:
130130
- name: Build
131131
run: |
132132
cd engine
133-
# Set env if arch is arm64
134-
if [ "${{ inputs.arch }}" == "arm64" ]; then
135-
export VCPKG_FORCE_SYSTEM_BINARIES=1
136-
fi
137133
make build CMAKE_EXTRA_FLAGS="${{ inputs.cmake-flags }}" BUILD_DEPS_CMAKE_EXTRA_FLAGS="${{ inputs.build-deps-cmake-flags }}"
138134
139135
- name: Install Python

engine/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ endif()
9898

9999
add_subdirectory(cli)
100100

101-
# set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl)
101+
set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/../build_deps/openssl)
102+
set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
103+
set(OPENSSL_ROOT_DIR ${OPENSSL_INSTALL_DIR}/lib64)
102104

103105
if(CMAKE_BUILD_INJA_TEST)
104106
add_subdirectory(examples/inja)

0 commit comments

Comments
 (0)