Skip to content

Commit c95404d

Browse files
committed
Make compile/test with proj lib optional
And disable on MacOS github actions build.
1 parent 5e8e663 commit c95404d

4 files changed

Lines changed: 24 additions & 2 deletions

File tree

.github/actions/cmake/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ runs:
1010
cd build
1111
cmake -LA .. \
1212
-DBUILD_DATA_TESTS=ON \
13+
-DWITH_PROJ=${WITH_PROJ} \
1314
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
1415
-DPROTOZERO_INCLUDE_DIR=${GITHUB_WORKSPACE}/../protozero/include
1516
shell: bash

.github/workflows/ci.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
CC: clang-6.0
1010
CXX: clang++-6.0
1111
BUILD_TYPE: Dev
12+
WITH_PROJ: ON
1213
steps:
1314
- uses: actions/checkout@v2
1415
with:
@@ -24,6 +25,7 @@ jobs:
2425
CC: clang-8
2526
CXX: clang++-8
2627
BUILD_TYPE: Dev
28+
WITH_PROJ: ON
2729
steps:
2830
- uses: actions/checkout@v2
2931
with:
@@ -39,6 +41,7 @@ jobs:
3941
CC: clang-9
4042
CXX: clang++-9
4143
BUILD_TYPE: Dev
44+
WITH_PROJ: ON
4245
steps:
4346
- uses: actions/checkout@v2
4447
with:
@@ -54,6 +57,7 @@ jobs:
5457
CC: clang-9
5558
CXX: clang++-9
5659
BUILD_TYPE: Dev
60+
WITH_PROJ: ON
5761
steps:
5862
- uses: actions/checkout@v2
5963
with:
@@ -69,6 +73,7 @@ jobs:
6973
CC: clang-10
7074
CXX: clang++-10
7175
BUILD_TYPE: Dev
76+
WITH_PROJ: ON
7277
steps:
7378
- uses: actions/checkout@v2
7479
with:
@@ -84,6 +89,7 @@ jobs:
8489
CC: clang-10
8590
CXX: clang++-10
8691
BUILD_TYPE: Debug
92+
WITH_PROJ: ON
8793
CXXFLAGS: -fsanitize=address,undefined,integer -fno-sanitize-recover=all -fno-omit-frame-pointer
8894
LDFLAGS: -fsanitize=address,undefined,integer
8995
steps:
@@ -101,6 +107,7 @@ jobs:
101107
CC: clang-10
102108
CXX: clang++-10
103109
BUILD_TYPE: Release
110+
WITH_PROJ: ON
104111
steps:
105112
- uses: actions/checkout@v2
106113
with:
@@ -116,6 +123,7 @@ jobs:
116123
CC: gcc-5
117124
CXX: g++-5
118125
BUILD_TYPE: Dev
126+
WITH_PROJ: ON
119127
steps:
120128
- uses: actions/checkout@v2
121129
with:
@@ -131,6 +139,7 @@ jobs:
131139
CC: gcc-7
132140
CXX: g++-7
133141
BUILD_TYPE: Dev
142+
WITH_PROJ: ON
134143
steps:
135144
- uses: actions/checkout@v2
136145
with:
@@ -146,6 +155,7 @@ jobs:
146155
CC: gcc-9
147156
CXX: g++-9
148157
BUILD_TYPE: Dev
158+
WITH_PROJ: ON
149159
steps:
150160
- uses: actions/checkout@v2
151161
with:
@@ -162,6 +172,7 @@ jobs:
162172
CXX: g++-10
163173
CXXFLAGS: -Wno-stringop-overflow
164174
BUILD_TYPE: Dev
175+
WITH_PROJ: ON
165176
steps:
166177
- uses: actions/checkout@v2
167178
with:
@@ -177,6 +188,7 @@ jobs:
177188
CC: gcc-10
178189
CXX: g++-10
179190
BUILD_TYPE: Release
191+
WITH_PROJ: ON
180192
steps:
181193
- uses: actions/checkout@v2
182194
with:
@@ -192,6 +204,7 @@ jobs:
192204
CC: clang
193205
CXX: clang++
194206
BUILD_TYPE: Dev
207+
WITH_PROJ: OFF
195208
steps:
196209
- uses: actions/checkout@v2
197210
with:
@@ -207,6 +220,7 @@ jobs:
207220
CC: clang
208221
CXX: clang++
209222
BUILD_TYPE: Dev
223+
WITH_PROJ: OFF
210224
steps:
211225
- uses: actions/checkout@v2
212226
with:
@@ -222,6 +236,7 @@ jobs:
222236
CC: clang
223237
CXX: clang++
224238
BUILD_TYPE: Release
239+
WITH_PROJ: OFF
225240
steps:
226241
- uses: actions/checkout@v2
227242
with:

CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ option(INSTALL_GDALCPP "also install gdalcpp headers" OFF)
8080

8181
option(WITH_PROFILING "add flags needed for profiling" OFF)
8282

83+
option(WITH_PROJ "build/test with proj" ON)
84+
8385

8486
#-----------------------------------------------------------------------------
8587
#
@@ -167,7 +169,11 @@ set(OSMIUM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
167169

168170
include_directories(${OSMIUM_INCLUDE_DIR})
169171

170-
find_package(Osmium COMPONENTS io gdal geos proj sparsehash)
172+
if(WITH_PROJ)
173+
find_package(Osmium COMPONENTS io gdal geos proj sparsehash)
174+
else()
175+
find_package(Osmium COMPONENTS io gdal geos sparsehash)
176+
endif()
171177

172178
# The find_package put the directory where it found the libosmium includes
173179
# into OSMIUM_INCLUDE_DIRS. We remove it again, because we want to make

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function(add_unit_test _tgroup _tname)
8787
ENVIRONMENT "OSMIUM_TEST_DATA_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
8888
)
8989
else()
90-
message("Skipped test ${_tpath} because a dependency was not found")
90+
message("Skipped test ${_tpath} because a dependency was disabled/not found")
9191
set(OSMIUM_SKIPPED_TESTS
9292
"${OSMIUM_SKIPPED_TESTS} ${_tpath}"
9393
CACHE STRING "Tests that were skipped because of missing dependecies")

0 commit comments

Comments
 (0)