Skip to content

Commit 85f1116

Browse files
authored
Fix CI (#58)
1 parent 47889da commit 85f1116

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.github/scripts/build-linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fi
2525

2626
# Install liblensfun
2727
pushd external/lensfun
28-
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=off -DINSTALL_HELPER_SCRIPTS=off .
28+
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=off -DINSTALL_HELPER_SCRIPTS=off -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .
2929
make
3030
make install -j$(nproc)
3131
echo "/usr/local/lib64" | tee /etc/ld.so.conf.d/99local.conf

.github/scripts/build-macos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source .github/scripts/retry.sh
55

66
CHECK_SHA256=.github/scripts/check_sha256.sh
77

8-
brew install pkg-config meson
8+
brew install pkg-config meson python-packaging
99

1010
# General note:
1111
# Apple guarantees forward, but not backward ABI compatibility unless

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ def windows_lensfun_compile():
147147
with open(patch_path, 'w') as f:
148148
f.write(content)
149149
cmds = [cmake + ' .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release ' +\
150+
'-DCMAKE_POLICY_VERSION_MINIMUM=3.5 ' +\
150151
'-DBUILD_TESTS=off -DINSTALL_HELPER_SCRIPTS=off ' +\
151152
'-DCMAKE_TOOLCHAIN_FILE={}/scripts/buildsystems/vcpkg.cmake '.format(vcpkg_dir) +\
152153
'-DGLIB2_BASE_DIR={} -DGLIB2_DLL={} -DCMAKE_INSTALL_PREFIX=install'.format(vcpkg_install_dir, glib2_dll),
@@ -186,6 +187,7 @@ def mac_lensfun_compile():
186187
os.chdir(cmake_build)
187188
install_name_dir = os.path.join(install_dir, 'lib')
188189
cmds = ['cmake .. -DCMAKE_BUILD_TYPE=Release ' +\
190+
'-DCMAKE_POLICY_VERSION_MINIMUM=3.5 ' +\
189191
'-DBUILD_TESTS=off -DINSTALL_HELPER_SCRIPTS=off ' +\
190192
'-DCMAKE_INSTALL_PREFIX=install ' +\
191193
'-DCMAKE_INSTALL_NAME_DIR=' + install_name_dir,

0 commit comments

Comments
 (0)