Skip to content

Commit e98b3b5

Browse files
committed
squash! [CMake] Make nlohmann_json config target-based.
+ RDF
1 parent cfd5e1e commit e98b3b5

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

tree/dataframe/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,6 @@ if(MSVC)
152152
target_compile_definitions(ROOTDataFrame PRIVATE _USE_MATH_DEFINES)
153153
endif()
154154

155-
if(builtin_nlohmannjson)
156-
target_include_directories(ROOTDataFrame PRIVATE ${CMAKE_SOURCE_DIR}/builtins)
157-
else()
158-
target_link_libraries(ROOTDataFrame PUBLIC nlohmann_json::nlohmann_json)
159-
endif()
155+
target_link_libraries(ROOTDataFrame PUBLIC nlohmann_json::nlohmann_json)
160156

161157
ROOT_ADD_TEST_SUBDIRECTORY(test)

0 commit comments

Comments
 (0)