Skip to content

Commit 7c49f22

Browse files
authored
Skip test_fork on macOS (#4616)
1 parent 89c2aef commit 7c49f22

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

docs/source/install.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,10 @@ Build requirements
149149
- C++17 compiler
150150
- CMake >= 3.16
151151
- SQLite3 >= 3.11: headers and library for target architecture, and sqlite3 executable for build architecture
152-
- libtiff >= 4.0 (optional but recommended to read grid formats based on GeoTIFF. Only basic TIFF support is required; optional features like WebP or ZStd are not needed.)
153-
- curl >= 7.29.0 (optional but recommended to download required grids at runtime.)
154-
- JSON for Modern C++ (nlohmann/json) >= 3.7.0; if not found as an external dependency then vendored version 3.9.1 from PROJ source tree is used
152+
- libtiff >= 4.0 (optional but recommended to enable reading of grid formats based on GeoTIFF. Only basic TIFF support is required; optional features like WebP or ZStd are not needed.)
153+
- curl >= 7.29.0 (optional but recommended to support automatic downloading of remote grid files during runtime, allowing PROJ to fetch required transformation data on demand.)
154+
- JSON for Modern C++ (nlohmann/json) >= 3.7.0
155+
155156

156157
.. _test_requirements:
157158

test/unit/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ add_test(NAME test_misc COMMAND test_misc)
255255
set_property(TEST test_misc
256256
PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT})
257257

258-
if (Threads_FOUND AND CMAKE_USE_PTHREADS_INIT)
258+
if (Threads_FOUND AND CMAKE_USE_PTHREADS_INIT AND NOT APPLE)
259259
add_definitions(-DPROJ_HAS_PTHREADS)
260260
add_executable(test_fork
261261
test_fork.c)

0 commit comments

Comments
 (0)