Dirk Mueller
1027e892c0
- Added BuildRoot so we can actually build for SLE11
- New upstream version 1.1.0
* Added JSON Pointer
* Added JSON Schema
* Added relaxed JSON syntax (comment, trailing comma,
NaN/Infinity)
* Iterating array/object with C++11 Range-based for loop
* Reduce memory overhead of each Value from 24 bytes to 16 bytes
in x86-64 architecture.
* full changeset at
https://github.com/miloyip/rapidjson/releases/tag/v1.1.0
- remove_arch_specific_flags.patch: remove architecture specific
compiler flags.
- merge doc into devel package, it only adds about 20kB
OBS-URL: https://build.opensuse.org/request/show/434124
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/rapidjson?expand=0&rev=2
31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
Author: Adam Majer <adam.majer@suse.de>
|
|
Summary: Install data under data directory, not library prefix
|
|
|
|
Index: rapidjson-1.1.0/CMakeLists.txt
|
|
===================================================================
|
|
--- rapidjson-1.1.0.orig/CMakeLists.txt
|
|
+++ rapidjson-1.1.0/CMakeLists.txt
|
|
@@ -94,11 +94,11 @@ 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")
|
|
+SET(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Directory where shared data will install")
|
|
SET(DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}" CACHE PATH "Path to the documentation")
|
|
|
|
IF(UNIX OR CYGWIN)
|
|
- SET(_CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}")
|
|
+ SET(_CMAKE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/cmake/${PROJECT_NAME}")
|
|
ELSEIF(WIN32)
|
|
SET(_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/cmake")
|
|
ENDIF()
|
|
@@ -133,7 +133,7 @@ IF (UNIX OR CYGWIN)
|
|
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
|
|
@ONLY)
|
|
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
|
|
- DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
|
|
+ DESTINATION "${SHARE_INSTALL_PREFIX}/pkgconfig"
|
|
COMPONENT pkgconfig)
|
|
ENDIF()
|
|
|