sync ci changes from fix_547_0.27 to this branch.
This commit is contained in:
parent
9ee186bd49
commit
fca80bbd27
@ -57,9 +57,9 @@ case "$distro_id" in
|
||||
|
||||
'opensuse'|'opensuse-tumbleweed')
|
||||
zypper --non-interactive refresh
|
||||
zypper --non-interactive install gcc-c++ clang cmake make ccache libexpat-devel zlib-devel libssh-devel libcurl-devel git which dos2unix libxml2-tools
|
||||
curl -LO https://github.com/google/googletest/archive/release-1.8.0.tar.gz
|
||||
zypper --non-interactive install gcc-c++ clang cmake make ccache libexpat-devel zlib-devel libssh-devel curl tar libcurl-devel git which dos2unix libxml2-tools
|
||||
pushd /tmp
|
||||
curl -LO https://github.com/google/googletest/archive/release-1.8.0.tar.gz
|
||||
tar xzf release-1.8.0.tar.gz
|
||||
mkdir -p googletest-release-1.8.0/build
|
||||
pushd googletest-release-1.8.0/build
|
||||
|
||||
@ -17,6 +17,7 @@ if [[ "$(uname -s)" == 'Linux' ]]; then
|
||||
else
|
||||
export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON"
|
||||
fi
|
||||
CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_FLAGS=-Wno-deprecated"
|
||||
|
||||
mkdir build
|
||||
cd build
|
||||
|
||||
@ -40,8 +40,8 @@ def matrix_build(shared_libs, ccs, build_types, cmake_bin, cmake_options,
|
||||
)
|
||||
os.mkdir(cwd)
|
||||
|
||||
cmake = "{cmake_bin} {!s} -DCMAKE_BUILD_TYPE={build_type} " \
|
||||
"-DBUILD_SHARED_LIBS={lib_type} -DEXIV2_BUILD_UNIT_TESTS={tests} "\
|
||||
cmake = "{cmake_bin} {!s} -DCMAKE_BUILD_TYPE={build_type} -DCMAKE_CXX_FLAGS=-Wno-deprecated " \
|
||||
"-DBUILD_SHARED_LIBS={lib_type} -DEXIV2_BUILD_UNIT_TESTS={tests} -DCMAKE_CXX_STANDARD=98 "\
|
||||
"../..".format(
|
||||
cmake_options, cmake_bin=cmake_bin, build_type=build_type,
|
||||
lib_type=lib_type, tests="ON" if tests else "OFF"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user