python312Packages.icontract: relax deps (#380554)
[NixPkgs.git] / pkgs / by-name / ge / geogram / replace-bundled-zlib.patch
blob3d19d66b0d2b4c89e5f754286bda08127833aa71
1 --- a/src/lib/geogram/third_party/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100
2 +++ b/src/lib/geogram/third_party/CMakeLists.txt 2023-03-09 20:46:16.740801862 +0100
3 @@ -33,7 +33,6 @@
4 aux_source_directories(SOURCES "Source Files\\LM6" LM7)
5 aux_source_directories(SOURCES "Source Files\\rply" rply)
6 aux_source_directories(SOURCES "Source Files\\shewchuk" shewchuk)
7 -aux_source_directories(SOURCES "Source Files\\zlib" zlib)
8 aux_source_directories(SOURCES "Source Files\\PoissonRecon" PoissonRecon)
9 aux_source_directories(SOURCES "Source Files\\xatlas" xatlas)
11 --- a/src/lib/geogram/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100
12 +++ b/src/lib/geogram/CMakeLists.txt 2023-03-09 20:49:21.080059939 +0100
13 @@ -70,6 +70,9 @@
14 target_link_libraries(geogram psapi)
15 endif()
17 +find_package(ZLIB REQUIRED)
18 +target_link_libraries(geogram ZLIB::ZLIB)
20 # Install the library
21 install_devkit_targets(geogram)
23 --- a/src/lib/geogram/basic/geofile.h 1970-01-01 01:00:01.000000000 +0100
24 +++ b/src/lib/geogram/basic/geofile.h 2023-03-09 20:52:33.713329571 +0100
25 @@ -44,7 +44,7 @@
26 #include <geogram/basic/numeric.h>
27 #include <geogram/basic/memory.h>
28 #include <geogram/basic/string.h>
29 -#include <geogram/third_party/zlib/zlib.h>
30 +#include <zlib.h>
32 #include <stdexcept>
33 #include <fstream>
34 --- a/src/lib/geogram/third_party/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100
35 +++ b/src/lib/geogram/third_party/CMakeLists.txt 2023-03-09 20:54:50.276520762 +0100
36 @@ -60,8 +59,10 @@
37 ${ANDROID_NDK}/sources/android/native_app_glue
39 message(STATUS "building for Android")
40 endif()
42 +find_package(ZLIB REQUIRED)
43 +target_link_libraries(geogram_third_party PUBLIC ZLIB::ZLIB)
45 set_target_properties(
46 geogram_third_party PROPERTIES