File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -89,6 +89,11 @@ if(WIN32)
8989 )
9090endif ()
9191
92+ set (JSON_ARGS
93+ -DJSONCPP_INCLUDE_DIR:PATH =IGNORE
94+ -DJSONCPP_LIBRARY:FILEPATH =IGNORE
95+ )
96+
9297ExternalProject_Add (PDAL
9398 DEPENDS ${PDAL_DEPENDS}
9499 URL ${PDAL_file}
@@ -97,6 +102,7 @@ ExternalProject_Add(PDAL
97102 ${COMMON_CMAKE_EP_ARGS}
98103 PATCH_COMMAND ${PDAL_PATCH_COMMAND}
99104 CMAKE_ARGS
105+ ${JSON_ARGS}
100106 ${COMMON_CMAKE_ARGS}
101107 -DBUILD_SHARED_LIBS:BOOL=ON
102108 ${PDAL_EXTRA_BUILD_FLAGS}
Original file line number Diff line number Diff line change @@ -24,3 +24,4 @@ Fixes since v1.4.0
2424 * Patch the ZLib CMakeLists.txt to elimate the 'd' suffix on the library name on WIN32.
2525 * Disable the 'examples' build for Darknet. It was causing a build failure on WIN32.
2626 * When building Boost in Fletch, always ignore the systemsite-config. That is the config from an installed version and will conflict with our build.
27+ * Force PDAL to ignore libjson. It can't use the Fletch package nor can it use similar system packages.
You can’t perform that action at this time.
0 commit comments