olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: try installing jsoncpp with vcpkg

This commit is contained in:
Eric Wasylishen 2024-03-17 16:58:33 -06:00
parent 83fda6d3a0
commit 92d594bdb5
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/continuous-building.yml vendored
View File

@ -23,7 +23,16 @@ jobs:
use-asan: YES
env:
USE_ASAN: ${{ matrix.use-asan }}
VCPKG_CMAKE_FILE: '${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake'
steps:
- name: 'Install vcpkg + the packages we need from it'
uses: lukka/run-vcpkg@v11
with:
vcpkgDirectory: '${{ github.workspace }}/vcpkg'
vcpkgGitCommitId: cf4ebef2294e164875ce17d7937f44d3e3ea156e
runVcpkgInstall: true
runVcpkgFormatString: '[`install`, `jsoncpp`]'
- uses: actions/checkout@v4
with:
submodules: recursive

4
build-linux-64.sh
View File

@ -25,9 +25,9 @@ TBB_CMAKE_DIR="$(pwd)/oneapi-tbb-2021.3.0/lib/cmake"
# check USE_ASAN environment variable (see cmake.yml)
if [ "$USE_ASAN" == "YES" ]; then
cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DENABLE_LIGHTPREVIEW=YES -DERICWTOOLS_ASAN=YES
cmake .. -DCMAKE_TOOLCHAIN_FILE="$VCPKG_CMAKE_FILE" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DENABLE_LIGHTPREVIEW=YES -DERICWTOOLS_ASAN=YES
else
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR"
cmake .. -DCMAKE_TOOLCHAIN_FILE="$VCPKG_CMAKE_FILE" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR"
fi
# not yet free of memory leaks, so don't abort on leak detection

4
build-osx.sh
View File

@ -34,9 +34,9 @@ TBB_CMAKE_DIR="$(pwd)/${TBB_DIR_NAME}/lib/cmake"
# check USE_ASAN environment variable (see cmake.yml)
if [ "$USE_ASAN" == "YES" ]; then
cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DENABLE_LIGHTPREVIEW=YES -DERICWTOOLS_ASAN=YES
cmake .. -DCMAKE_TOOLCHAIN_FILE="$VCPKG_CMAKE_FILE" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DENABLE_LIGHTPREVIEW=YES -DERICWTOOLS_ASAN=YES
else
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR"
cmake .. -DCMAKE_TOOLCHAIN_FILE="$VCPKG_CMAKE_FILE" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR"
fi
make -j8 package || exit 1

2
build-windows.ps1
View File

@ -20,7 +20,7 @@ choco install ninja
mkdir build-windows
cd build-windows
cmake .. -GNinja -Dembree_DIR="C:\embree-3.12.1.x64.vc14.windows" -DTBB_DIR="C:\tbb\cmake" -DCMAKE_BUILD_TYPE=Release -DENABLE_LIGHTPREVIEW=YES -DQt5Widgets_DIR="C:\Qt\5.15.2\msvc2019_64\lib\cmake\Qt5Widgets"
cmake .. -DCMAKE_TOOLCHAIN_FILE="$VCPKG_CMAKE_FILE" -GNinja -Dembree_DIR="C:\embree-3.12.1.x64.vc14.windows" -DTBB_DIR="C:\tbb\cmake" -DCMAKE_BUILD_TYPE=Release -DENABLE_LIGHTPREVIEW=YES -DQt5Widgets_DIR="C:\Qt\5.15.2\msvc2019_64\lib\cmake\Qt5Widgets"
ninja package
if ( $? -eq $false ) {