Skip to content

Commit e0f461b

Browse files
authored
Merge pull request #271 from tcezard/Upgrade_c14
EVA-3851 - Upgrade to C++14 and update few dependencies
2 parents 3a534fe + b293314 commit e0f461b

File tree

11 files changed

+15835
-9130
lines changed

11 files changed

+15835
-9130
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ jobs:
1919
matrix:
2020
config:
2121
- {cc: "gcc", cxx: "g++"}
22-
- {cc: "clang-10", cxx: "clang++-10"}
22+
- {cc: "clang", cxx: "clang++"}
2323

2424
steps:
2525
- uses: actions/checkout@v2
2626
- name: Install dependencies
2727
run: |
2828
sudo apt-get update
29-
sudo apt-get install cmake wget build-essential
29+
sudo apt-get install cmake build-essential wget pkg-config
3030
./install_dependencies.sh
3131
- name: Compile and test
3232
run: |
33-
mkdir build && cd build && cmake -G "Unix Makefiles" -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DSTATIC_BUILD=1 ..
33+
mkdir build && cd build && cmake -G "Unix Makefiles" -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DSTATIC_BUILD=ON ..
3434
make -j2
3535
cd .. && ./build/bin/test_validation_suite
3636
- name: Rename release files
@@ -54,13 +54,12 @@ jobs:
5454

5555
### Mac OS build intel
5656
macos_build_intel:
57-
runs-on: macos-12
57+
runs-on: macos-13
5858
strategy:
5959
matrix:
6060
config:
6161
- {cc: "gcc", cxx: "g++"}
6262
- {cc: "clang", cxx: "clang++"}
63-
6463
steps:
6564
- uses: actions/checkout@v2
6665
- name: Install dependencies
@@ -69,8 +68,7 @@ jobs:
6968
HOMEBREW_NO_AUTO_UPDATE=1 brew install boost automake
7069
- name: Compile and test
7170
run: |
72-
mkdir build && cd build && cmake -G "Unix Makefiles" -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} ..
73-
export LIBRARY_PATH=${LIBRARY_PATH}:/usr/local/opt/icu4c/lib:/usr/local/lib
71+
mkdir build && cd build && cmake -G "Unix Makefiles" -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DSTATIC_BUILD=OFF ..
7472
make -j2
7573
cd .. && ./build/bin/test_validation_suite
7674
- name: Rename release files
@@ -108,7 +106,7 @@ jobs:
108106
HOMEBREW_NO_AUTO_UPDATE=1 brew install boost automake libtool
109107
- name: Compile and test
110108
run: |
111-
mkdir build && cd build && cmake -G "Unix Makefiles" -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} ..
109+
mkdir build && cd build && cmake -G "Unix Makefiles" -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -DCMAKE_C_COMPILER=${{ matrix.config.cc }} -DSTATIC_BUILD=OFF ..
112110
make -j2
113111
cd .. && ./build/bin/test_validation_suite
114112
- name: Rename release files

0 commit comments

Comments
 (0)