Skip to content

Commit 73e1ea7

Browse files
committed
Changes needed locally
1 parent e2fe05d commit 73e1ea7

5 files changed

Lines changed: 38 additions & 2 deletions

conanbuildenv-debug-x86_64.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
script_folder="/home/jojo/swdev/LUXCORERENDER/LuxCoreDeps"
2+
echo "echo Restoring environment" > "$script_folder/deactivate_conanbuildenv-debug-x86_64.sh"
3+
for v in
4+
do
5+
is_defined="true"
6+
value=$(printenv $v) || is_defined="" || true
7+
if [ -n "$value" ] || [ -n "$is_defined" ]
8+
then
9+
echo export "$v='$value'" >> "$script_folder/deactivate_conanbuildenv-debug-x86_64.sh"
10+
else
11+
echo unset $v >> "$script_folder/deactivate_conanbuildenv-debug-x86_64.sh"
12+
fi
13+
done

conanrunenv-debug-x86_64.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
script_folder="/home/jojo/swdev/LUXCORERENDER/LuxCoreDeps"
2+
echo "echo Restoring environment" > "$script_folder/deactivate_conanrunenv-debug-x86_64.sh"
3+
for v in
4+
do
5+
is_defined="true"
6+
value=$(printenv $v) || is_defined="" || true
7+
if [ -n "$value" ] || [ -n "$is_defined" ]
8+
then
9+
echo export "$v='$value'" >> "$script_folder/deactivate_conanrunenv-debug-x86_64.sh"
10+
else
11+
echo unset $v >> "$script_folder/deactivate_conanrunenv-debug-x86_64.sh"
12+
fi
13+
done
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
echo Restoring environment

run-conan.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,16 @@ elif [[ "$RUNNER_OS" == "Linux" && -z "$CI" ]]; then
4545
# Linux - Plain local build
4646
echo "Linux - Plain local build"
4747
cache_dir=/tmp/conan-cache
48+
mkdir -p $cache_dir
4849
else
4950
# Others
5051
echo "MacOS or Windows - CI build"
5152
cache_dir=$WORKSPACE/conan-cache
5253
fi
5354

5455
echo "::group::CIBW_BEFORE_BUILD: pip"
55-
pipx install conan
56-
pipx install ninja
56+
pip install conan
57+
pip install ninja
5758
echo "::endgroup::"
5859

5960
# 1. Clone conancenter at a specific commit and add this cloned repo as a

utils/plain-local-build.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
# You may also want to clean /tmp/conan-cache, to avoid reinjection of previous
66
# builds in the current one
77

8+
# dependencies
9+
# - pip install conan
10+
# - pip install ninja
11+
# - pacman -S ispc
12+
# - pacman -S intel-oneapi-toolkit
13+
814
# Specialized for Linux, but could be changed
915
export RUNNER_OS=Linux
1016
export RUNNER_ARCH=X64
@@ -13,6 +19,8 @@ export RUNNER_ARCH=X64
1319
export LUXDEPS_VERSION=test
1420
export GCC_VERSION=14 # Note: even for gcc > 14
1521
export WORKSPACE=.
22+
export CC=/usr/bin/gcc-14
23+
export CXX=/usr/bin/g++-14
1624
export CXX_VERSION=20
1725
export CMAKE_POLICY_VERSION_MINIMUM=3.25
1826
export DEPS_BUILD_TYPE=Debug # Or Release/RelWithDebInfo/MinSizeRel, as needed

0 commit comments

Comments
 (0)