Skip to content

Commit 4c4ce53

Browse files
authored
Merge pull request #1860 from joto/cmake-rapidjson
Remove remnants of rapidjson in CMake config
2 parents 648cdfc + 710c74e commit 4c4ce53

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ endif()
5555
option(EXTERNAL_LIBOSMIUM "Do not use the bundled libosmium" OFF)
5656
option(EXTERNAL_PROTOZERO "Do not use the bundled protozero" OFF)
5757
option(EXTERNAL_FMT "Do not use the bundled fmt" OFF)
58-
option(EXTERNAL_RAPIDJSON "Do not use the bundled rapidjson" OFF)
5958

6059
set(USE_PROJ_LIB "auto" CACHE STRING "Which version of PROJ API to use: ('4', '6', 'off', or 'auto')")
6160

@@ -176,14 +175,10 @@ if (NOT EXTERNAL_FMT)
176175
set(FMT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/fmt/include")
177176
endif()
178177

179-
if (NOT EXTERNAL_RAPIDJSON)
180-
set(RAPIDJSON_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/rapidjson/include")
181-
endif()
182-
183178
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
184179

185180
find_package(Osmium 2.17.3 REQUIRED COMPONENTS io)
186-
include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR})
181+
include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR})
187182

188183
if (WITH_LUA)
189184
if (WITH_LUAJIT)

0 commit comments

Comments
 (0)