Skip to content

Commit

Permalink
Set -std=c++11 in Apple clang builds
Browse files Browse the repository at this point in the history
This is needed for exiv2 0.28.1
  • Loading branch information
dfandrich committed Jan 29, 2024
1 parent 000aec9 commit 2d69771
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ jobs:
gtk: 2
install: desktop-file-utils docbook-xsl exiv2 gtk+
cflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1
cxxflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1 -std=c++11
ldflags: -O3 -lintl
cxx: g++
target: all
Expand All @@ -268,6 +269,7 @@ jobs:
gtk: 3
install: desktop-file-utils docbook-xsl exiv2 gtk+3
cflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1
cxxflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1 -std=c++11
ldflags: -O3 -lintl
cxx: g++
target: all
Expand All @@ -276,6 +278,7 @@ jobs:
gtk: 2
install: desktop-file-utils docbook-xsl exiv2 gtk+
cflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1
cxxflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1 -std=c++11
ldflags: -O3 -lintl
cxx: clang++
target: all
Expand All @@ -284,6 +287,7 @@ jobs:
gtk: 3
install: desktop-file-utils docbook-xsl exiv2 gtk+3
cflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1
cxxflags: -Wall -Wextra -Werror -Wno-error=deprecated-declarations -O3 -DENABLE_NLS=1 -std=c++11
ldflags: -O3 -lintl
cxx: clang++
target: all
Expand All @@ -294,7 +298,7 @@ jobs:
- name: install deps
run: brew install ${{ matrix.build.install }}
- name: build
run: make CFLAGS="${{ matrix.build.cflags }}" LDFLAGS="${{ matrix.build.ldflags }}" CC="${{ matrix.build.cc }}" CXX="${{ matrix.build.cxx }}" GTK="${{ matrix.build.gtk }}" ${{ matrix.build.make_opts }} XML_CATALOG_FILES="$(brew --prefix)/etc/xml/catalog" XSLTFLAGS=--nonet ${{ matrix.build.target }}
run: make CFLAGS="${{ matrix.build.cflags }}" CXXFLAGS="${{ matrix.build.cxxflags }}" LDFLAGS="${{ matrix.build.ldflags }}" CC="${{ matrix.build.cc }}" CXX="${{ matrix.build.cxx }}" GTK="${{ matrix.build.gtk }}" ${{ matrix.build.make_opts }} XML_CATALOG_FILES="$(brew --prefix)/etc/xml/catalog" XSLTFLAGS=--nonet ${{ matrix.build.target }}
- name: smoke test
run: ./gpscorrelate -V
- name: test
Expand Down

0 comments on commit 2d69771

Please sign in to comment.