Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-21 21:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMake changes to use the bundled RapidJSON parser.

Browse source
This commit is contained in:
Leon Styhre 2021-10-06 17:53:13 +02:00
parent 4db7d949af
commit db0b76a598
2 changed files with 1 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
CMake/Packages/FindRapidJSON.cmake
View file

@ -1,28 +0,0 @@
# Find the RapidJSON parsing library.
#
# Sets the usual variables expected for find_package scripts:
#
# RAPIDJSON_INCLUDE_DIR - header location
# RAPIDJSON_FOUND - true if RAPIDJSON was found.
include(FindPkgMacros)
if (NOT WIN32)
find_package(PkgConfig)
pkg_check_modules(RAPIDJSON REQUIRED RapidJSON>=1.0.0)
endif (NOT WIN32)
if (WIN32)
find_path(RAPIDJSON_INCLUDE_DIR rapidjson/rapidjson.h)
# Support the REQUIRED and QUIET arguments, and set RAPIDJSON_FOUND if found.
include (FindPackageHandleStandardArgs)
find_package_handle_standard_args(RAPIDJSON DEFAULT_MSG RAPIDJSON_INCLUDE_DIR)
if (NOT RAPIDJSON_INCLUDE_DIR)
message(FATAL_ERROR "RapidJSON include files not found!")
endif()
endif (WIN32)

3
CMakeLists.txt
View file

@ -90,7 +90,6 @@ if(NOT WIN32)
find_package(FreeImage REQUIRED) find_package(FreeImage REQUIRED)
find_package(Freetype REQUIRED) find_package(Freetype REQUIRED)
find_package(Pugixml REQUIRED) find_package(Pugixml REQUIRED)
find_package(RapidJSON REQUIRED)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
if(VLC_PLAYER) if(VLC_PLAYER)
find_package(VLC REQUIRED) find_package(VLC REQUIRED)
@ -243,11 +242,11 @@ set(COMMON_INCLUDE_DIRS ${CURL_INCLUDE_DIR}
${FreeImage_INCLUDE_DIRS} ${FreeImage_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS}
${PUGIXML_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIRS}
${RAPIDJSON_INCLUDE_DIRS}
${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/external/CImg ${CMAKE_CURRENT_SOURCE_DIR}/external/CImg
${CMAKE_CURRENT_SOURCE_DIR}/external/glm ${CMAKE_CURRENT_SOURCE_DIR}/external/glm
${CMAKE_CURRENT_SOURCE_DIR}/external/nanosvg/src ${CMAKE_CURRENT_SOURCE_DIR}/external/nanosvg/src
${CMAKE_CURRENT_SOURCE_DIR}/external/rapidjson/include
${CMAKE_CURRENT_SOURCE_DIR}/es-core/src) ${CMAKE_CURRENT_SOURCE_DIR}/es-core/src)
if(VLC_PLAYER) if(VLC_PLAYER)
set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} ${VLC_INCLUDE_DIR}) set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} ${VLC_INCLUDE_DIR})