Skip to content

Commit

Permalink
Remove remaining jsoncpp.
Browse files Browse the repository at this point in the history
  • Loading branch information
abellgithub committed Apr 19, 2019
1 parent 742d720 commit 07655eb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
10 changes: 3 additions & 7 deletions dimbuilder/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,14 @@ include(${ROOT_DIR}/cmake/common.cmake NO_POLICY_SCOPE)
add_executable(dimbuilder
DimBuilder.cpp
${PDAL_UTIL_DIR}/Utils.cpp
${PDAL_JSONCPP_SRC})
)
target_include_directories(dimbuilder PRIVATE
${PDAL_INCLUDE_DIR}
${NLOHMANN_INCLUDE_DIR})
${NLOHMANN_INCLUDE_DIR}
)
PDAL_TARGET_COMPILE_SETTINGS(dimbuilder)
target_link_libraries(dimbuilder
PRIVATE
${EXECINFO_LIBRARY}
${CMAKE_DL_LIBS}
)
if (PDAL_HAVE_JSONCPP)
target_link_libraries(dimbuilder
PRIVATE
${PDAL_JSONCPP_LIB_NAME})
endif()
2 changes: 0 additions & 2 deletions plugins/matlab/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ PDAL_ADD_PLUGIN(matlab_libname filter matlab
${Matlab_MAT_LIBRARY}
INCLUDES
${Matlab_INCLUDE_DIR}
${PDAL_JSONCPP_INCLUDE_DIR}
)

if (WITH_TESTS)
Expand Down Expand Up @@ -88,7 +87,6 @@ if (WITH_TESTS)
INCLUDES
${ROOT_DIR}
${Matlab_INCLUDE_DIR}
${PDAL_JSONCPP_INCLUDE_DIR}
)
set_target_properties(pdal_filters_matlab_test
PROPERTIES
Expand Down

0 comments on commit 07655eb

Please sign in to comment.