Skip to content

Commit b26fd6c

Browse files
authored
Merge pull request #621 from dstoup/pdal-ignore-json
Pdal ignore json
2 parents 1496284 + f334a55 commit b26fd6c

2 files changed

Lines changed: 7 additions & 0 deletions

File tree

CMake/External_PDAL.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ if(WIN32)
8989
)
9090
endif()
9191

92+
set(JSON_ARGS
93+
-DJSONCPP_INCLUDE_DIR:PATH=IGNORE
94+
-DJSONCPP_LIBRARY:FILEPATH=IGNORE
95+
)
96+
9297
ExternalProject_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}

Doc/release-notes/master.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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.

0 commit comments

Comments
 (0)