Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.27 Nightly pre-builds for 0.27 #2025

Merged
merged 3 commits into from
Dec 13, 2021
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
1 change: 0 additions & 1 deletion .github/workflows/on_PR_windows_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ jobs:
- name: Build
run: |
cmake -GNinja \
-DCMAKE_CXX_STANDARD=98 \
-DCMAKE_CXX_FLAGS=-Wno-deprecated \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DBUILD_SHARED_LIBS=${{matrix.shared_libraries}} \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_push_BasicWinLinMac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
- name: build and compile
run: |
cd build
cmake -GNinja -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_BMFF=ON -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated ..
cmake -GNinja -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_BMFF=ON -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated ..
cmake --build .

- name: Test
Expand Down
29 changes: 12 additions & 17 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ on:
push:
tags:
- v[0-9]+.[0-9]+.[0-9]+
schedule:
- cron: '30 4 * * *'
workflow_dispatch:
inputs:
tag_name:
Expand All @@ -19,10 +21,7 @@ jobs:

- name: Install dependencies
run: |
sudo apt-get install ninja-build
sudo apt-get install gettext
sudo apt-get install doxygen
sudo apt-get install graphviz
sudo apt-get install ninja-build gettext doxygen graphviz
pip3 install conan==1.43.0

- name: Conan common config
Expand All @@ -43,8 +42,8 @@ jobs:
run: |
cd build
cmake -GNinja -DEXIV2_TEAM_PACKAGING=ON -DBUILD_SHARED_LIBS=ON -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_NLS=ON -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_BMFF=ON -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DEXIV2_BUILD_DOC=ON ..
cmake --build . -t doc
cmake --build . -t package
cmake --build . --target doc
cmake --build . --target package
tree -L 3

- uses: actions/upload-artifact@v2
Expand All @@ -62,18 +61,14 @@ jobs:

- name: Install dependencies
run: |
brew install ninja
brew install tree
brew install gettext
brew install doxygen
brew install graphviz
brew install ninja tree gettext doxygen graphviz

- name: Build packaged release
run: |
mkdir build && cd build
cmake -GNinja -DEXIV2_TEAM_PACKAGING=ON -DBUILD_SHARED_LIBS=ON -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_NLS=ON -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_BMFF=ON -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DEXIV2_BUILD_DOC=ON -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" ..
cmake --build . -t doc
cmake --build . -t package
cmake --build . --target doc
cmake --build . --target package
tree -L 3

- uses: actions/upload-artifact@v2
Expand Down Expand Up @@ -115,7 +110,7 @@ jobs:

- name: Install Conan & Common config
run: |
pip.exe install "conan==1.39.0"
pip.exe install "conan==1.43.0"
conan config install https://github.com/conan-io/conanclientcert.git
conan profile new --detect default
conan profile update settings.build_type=Release default
Expand All @@ -135,9 +130,9 @@ jobs:
- name: Build packaged release
run: |
cd build
cmake -GNinja -DEXIV2_TEAM_PACKAGING=ON -DBUILD_SHARED_LIBS=ON -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_NLS=OFF -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_BMFF=ON -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DEXIV2_BUILD_DOC=ON ..
cmake --build . -t doc
cmake --build . -t package
cmake -GNinja -DEXIV2_TEAM_PACKAGING=ON -DBUILD_SHARED_LIBS=ON -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_NLS=OFF -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_BMFF=ON -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DEXIV2_BUILD_DOC=ON ..
cmake --build . --target doc
cmake --build . --target package
tree -L 3

- uses: actions/upload-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion appveyor_mingw_cygwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ install:
build_script:
- set CMD=mkdir -p build
- set CMD=%CMD%; cd build
- set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_STANDARD=98 -DCMAKE_CXX_FLAGS=-Wno-deprecated
- set CMD=%CMD%; cmake .. -G 'Unix Makefiles' -DCMAKE_CXX_FLAGS=-Wno-deprecated
- set CMD=%CMD%; cmake --build . --config Release
- echo %CMD%
- cd %APPVEYOR_BUILD_FOLDER%
Expand Down
2 changes: 1 addition & 1 deletion ci/test_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def matrix_build(shared_libs, ccs, build_types, cmake_bin, cmake_options,
os.mkdir(cwd)

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 "\
"-DBUILD_SHARED_LIBS={lib_type} -DEXIV2_BUILD_UNIT_TESTS={tests} "\
"../..".format(
cmake_options, cmake_bin=cmake_bin, build_type=build_type,
lib_type=lib_type, tests="ON" if tests else "OFF"
Expand Down
4 changes: 4 additions & 0 deletions cmake/mainSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
endif()

if (NOT CMAKE_CXX_STANDARD)
set (CMAKE_CXX_STANDARD 98)
endif()

if (UNIX)
if (APPLE)
set(CMAKE_MACOSX_RPATH ON)
Expand Down