Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ jobs:
need_node20_vol: true
has_cmake_presets: false
buildtype: Release
conan_version: 2.1.0
# use old conan version for CentOS 7
conan_version: 2.10.3
cxx-standard: 17
cxx-compiler: clang++
cc-compiler: clang
Expand All @@ -58,7 +59,8 @@ jobs:
need_node20_vol: true
has_cmake_presets: false
buildtype: Release
conan_version: 2.1.0
# use old conan version for CentOS 7
conan_version: 2.10.3
cxx-standard: 17
cxx-compiler: clang++
cc-compiler: clang
Expand All @@ -74,7 +76,7 @@ jobs:
vfx-cy: 2023
has_cmake_presets: false
buildtype: Release
conan_version: 2.1.0
conan_version: 2.20.1
cxx-standard: 17
cxx-compiler: clang++
cc-compiler: clang
Expand All @@ -90,7 +92,7 @@ jobs:
vfx-cy: 2023
has_cmake_presets: false
buildtype: Release
conan_version: 2.1.0
conan_version: 2.20.1
cxx-standard: 17
cxx-compiler: clang++
cc-compiler: clang
Expand All @@ -103,7 +105,7 @@ jobs:
os: ubuntu-latest
has_cmake_presets: true
buildtype: Release
conan_version: 2.1.0
conan_version: 2.20.1
cxx-standard: 17
cxx-compiler: clang++
cc-compiler: clang
Expand All @@ -116,7 +118,7 @@ jobs:
os: macos-latest
has_cmake_presets: true
buildtype: Release
conan_version: 2.1.0
conan_version: 2.20.1
cxx-standard: 17
cxx-compiler: clang++
cc-compiler: clang
Expand All @@ -129,7 +131,7 @@ jobs:
os: windows-latest
has_cmake_presets: true
buildtype: Release
conan_version: 2.1.0
conan_version: 2.20.1
cxx-standard: 17
cxx-compiler: clang++
cc-compiler: clang
Expand All @@ -142,7 +144,7 @@ jobs:
os: windows-latest
has_cmake_presets: true
buildtype: Release
conan_version: 2.0.16
conan_version: 2.20.1
cxx-standard: 17
cxx-compiler: clang++
cc-compiler: clang
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def requirements(self):
self.requires("opencl-icd-loader/2023.12.14")
self.requires("opencl-headers/2023.12.14")
self.requires("opengl/system") # for OpenGL examples
self.requires("expat/2.4.8") # for HostSupport
self.requires("expat/2.7.1") # for HostSupport
self.requires("cimg/3.3.2") # to draw text into images
self.requires("spdlog/1.13.0") # for logging

Expand Down
14 changes: 12 additions & 2 deletions scripts/build-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,17 @@ ARGS="$@"

echo "Building OpenFX $BUILDTYPE in build/ with ${GENERATOR:-conan platform default generator}, $ARGS"

CONAN_VERSION=$(conan -v | sed -e 's/Conan version //g')
# Set CONAN command based on availability
if command -v conan >/dev/null 2>&1; then
CONAN="conan"
elif command -v uvx >/dev/null 2>&1; then
CONAN="uvx conan"
else
echo "Error: Neither 'conan' nor 'uvx' found. Please install Conan or uv." >&2
exit 1
fi

CONAN_VERSION=$($CONAN -v | sed -e 's/Conan version //g')
CONAN_MAJOR_VERSION=${CONAN_VERSION:0:1}

PRESET_NAME=
Expand Down Expand Up @@ -115,7 +125,7 @@ fi
# Install dependencies, set up build dir, and generate build files.
echo === Running conan to install dependencies
[[ $USE_OPENCL ]] && conan_opts="$conan_opts -o use_opencl=True"
conan install ${GENERATOR_OPTION} -s build_type=$BUILDTYPE -pr:b=default --build=missing . $conan_opts
$CONAN install ${GENERATOR_OPTION} -s build_type=$BUILDTYPE -pr:b=default --build=missing . $conan_opts

echo === Running cmake
# Generate the build files
Expand Down
Loading