jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

rapidjson: update to rapidjson-1.1.0

Browse Source
This commit is contained in:
chewitt 2017-04-25 07:18:17 +01:00
parent 63f64179a2
commit 23a3c910da
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/devel/rapidjson/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="rapidjson"
PKG_VERSION="1.0.2"
PKG_VERSION="1.1.0"
PKG_ARCH="any"
PKG_LICENSE="MIT"
PKG_SITE="https://github.com/miloyip/rapidjson"
@ -30,8 +30,10 @@ PKG_LONGDESC="A fast JSON parser/generator for C++ with both SAX/DOM style API"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
PKG_CMAKE_OPTS_TARGET="-DRAPIDJSON_HAS_STDSTRING=ON \
-DRAPIDJSON_BUILD_DOC=OFF \
PKG_CMAKE_OPTS_TARGET="-DRAPIDJSON_BUILD_DOC=OFF \
-DRAPIDJSON_BUILD_EXAMPLES=OFF
-DRAPIDJSON_BUILD_TESTS=OFF \
-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF"
-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF \
-DRAPIDJSON_BUILD_ASAN=OFF \
-DRAPIDJSON_BUILD_UBSAN=OFF \
-DRAPIDJSON_HAS_STDSTRING=ON"

43
packages/devel/rapidjson/patches/rapidjson-0001-remove_custom_cxx_flags.patch
View File

@ -1,18 +1,29 @@
diff -rupN a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2015-09-10 18:33:21.048580591 +0200
+++ b/CMakeLists.txt 2015-09-10 18:34:19.136579486 +0200
@@ -25,14 +25,6 @@ if(RAPIDJSON_HAS_STDSTRING)
add_definitions(-DRAPIDJSON_HAS_STDSTRING)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ceda71b..efb259e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,6 @@ if(CCACHE_FOUND)
endif(CCACHE_FOUND)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror")
if (RAPIDJSON_BUILD_CXX11)
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
@@ -73,7 +72,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
endif()
endif()
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror -Wno-missing-field-initializers")
if (RAPIDJSON_BUILD_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
@@ -88,7 +86,6 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
endif()
endif()
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
- add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
endif()
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
- add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
-endif()
-
#add extra search paths for libraries and includes
SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "Directory where lib will install")