mckaygerhard
4c3adcf77c
* Could NOT find JSONCPP (missing: JSON_INCLUDE_DIR) fixed https://github.com/minetest/minetest/issues/9119 * imported from https://github.com/minetest/minetest/pull/9120 The upstream JsonCpp project has renamed the json/features.h file to json/json_features.h. This patch fixes the JsonCpp installation search by looking for json/allocator.h which has not been renamed on newer versions of JsonCpp.
31 lines
1.1 KiB
CMake
31 lines
1.1 KiB
CMake
# Look for JSONCPP if asked to.
|
|
# We use a bundled version by default because some distros ship versions of
|
|
# JSONCPP that cause segfaults and other memory errors when we link with them.
|
|
# See https://github.com/minetest/minetest/issues/1793
|
|
|
|
mark_as_advanced(JSON_LIBRARY JSON_INCLUDE_DIR)
|
|
option(ENABLE_SYSTEM_JSONCPP "Enable using a system-wide JSONCPP. May cause segfaults and other memory errors!" FALSE)
|
|
|
|
if(ENABLE_SYSTEM_JSONCPP)
|
|
find_library(JSON_LIBRARY NAMES jsoncpp)
|
|
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
|
|
find_path(JSON_INCLUDE_DIR json/features.h PATH_SUFFIXES jsoncpp)
|
|
else()
|
|
find_path(JSON_INCLUDE_DIR json/allocator.h PATH_SUFFIXES jsoncpp)
|
|
endif()
|
|
|
|
include(FindPackageHandleStandardArgs)
|
|
find_package_handle_standard_args(Json DEFAULT_MSG JSON_LIBRARY JSON_INCLUDE_DIR)
|
|
|
|
if(JSON_FOUND)
|
|
message(STATUS "Using system JSONCPP library.")
|
|
endif()
|
|
endif()
|
|
|
|
if(NOT JSON_FOUND)
|
|
message(STATUS "Using bundled JSONCPP library.")
|
|
set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp)
|
|
set(JSON_LIBRARY jsoncpp)
|
|
add_subdirectory(lib/jsoncpp)
|
|
endif()
|