Description: Link with system-shared Redland Author: Jonas Smedegaard Last-Update: 2019-10-08 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Konclude.pro +++ b/Konclude.pro @@ -28,15 +28,10 @@ #Include file(s) include(Konclude.pri) -unix: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/librdf.a -unix: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/libraptor2.a -unix: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/librasqal.a -unix: LIBS += $$PWD/External/librdf/Linux/x64/lib/release/libxml2.a -unix: LIBS += $$PWD/External/jemalloc/Linux/x64/lib/release/libjemalloc.a -unix: LIBS += -lz -lltdl -lgmp -ldl -L External/jemalloc/Linux/x64/lib/release/ -ljemalloc - -unix: INCLUDEPATH += $$PWD/External/librdf/Linux/x64/include -unix: DEPENDPATH += $$PWD/External/librdf/Linux/x64/include +unix { + CONFIG += link_pkgconfig + PKGCONFIG += redland raptor2 rasqal jemalloc +} win32: LIBS += "C:\Program Files (x86)\Windows Kits\8.1\Lib\winv6.3\um\x64\kernel32.Lib" --- a/Source/Parser/CRDFRedlandRaptorParser.h +++ b/Source/Parser/CRDFRedlandRaptorParser.h @@ -23,7 +23,7 @@ #define KONCLUDE_PARSER_CRDFREDLANDRAPTORPARSER_H // Libraries includes -#include +#include #include #include #include --- a/Source/Reasoner/Triples/CRedlandNodeHasher.h +++ b/Source/Reasoner/Triples/CRedlandNodeHasher.h @@ -24,7 +24,7 @@ // Libraries includes #include -#include +#include // Namespace includes #include "TriplesSettings.h" --- a/Source/Reasoner/Triples/CRedlandStoredTriplesData.h +++ b/Source/Reasoner/Triples/CRedlandStoredTriplesData.h @@ -23,7 +23,7 @@ #define KONCLUDE_REASONER_TRIPLES_CREDLANDSTOREDTRIPLESDATA_H // Libraries includes -#include +#include // Namespace includes --- a/Source/Reasoner/Triples/CRedlandStoredTriplesIndividualAssertionIndexCache.h +++ b/Source/Reasoner/Triples/CRedlandStoredTriplesIndividualAssertionIndexCache.h @@ -27,7 +27,7 @@ #include #include -#include +#include // Namespace includes #include "TriplesSettings.h" --- a/Source/Reasoner/Triples/CRedlandUriHasher.h +++ b/Source/Reasoner/Triples/CRedlandUriHasher.h @@ -25,7 +25,7 @@ // Libraries includes #include -#include +#include // Namespace includes #include "TriplesSettings.h" --- a/Source/Reasoner/Triples/CRedlandStoredTriplesRepresentativeTagSet.h +++ b/Source/Reasoner/Triples/CRedlandStoredTriplesRepresentativeTagSet.h @@ -25,7 +25,7 @@ // Libraries includes #include #include -#include +#include // Namespace includes #include "TriplesSettings.h" --- a/Source/Parser/CRDFRedlandExternalTriplesDSNConnectingParser.h +++ b/Source/Parser/CRDFRedlandExternalTriplesDSNConnectingParser.h @@ -23,7 +23,7 @@ #define KONCLUDE_PARSER_CRDFREDLANDEXTERNALTRIPLESDSNCONNECTINGPARSER_H // Libraries includes -#include +#include #include #include #include --- a/Source/Parser/CSPARQLRedlandRasqalQueryParser.h +++ b/Source/Parser/CSPARQLRedlandRasqalQueryParser.h @@ -25,7 +25,7 @@ #define KONCLUDE_PARSER_CSPARQLREDLANDRASQALQUERYPARSER_H // Libraries includes -#include +#include // Namespace includes --- a/Source/Parser/CSPARQLRedlandRasqalReasoningBGPQueryParser.h +++ b/Source/Parser/CSPARQLRedlandRasqalReasoningBGPQueryParser.h @@ -25,7 +25,7 @@ #define KONCLUDE_PARSER_CSPARQLREDLANDRASQALREASONINGBGPQUERYPARSER_H // Libraries includes -#include +#include #include --- a/Source/Reasoner/Answerer/CRedlandRasqalLiteralHasher.h +++ b/Source/Reasoner/Answerer/CRedlandRasqalLiteralHasher.h @@ -24,7 +24,7 @@ // Libraries includes #include -#include +#include // Namespace includes #include "AnswererSettings.h" --- a/Source/Reasoner/Answerer/CRedlandRasqalModelSubQueryResolver.h +++ b/Source/Reasoner/Answerer/CRedlandRasqalModelSubQueryResolver.h @@ -23,7 +23,7 @@ #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALMODELSUBQUERYRESOLVER_H // Libraries includes -#include +#include // Namespace includes --- a/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBindingPositionResolvingHash.h +++ b/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBindingPositionResolvingHash.h @@ -23,7 +23,7 @@ #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALSUBQUERYBINDINGPOSITIONRESOLVINGHASH_H // Libraries includes -#include +#include // Namespace includes --- a/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBindingPositionResolvingHashData.h +++ b/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBindingPositionResolvingHashData.h @@ -23,7 +23,7 @@ #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALSUBQUERYBINDINGPOSITIONRESOLVINGHASHDATA_H // Libraries includes -#include +#include // Namespace includes --- a/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBoundNodeResolvingHash.h +++ b/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBoundNodeResolvingHash.h @@ -23,7 +23,7 @@ #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALSUBQUERYBOUNDNODERESOLVINGHASH_H // Libraries includes -#include +#include // Namespace includes --- a/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBoundNodeResolvingHashData.h +++ b/Source/Reasoner/Answerer/CRedlandRasqalSubQueryBoundNodeResolvingHashData.h @@ -23,7 +23,7 @@ #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALSUBQUERYBOUNDNODERESOLVINGHASHDATA_H // Libraries includes -#include +#include // Namespace includes --- a/Source/Reasoner/Answerer/CRedlandRasqalSubQueryProcessingData.h +++ b/Source/Reasoner/Answerer/CRedlandRasqalSubQueryProcessingData.h @@ -23,7 +23,7 @@ #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALSUBQUERYPROCESSINGDATA_H // Libraries includes -#include +#include // Namespace includes --- a/Source/Reasoner/Answerer/CRedlandRasqalSubQueryTripleResolvingData.h +++ b/Source/Reasoner/Answerer/CRedlandRasqalSubQueryTripleResolvingData.h @@ -23,7 +23,7 @@ #define KONCLUDE_REASONER_ANSWERER_CREDLANDRASQALSUBQUERYTRIPLERESOLVINGDATA_H // Libraries includes -#include +#include // Namespace includes --- a/Source/Reasoner/Query/CRedlandRasqalBGPsCompositionQuery.h +++ b/Source/Reasoner/Query/CRedlandRasqalBGPsCompositionQuery.h @@ -23,7 +23,7 @@ #define KONCLUDE_REASONER_QUERY_CREDLANDRASQALBGPSCOMPOSITIONQUERY_H // Libraries includes -#include +#include // Namespace includes #include "CComplexAnsweringCompositionQuery.h" --- a/Source/Parser/CRDFRedlandRaptorSimpleConcurrentParser.h +++ b/Source/Parser/CRDFRedlandRaptorSimpleConcurrentParser.h @@ -23,7 +23,7 @@ #define KONCLUDE_PARSER_CRDFREDLANDRAPTORSIMPLECONCURRENTPARSER_H // Libraries includes -#include +#include #include #include #include --- a/Source/Reasoner/Triples/CRedlandStoredTriplesIndexingBaseBatchLinker.h +++ b/Source/Reasoner/Triples/CRedlandStoredTriplesIndexingBaseBatchLinker.h @@ -23,7 +23,7 @@ #define KONCLUDE_REASONER_TRIPLES_CREDLANDSTOREDTRIPLESINDEXINGBASEBATCHLINKER_H // Libraries includes -#include +#include // Namespace includes --- a/Source/Reasoner/Triples/CRedlandStoredTriplesIndexingBaseResolvingLinker.h +++ b/Source/Reasoner/Triples/CRedlandStoredTriplesIndexingBaseResolvingLinker.h @@ -23,7 +23,7 @@ #define KONCLUDE_REASONER_TRIPLES_CREDLANDSTOREDTRIPLESINDEXINGBASERESOLVINGLINKER_H // Libraries includes -#include +#include // Namespace includes