[med-svn] [Git][med-team/sortmerna][master] d/patches: Rework system introspection for RapidJSON

[Mathieu Malaterre (@malat)]

Mathieu Malaterre pushed to branch master at Debian Med / sortmerna


Commits:
7cbe41c0 by Mathieu Malaterre at 2022-01-31T13:59:00+01:00
d/patches: Rework system introspection for RapidJSON

- - - - -


2 changed files:

- + debian/patches/rapidjson.patch
- debian/patches/series


Changes:

=====================================
debian/patches/rapidjson.patch
=====================================
@@ -0,0 +1,28 @@
+Description: Remove upstream RapidJson module
+ Not clear what upstream is doing, since RapidJSON already does export the
+ cmake config stuff.
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2022-01-31
+
+--- sortmerna-4.3.4.orig/src/sortmerna/CMakeLists.txt
++++ sortmerna-4.3.4/src/sortmerna/CMakeLists.txt
+@@ -68,9 +68,7 @@ include(FindZLIB)
+ # prevent CONFIG search mode
+ find_package(ZLIB MODULE REQUIRED)
+ 
+-include(FindRapidJson)
+- # prevent CONFIG search mode
+-find_package(RapidJson MODULE REQUIRED)
++find_package(RapidJSON)
+ 
+ # set additional compile flags
+ if(MSVC)
+@@ -134,7 +132,7 @@ target_link_libraries(smr_objs
+ 	PUBLIC
+ 		alp
+ 		${ROCKSDB_LIB}
+-		RapidJSON::RapidJSON
++		#RapidJSON::RapidJSON
+ 		ZLIB::ZLIB
+ )
+ if(WIN32)


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 cmake_RocksDB.patch
+rapidjson.patch



View it on GitLab: https://salsa.debian.org/med-team/sortmerna/-/commit/7cbe41c0d788a9f188f841553bb54cf0e2be55cd

-- 
View it on GitLab: https://salsa.debian.org/med-team/sortmerna/-/commit/7cbe41c0d788a9f188f841553bb54cf0e2be55cd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220131/34b68c81/attachment-0001.htm>