From 90aaaefc8168464c136ea33b2424f36800a633bc Mon Sep 17 00:00:00 2001
From: mathvich <mathvich@gmail.com>
Date: Tue, 9 Nov 2021 17:35:44 +0300
Subject: Fix for CMake build on Windows

HAVE_TIME_H definition added
---
 CMakeLists.txt               | 1 +
 src/raptor_config_cmake.h.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93aa65d1..c7422108 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,7 @@ CHECK_INCLUDE_FILE(stddef.h	HAVE_STDDEF_H)
 CHECK_INCLUDE_FILE(stdlib.h	HAVE_STDLIB_H)
 CHECK_INCLUDE_FILE(string.h	HAVE_STRING_H)
 CHECK_INCLUDE_FILE(unistd.h	HAVE_UNISTD_H)
+CHECK_INCLUDE_FILE(time.h	HAVE_TIME_H)
 CHECK_INCLUDE_FILE(sys/param.h	HAVE_SYS_PARAM_H)
 CHECK_INCLUDE_FILE(sys/stat.h	HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE(sys/stat.h	HAVE_SYS_STAT_H)
diff --git a/src/raptor_config_cmake.h.in b/src/raptor_config_cmake.h.in
index e4559c14..8e8e57da 100644
--- a/src/raptor_config_cmake.h.in
+++ b/src/raptor_config_cmake.h.in
@@ -14,6 +14,7 @@
 #cmakedefine HAVE_STRING_H
 #cmakedefine HAVE_UNISTD_H
 #cmakedefine HAVE_SYS_PARAM_H
+#cmakedefine HAVE_TIME_H
 #cmakedefine HAVE_SYS_STAT_H
 #cmakedefine HAVE_SYS_STAT_H
 #cmakedefine HAVE_SYS_TIME_H
-- 
cgit v1.2.1


From 4591acc4e923ccbd3228ea1a8c0b2b9daadf5b41 Mon Sep 17 00:00:00 2001
From: mathvich <mathvich@gmail.com>
Date: Tue, 14 Dec 2021 19:39:41 +0300
Subject: [POS-5103] scripts directory fix

---
 src/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6435836c..54d8c256 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,7 +41,7 @@ IF(RAPTOR_PARSER_TURTLE OR RAPTOR_PARSER_TRIG)
 
   ADD_CUSTOM_TARGET(turtle_parser_tgt DEPENDS turtle_tables_tgt ${CMAKE_CURRENT_BINARY_DIR}/turtle_parser.c ${CMAKE_CURRENT_BINARY_DIR}/turtle_parser.h)
   ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/turtle_parser.c
-    COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/fix-bison.pl ${CMAKE_CURRENT_BINARY_DIR}/turtle_parser.c
+    COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/fix-bison.pl ${CMAKE_CURRENT_BINARY_DIR}/turtle_parser.c
     DEPENDS turtle_tables_tgt)
 
   # Generate the turtle lexer
@@ -52,8 +52,8 @@ IF(RAPTOR_PARSER_TURTLE OR RAPTOR_PARSER_TRIG)
 
   ADD_CUSTOM_TARGET(turtle_lexer_tgt DEPENDS turtle_flex_tgt)
   ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.c
-    COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/fix-flex.pl ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.t > ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.c
-    COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/fix-flex.pl ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.h > ${CMAKE_CURRENT_BINARY_DIR}/t
+    COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/fix-flex.pl ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.t > ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.c
+    COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/fix-flex.pl ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.h > ${CMAKE_CURRENT_BINARY_DIR}/t
     COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/t ${CMAKE_CURRENT_BINARY_DIR}/turtle_lexer.h
     DEPENDS turtle_flex_tgt)
 ENDIF(RAPTOR_PARSER_TURTLE OR RAPTOR_PARSER_TRIG)
@@ -169,7 +169,7 @@ IF(RAPTOR_PARSEDATE)
 
   ADD_CUSTOM_TARGET(parsedate_tgt DEPENDS parsedate_tables_tgt ${CMAKE_CURRENT_BINARY_DIR}/parsedate.c ${CMAKE_CURRENT_BINARY_DIR}/parsedate.h)
   ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/parsedate.c
-    COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/fix-bison.pl ${CMAKE_CURRENT_BINARY_DIR}/parsedate.c
+    COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/fix-bison.pl ${CMAKE_CURRENT_BINARY_DIR}/parsedate.c
     DEPENDS parsedate_tables_tgt)
 ENDIF(RAPTOR_PARSEDATE)
 
-- 
cgit v1.2.1


From 6766c52679049b6292ef87bca62007a439365a51 Mon Sep 17 00:00:00 2001
From: mathvich <mathvich@gmail.com>
Date: Tue, 14 Dec 2021 21:17:12 +0300
Subject: [POS-5103] directory change

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7422108..09e3d19b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,8 +271,8 @@ SET(RAPTOR_SERIALIZER_NQUADS TRUE
 ################################################################
 
 CONFIGURE_FILE(
-	src/raptor_config_cmake.h.in
-	src/raptor_config.h
+	${CMAKE_SOURCE_DIR}/src/raptor_config_cmake.h.in
+	${CMAKE_SOURCE_DIR}/src/raptor_config.h
 	@ONLY
 )
 
-- 
cgit v1.2.1


From 5d5411fb2cea82750b35d631c59fb0d578f3f280 Mon Sep 17 00:00:00 2001
From: mathvich <mathvich@gmail.com>
Date: Tue, 14 Dec 2021 21:21:04 +0300
Subject: [POS-5103] directory change

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09e3d19b..23136e95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,8 +271,8 @@ SET(RAPTOR_SERIALIZER_NQUADS TRUE
 ################################################################
 
 CONFIGURE_FILE(
-	${CMAKE_SOURCE_DIR}/src/raptor_config_cmake.h.in
-	${CMAKE_SOURCE_DIR}/src/raptor_config.h
+	${CMAKE_SOURCE_DIR}/raptor/src/raptor_config_cmake.h.in
+	${CMAKE_SOURCE_DIR}/raptor/src/raptor_config.h
 	@ONLY
 )
 
-- 
cgit v1.2.1


From 10d3fec78d2759fcf415a5dd7ec17fa76e9a5468 Mon Sep 17 00:00:00 2001
From: mathvich <mathvich@gmail.com>
Date: Wed, 15 Dec 2021 00:20:18 +0300
Subject: [POS-5103] debug message

---
 CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23136e95..50e85fd6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,8 +271,9 @@ SET(RAPTOR_SERIALIZER_NQUADS TRUE
 ################################################################
 
 CONFIGURE_FILE(
-	${CMAKE_SOURCE_DIR}/raptor/src/raptor_config_cmake.h.in
-	${CMAKE_SOURCE_DIR}/raptor/src/raptor_config.h
+    message(${CMAKE_SOURCE_DIR}/raptor/src/)
+	#${CMAKE_SOURCE_DIR}/raptor/src/raptor_config_cmake.h.in
+	#${CMAKE_SOURCE_DIR}/raptor/src/raptor_config.h
 	@ONLY
 )
 
-- 
cgit v1.2.1


From 518ee86d248e2c0804d6b3bfde6f509a615c4ace Mon Sep 17 00:00:00 2001
From: mathvich <mathvich@gmail.com>
Date: Wed, 15 Dec 2021 00:25:32 +0300
Subject: [POS-5103] returned to origin

---
 CMakeLists.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50e85fd6..51210d99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -270,10 +270,9 @@ SET(RAPTOR_SERIALIZER_NQUADS TRUE
 
 ################################################################
 
-CONFIGURE_FILE(
-    message(${CMAKE_SOURCE_DIR}/raptor/src/)
-	#${CMAKE_SOURCE_DIR}/raptor/src/raptor_config_cmake.h.in
-	#${CMAKE_SOURCE_DIR}/raptor/src/raptor_config.h
+CONFIGURE_FILE(    
+	src/raptor_config_cmake.h.in
+	src/raptor_config.h
 	@ONLY
 )
 
-- 
cgit v1.2.1


From 075e6086dff1764856487e5789ac9edd84e9fc54 Mon Sep 17 00:00:00 2001
From: mathvich <mathvich@gmail.com>
Date: Wed, 15 Dec 2021 02:51:56 +0300
Subject: [POS-5103] utils dir fix

---
 utils/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 31c0dd1e..0067e4c2 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 
 INCLUDE_DIRECTORIES(BEFORE
-	${CMAKE_SOURCE_DIR}/src
+	${CMAKE_CURRENT_SOURCE_DIR}/../src
 	${CMAKE_BINARY_DIR}/src
 	${CMAKE_CURRENT_SOURCE_DIR}
 )
-- 
cgit v1.2.1


From aca63d61aaf8efaf8a4411068c5fdd751e3d1872 Mon Sep 17 00:00:00 2001
From: mathvich <mathvich@gmail.com>
Date: Fri, 24 Dec 2021 18:21:36 +0300
Subject: [POS-5230] tabs changed to spaces

---
 CMakeLists.txt     | 236 +++++++++++++++++++-------------------
 src/CMakeLists.txt | 326 ++++++++++++++++++++++++++---------------------------
 2 files changed, 281 insertions(+), 281 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51210d99..cfdce330 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,24 +31,24 @@ FIND_PACKAGE(CURL)
 FIND_PACKAGE(LibXml2)
 FIND_PACKAGE(LibXslt)
 #FIND_PACKAGE(YAJL)
-FIND_PACKAGE(Perl  REQUIRED)
+FIND_PACKAGE(Perl REQUIRED)
 FIND_PACKAGE(BISON 3.4 REQUIRED)
 FIND_PACKAGE(FLEX 2.5.19 REQUIRED)
 
 if(EXISTS ${CURL_INCLUDE_DIRS})
-  INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+    INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
 endif(EXISTS ${CURL_INCLUDE_DIRS})
 
 if(EXISTS ${EXPAT_INCLUDE_DIRS})
-  INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIRS})
+    INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIRS})
 endif(EXISTS ${EXPAT_INCLUDE_DIRS})
 
 if(EXISTS ${LIBXML2_INCLUDE_DIR})
-  INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+    INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 endif(EXISTS ${LIBXML2_INCLUDE_DIR})
 
 if(EXISTS ${LIBXSLT_INCLUDE_DIRS})
-  INCLUDE_DIRECTORIES(${LIBXSLT_INCLUDE_DIRS})
+    INCLUDE_DIRECTORIES(${LIBXSLT_INCLUDE_DIRS})
 endif(EXISTS ${LIBXSLT_INCLUDE_DIRS})
 
 ################################################################
@@ -106,60 +106,60 @@ CHECK_TYPE_SIZE("unsigned long long"	SIZEOF_UNSIGNED_LONG_LONG)
 
 CHECK_C_SOURCE_COMPILES("
 int main(void){ printf(__FUNCTION__); }"
-	HAVE___FUNCTION__
+    HAVE___FUNCTION__
 )
 
 
 IF(LIBXML2_FOUND)
 
-	SET(CMAKE_REQUIRED_INCLUDES  ${LIBXML2_INCLUDE_DIR})
-	SET(CMAKE_REQUIRED_LIBRARIES ${LIBXML2_LIBRARIES})
-
-	CHECK_FUNCTION_EXISTS(xmlCtxtUseOptions     HAVE_XMLCTXTUSEOPTIONS)
-	CHECK_FUNCTION_EXISTS(xmlSAX2InternalSubset HAVE_XMLSAX2INTERNALSUBSET)
-
-	CHECK_STRUCT_HAS_MEMBER(
-		xmlEntity
-		name_length
-		libxml/parser.h
-		RAPTOR_LIBXML_ENTITY_NAME_LENGTH
-	)
-
-	CHECK_STRUCT_HAS_MEMBER(
-		xmlEntity
-		etype
-		libxml/parser.h
-		RAPTOR_LIBXML_ENTITY_ETYPE
-	)
-
-	CHECK_STRUCT_HAS_MEMBER(
-		xmlSAXHandler
-		initialized
-		libxml/parser.h
-		RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED
-	)
-
-	CHECK_STRUCT_HAS_MEMBER(
-		xmlSAXHandler
-		externalSubset
-		libxml/parser.h
-		RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET
-	)
-
-	CHECK_C_SOURCE_COMPILES("
+    SET(CMAKE_REQUIRED_INCLUDES  ${LIBXML2_INCLUDE_DIR})
+    SET(CMAKE_REQUIRED_LIBRARIES ${LIBXML2_LIBRARIES})
+
+    CHECK_FUNCTION_EXISTS(xmlCtxtUseOptions     HAVE_XMLCTXTUSEOPTIONS)
+    CHECK_FUNCTION_EXISTS(xmlSAX2InternalSubset HAVE_XMLSAX2INTERNALSUBSET)
+
+    CHECK_STRUCT_HAS_MEMBER(
+        xmlEntity
+        name_length
+        libxml/parser.h
+        RAPTOR_LIBXML_ENTITY_NAME_LENGTH
+    )
+
+    CHECK_STRUCT_HAS_MEMBER(
+        xmlEntity
+        etype
+        libxml/parser.h
+        RAPTOR_LIBXML_ENTITY_ETYPE
+    )
+
+    CHECK_STRUCT_HAS_MEMBER(
+        xmlSAXHandler
+        initialized
+        libxml/parser.h
+        RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED
+    )
+
+    CHECK_STRUCT_HAS_MEMBER(
+        xmlSAXHandler
+        externalSubset
+        libxml/parser.h
+        RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET
+    )
+
+    CHECK_C_SOURCE_COMPILES("
 #include <libxml/parser.h>
 int main(void){ xmlParserOption foo; foo = XML_PARSE_NONET; return 0; }"
-		RAPTOR_LIBXML_XML_PARSE_NONET
-	)
+        RAPTOR_LIBXML_XML_PARSE_NONET
+    )
 
-	CHECK_C_SOURCE_COMPILES("
+    CHECK_C_SOURCE_COMPILES("
 #include <libxml/HTMLparser.h>
 int main(void){ htmlParserOption foo; foo = HTML_PARSE_NONET; return 0; }"
-		RAPTOR_LIBXML_HTML_PARSE_NONET
-	)
+        RAPTOR_LIBXML_HTML_PARSE_NONET
+    )
 
-	SET(CMAKE_REQUIRED_INCLUDES)
-	SET(CMAKE_REQUIRED_LIBRARIES)
+    SET(CMAKE_REQUIRED_INCLUDES)
+    SET(CMAKE_REQUIRED_LIBRARIES)
 
 ENDIF(LIBXML2_FOUND)
 
@@ -171,117 +171,117 @@ ENDIF(LIBXML2_FOUND)
 # the order we use here)
 
 SET(BUILD_SHARED_LIBS OFF CACHE BOOL
-	"Build shared libraries instead of static ones.")
+    "Build shared libraries instead of static ones.")
 
 IF(BUILD_SHARED_LIBS)
-	SET(RAPTOR_STATIC FALSE)
+    SET(RAPTOR_STATIC FALSE)
 ELSE(BUILD_SHARED_LIBS)
-	SET(RAPTOR_STATIC TRUE)
+    SET(RAPTOR_STATIC TRUE)
 ENDIF(BUILD_SHARED_LIBS)
 
 SET(RAPTOR_XML_INIT none)
 IF(LIBXML2_FOUND)
-	SET(RAPTOR_XML_INIT libxml)
+    SET(RAPTOR_XML_INIT libxml)
 ENDIF(LIBXML2_FOUND)
 
 SET(RAPTOR_XML ${RAPTOR_XML_INIT} CACHE STRING
-	"Which XML library to use (any of \"libxml\", \"none\").")
+    "Which XML library to use (any of \"libxml\", \"none\").")
 
 SET(RAPTOR_XML_DEFINE RAPTOR_XML_NONE)
 IF(RAPTOR_XML STREQUAL "libxml")
-	SET(RAPTOR_XML_DEFINE RAPTOR_XML_LIBXML)
+    SET(RAPTOR_XML_DEFINE RAPTOR_XML_LIBXML)
 ENDIF(RAPTOR_XML STREQUAL "libxml")
 
 SET(RAPTOR_WWW_INIT none)
 IF(LIBXML2_FOUND)
-	SET(RAPTOR_WWW_INIT xml)
+    SET(RAPTOR_WWW_INIT xml)
 ENDIF(LIBXML2_FOUND)
 IF(CURL_FOUND)
-	SET(RAPTOR_WWW_INIT curl)
+    SET(RAPTOR_WWW_INIT curl)
 ENDIF(CURL_FOUND)
 
 SET(RAPTOR_WWW ${RAPTOR_WWW_INIT} CACHE STRING
-	"Which WWW library to use (any of \"curl\", \"xml\", \"none\").")
+    "Which WWW library to use (any of \"curl\", \"xml\", \"none\").")
 
 SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_NONE)
 IF(RAPTOR_WWW STREQUAL "curl")
-	SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_LIBCURL)
+    SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_LIBCURL)
 ELSEIF(RAPTOR_WWW STREQUAL "xml")
-	SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_LIBXML)
+    SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_LIBXML)
 ENDIF(RAPTOR_WWW STREQUAL "curl")
 
 SET(RAPTOR_XML_1_1 FALSE CACHE BOOL
-	"Use XML version 1.1 name checking.")
+    "Use XML version 1.1 name checking.")
 
 SET(HAVE_RAPTOR_PARSE_DATE 1)
 SET(RAPTOR_PARSEDATE 1)
 
 SET(RAPTOR_PARSER_RDFXML_INIT FALSE)
 IF(LIBXML2_FOUND)
-	SET(RAPTOR_PARSER_RDFXML_INIT TRUE)
+    SET(RAPTOR_PARSER_RDFXML_INIT TRUE)
 ENDIF(LIBXML2_FOUND)
 
 SET(RAPTOR_PARSER_GRDDL_INIT FALSE)
 IF(LIBXML2_FOUND AND LIBXSLT_FOUND)
-	SET(RAPTOR_PARSER_GRDDL_INIT TRUE)
+    SET(RAPTOR_PARSER_GRDDL_INIT TRUE)
 ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND)
 
 SET(RAPTOR_PARSER_RDFXML ${RAPTOR_PARSER_RDFXML_INIT}
-	CACHE BOOL "Build RDF/XML parser.")
+    CACHE BOOL "Build RDF/XML parser.")
 SET(RAPTOR_PARSER_NTRIPLES TRUE
-	CACHE BOOL "Build N-Triples parser.")
+    CACHE BOOL "Build N-Triples parser.")
 SET(RAPTOR_PARSER_TURTLE TRUE
-	CACHE BOOL "Build Turtle parser.")
+    CACHE BOOL "Build Turtle parser.")
 SET(RAPTOR_PARSER_TRIG TRUE
-	CACHE BOOL "Build TRiG parser.")
+    CACHE BOOL "Build TRiG parser.")
 SET(RAPTOR_PARSER_RSS ${LIBXML2_FOUND}
-	CACHE BOOL "Build RSS Tag Soup parser.")
+    CACHE BOOL "Build RSS Tag Soup parser.")
 SET(RAPTOR_PARSER_GRDDL ${RAPTOR_PARSER_GRDDL_INIT}
-	CACHE BOOL "Build GRDDL parser.")
+    CACHE BOOL "Build GRDDL parser.")
 SET(RAPTOR_PARSER_GUESS TRUE
-	CACHE BOOL "Build guess parser.")
+    CACHE BOOL "Build guess parser.")
 SET(RAPTOR_PARSER_RDFA ${LIBXML2_FOUND}
-	CACHE BOOL "Build RDFA parser.")
+    CACHE BOOL "Build RDFA parser.")
 SET(RAPTOR_PARSER_JSON ${YAJL_FOUND}
-	CACHE BOOL "Build JSON parser.")
+    CACHE BOOL "Build JSON parser.")
 SET(RAPTOR_PARSER_NQUADS TRUE
-	CACHE BOOL "Build N-Quads parser.")
+    CACHE BOOL "Build N-Quads parser.")
 
 SET(RAPTOR_SERIALIZER_RDFXML TRUE
-	CACHE BOOL "Build RDF/XML serializer.")
+    CACHE BOOL "Build RDF/XML serializer.")
 SET(RAPTOR_SERIALIZER_NTRIPLES TRUE
-	CACHE BOOL "Build N-Triples serializer.")
+    CACHE BOOL "Build N-Triples serializer.")
 SET(RAPTOR_SERIALIZER_RDFXML_ABBREV TRUE
-	CACHE BOOL "Build RDF/XML-abbreviated serializer.")
+    CACHE BOOL "Build RDF/XML-abbreviated serializer.")
 SET(RAPTOR_SERIALIZER_TURTLE TRUE
-	CACHE BOOL "Build Turtle serializer.")
+    CACHE BOOL "Build Turtle serializer.")
 SET(RAPTOR_SERIALIZER_RSS_1_0 TRUE
-	CACHE BOOL "Build RSS 1.0 serializer.")
+    CACHE BOOL "Build RSS 1.0 serializer.")
 SET(RAPTOR_SERIALIZER_ATOM TRUE
-	CACHE BOOL "Build Atom 1.0 serializer.")
+    CACHE BOOL "Build Atom 1.0 serializer.")
 SET(RAPTOR_SERIALIZER_DOT TRUE
-	CACHE BOOL "Build GraphViz DOT serializer.")
+    CACHE BOOL "Build GraphViz DOT serializer.")
 SET(RAPTOR_SERIALIZER_HTML TRUE
-	CACHE BOOL "Build HTML Table serializer.")
+    CACHE BOOL "Build HTML Table serializer.")
 SET(RAPTOR_SERIALIZER_JSON TRUE
-	CACHE BOOL "Build JSON serializer.")
+    CACHE BOOL "Build JSON serializer.")
 SET(RAPTOR_SERIALIZER_NQUADS TRUE
-	CACHE BOOL "Build N-Quads serializer.")
+    CACHE BOOL "Build N-Quads serializer.")
 
 ################################################################
 
-CONFIGURE_FILE(    
-	src/raptor_config_cmake.h.in
-	src/raptor_config.h
-	@ONLY
+CONFIGURE_FILE(
+    src/raptor_config_cmake.h.in
+    src/raptor_config.h
+    @ONLY
 )
 
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
 CONFIGURE_FILE(
-	src/raptor2.h.in
-	src/raptor2.h
-	@ONLY
+    src/raptor2.h.in
+    src/raptor2.h
+    @ONLY
 )
 
 ################################################################
@@ -324,12 +324,12 @@ message( "  *** libxml2 (include)           ${LIBXML2_INCLUDE_DIR}")
 #
 # Note that a partial solution is described at
 #
-#	http://www.cmake.org/pipermail/cmake/2009-May/029464.html
+#    http://www.cmake.org/pipermail/cmake/2009-May/029464.html
 #
 # but we don't have a good way of knowing where the third-party DLLs are.
 #
 IF(CMAKE_GENERATOR MATCHES "Makefiles")
-	ENABLE_TESTING()
+    ENABLE_TESTING()
 ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")
 
 SUBDIRS(src)
@@ -339,32 +339,32 @@ SUBDIRS(utils)
 
 FIND_PROGRAM(JING jing)
 IF(NOT JING STREQUAL "JING-NOTFOUND")
-	SET(HAVE_JING TRUE)
+    SET(HAVE_JING TRUE)
 ENDIF(NOT JING STREQUAL "JING-NOTFOUND")
 
 SET(RAPPER  ${CMAKE_BINARY_DIR}/utils/rapper)
 SET(RDFDIFF ${CMAKE_BINARY_DIR}/utils/rdfdiff)
 
 MACRO(RAPPER_TEST NAME_PREFIX COMMAND OUTPUT REFERENCE)
-	FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test-${NAME_PREFIX}.cmake "
+    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test-${NAME_PREFIX}.cmake "
 EXECUTE_PROCESS(
-	COMMAND ${COMMAND}
-	TIMEOUT 10
-	OUTPUT_FILE ${OUTPUT}.raw
-	ERROR_QUIET
+    COMMAND ${COMMAND}
+    TIMEOUT 10
+    OUTPUT_FILE ${OUTPUT}.raw
+    ERROR_QUIET
 )
 
 # http://public.kitware.com/Bug/view.php?id=13007
 
 CONFIGURE_FILE(
-	${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT}.raw
-	${OUTPUT}
-	@ONLY
-	NEWLINE_STYLE UNIX
+    ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT}.raw
+    ${OUTPUT}
+    @ONLY
+    NEWLINE_STYLE UNIX
 )
 ")
-	ADD_TEST("${NAME_PREFIX}:run" ${CMAKE_COMMAND} -P test-${NAME_PREFIX}.cmake)
-	ADD_TEST("${NAME_PREFIX}:cmp" ${CMAKE_COMMAND} -E compare_files ${REFERENCE} ${OUTPUT})
+    ADD_TEST("${NAME_PREFIX}:run" ${CMAKE_COMMAND} -P test-${NAME_PREFIX}.cmake)
+    ADD_TEST("${NAME_PREFIX}:cmp" ${CMAKE_COMMAND} -E compare_files ${REFERENCE} ${OUTPUT})
 ENDMACRO(RAPPER_TEST NAME_PREFIX COMMAND OUTPUT REFERENCE)
 
 INCLUDE(CMakeParseArguments)
@@ -388,25 +388,25 @@ FUNCTION(RAPPER_RDFDIFF_TEST TEST_NAME RAPPER_COMMAND RAPPER_OUTPUT RDFDIFF_COMM
     SET(EXPECT_FAILURE 0)
   ENDIF()
 
-	FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test-${TEST_NAME}.cmake "
+    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test-${TEST_NAME}.cmake "
 SET(rdfdiff_status -1)
 
 EXECUTE_PROCESS(
-	COMMAND ${RAPPER_COMMAND}
-	TIMEOUT 10
-	OUTPUT_FILE ${RAPPER_OUTPUT}
-	ERROR_QUIET
-	RESULT_VARIABLE rapper_status
+    COMMAND ${RAPPER_COMMAND}
+    TIMEOUT 10
+    OUTPUT_FILE ${RAPPER_OUTPUT}
+    ERROR_QUIET
+    RESULT_VARIABLE rapper_status
 )
 
 IF(rapper_status EQUAL 0 OR rapper_status EQUAL 2)
-	EXECUTE_PROCESS(
-		COMMAND ${RDFDIFF_COMMAND}
-		TIMEOUT 10
-		OUTPUT_QUIET
-		ERROR_QUIET
-		RESULT_VARIABLE rdfdiff_status
-	)
+    EXECUTE_PROCESS(
+        COMMAND ${RDFDIFF_COMMAND}
+        TIMEOUT 10
+        OUTPUT_QUIET
+        ERROR_QUIET
+        RESULT_VARIABLE rdfdiff_status
+    )
 ENDIF(rapper_status EQUAL 0 OR rapper_status EQUAL 2)
 
 IF(${EXPECT_FAILURE})
@@ -420,7 +420,7 @@ ELSE()
 ENDIF()
 ")
 
-	ADD_TEST(${TEST_NAME} ${CMAKE_COMMAND} -P test-${TEST_NAME}.cmake)
+    ADD_TEST(${TEST_NAME} ${CMAKE_COMMAND} -P test-${TEST_NAME}.cmake)
 ENDFUNCTION(RAPPER_RDFDIFF_TEST)
 
 SUBDIRS(tests/feeds)
@@ -431,6 +431,6 @@ SUBDIRS(tests/rdfa)
 SUBDIRS(tests/rdfa11)
 SUBDIRS(tests/rdfxml)
 SUBDIRS(tests/trig)
-#SUBDIRS(tests/turtle)	# TODO
+#SUBDIRS(tests/turtle)    # TODO
 
 # end raptor/CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 54d8c256..51a65b6c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,20 +7,20 @@
 #
 
 IF(RAPTOR_PARSER_RDFA)
-	INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/librdfa)
+    INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/librdfa)
 ENDIF(RAPTOR_PARSER_RDFA)
 
 # ** Parser sources **
 
 # XML parser enabled
 IF(RAPTOR_PARSER_RDFXML)
-	SET(raptor_parser_rdfxml_sources raptor_rdfxml.c)
-	SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
+    SET(raptor_parser_rdfxml_sources raptor_rdfxml.c)
+    SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
 ENDIF(RAPTOR_PARSER_RDFXML)
 
 # N triples parser enabled
 IF(RAPTOR_PARSER_NTRIPLES OR RAPTOR_PARSER_NQUADS)
-	SET(raptor_parser_ntriples_nquads_sources ntriples_parse.c raptor_ntriples.c)
+    SET(raptor_parser_ntriples_nquads_sources ntriples_parse.c raptor_ntriples.c)
 ENDIF(RAPTOR_PARSER_NTRIPLES OR RAPTOR_PARSER_NQUADS)
 
 # Turtle parser enabled
@@ -60,102 +60,102 @@ ENDIF(RAPTOR_PARSER_TURTLE OR RAPTOR_PARSER_TRIG)
 
 # RSS feed parser enabled
 IF(RAPTOR_PARSER_RSS OR RAPTOR_SERIALIZER_RSS_1_0)
-	SET(raptor_rss_common_sources raptor_rss_common.c raptor_rss.h)
+    SET(raptor_rss_common_sources raptor_rss_common.c raptor_rss.h)
 ENDIF(RAPTOR_PARSER_RSS OR RAPTOR_SERIALIZER_RSS_1_0)
 IF(RAPTOR_PARSER_RSS)
-	SET(raptor_parser_rss_sources raptor_rss.c)
-	SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
+    SET(raptor_parser_rss_sources raptor_rss.c)
+    SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
 ENDIF(RAPTOR_PARSER_RSS)
 
 # GRDDL parser enabled
 IF(RAPTOR_PARSER_GRDDL)
-	SET(raptor_parser_grddl_sources raptor_grddl.c)
-	SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
-	SET(raptor_libxslt_libs ${LIBXSLT_LIBRARIES})
+    SET(raptor_parser_grddl_sources raptor_grddl.c)
+    SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
+    SET(raptor_libxslt_libs ${LIBXSLT_LIBRARIES})
 ENDIF(RAPTOR_PARSER_GRDDL)
 
 # Guess which parser to use based on context
 IF(RAPTOR_PARSER_GUESS)
-	SET(raptor_parser_guess_sources raptor_guess.c)
+    SET(raptor_parser_guess_sources raptor_guess.c)
 ENDIF(RAPTOR_PARSER_GUESS)
 
 # RDFA parser enabled
 IF(RAPTOR_PARSER_RDFA)
-	SET(raptor_parser_rdfa_sources raptor_librdfa.c)
+    SET(raptor_parser_rdfa_sources raptor_librdfa.c)
 ENDIF(RAPTOR_PARSER_RDFA)
 
 # JSON parser enabled
 IF(RAPTOR_PARSER_JSON)
-	SET(raptor_parser_json_sources raptor_json.c)
+    SET(raptor_parser_json_sources raptor_json.c)
 ENDIF(RAPTOR_PARSER_JSON)
 
 # ** Serializers **
 
 IF(RAPTOR_SERIALIZER_RDFXML)
-	SET(raptor_serializer_rdfxml_sources raptor_serialize_rdfxml.c)
+    SET(raptor_serializer_rdfxml_sources raptor_serialize_rdfxml.c)
 ENDIF(RAPTOR_SERIALIZER_RDFXML)
 IF(RAPTOR_SERIALIZER_NTRIPLES OR RAPTOR_SERIALIZER_NQUADS)
-	SET(raptor_serializer_ntriples_nquads_sources raptor_serialize_ntriples.c)
+    SET(raptor_serializer_ntriples_nquads_sources raptor_serialize_ntriples.c)
 ENDIF(RAPTOR_SERIALIZER_NTRIPLES OR RAPTOR_SERIALIZER_NQUADS)
 IF(RAPTOR_SERIALIZER_RDFXML_ABBREV OR RAPTOR_SERIALIZER_TURTLE OR RAPTOR_SERIALIZER_MKR)
-	SET(raptor_serializer_abbrev_sources raptor_abbrev.c)
+    SET(raptor_serializer_abbrev_sources raptor_abbrev.c)
 ENDIF(RAPTOR_SERIALIZER_RDFXML_ABBREV OR RAPTOR_SERIALIZER_TURTLE OR RAPTOR_SERIALIZER_MKR)
 IF(RAPTOR_SERIALIZER_RDFXML_ABBREV)
-	SET(raptor_serializer_rdfxml_abbrev_sources raptor_serialize_rdfxmla.c)
+    SET(raptor_serializer_rdfxml_abbrev_sources raptor_serialize_rdfxmla.c)
 ENDIF(RAPTOR_SERIALIZER_RDFXML_ABBREV)
 IF(RAPTOR_SERIALIZER_TURTLE OR RAPTOR_SERIALIZER_MKR)
-	SET(raptor_serializer_turtle_sources raptor_serialize_turtle.c)
+    SET(raptor_serializer_turtle_sources raptor_serialize_turtle.c)
 ENDIF(RAPTOR_SERIALIZER_TURTLE OR RAPTOR_SERIALIZER_MKR)
 IF(RAPTOR_SERIALIZER_RSS_1_0)
-	SET(raptor_serializer_rss_1_0_sources raptor_serialize_rss.c)
+    SET(raptor_serializer_rss_1_0_sources raptor_serialize_rss.c)
 ENDIF(RAPTOR_SERIALIZER_RSS_1_0)
 IF(RAPTOR_SERIALIZER_DOT)
-	SET(raptor_serializer_dot_sources raptor_serialize_dot.c)
+    SET(raptor_serializer_dot_sources raptor_serialize_dot.c)
 ENDIF(RAPTOR_SERIALIZER_DOT)
 IF(RAPTOR_SERIALIZER_HTML)
-	SET(raptor_serializer_html_sources raptor_serialize_html.c)
+    SET(raptor_serializer_html_sources raptor_serialize_html.c)
 ENDIF(RAPTOR_SERIALIZER_HTML)
 IF(RAPTOR_SERIALIZER_JSON)
-	SET(raptor_serializer_json_sources raptor_serialize_json.c)
-	SET(raptor_yajl_libs ${YAJL_LIBRARIES})
+    SET(raptor_serializer_json_sources raptor_serialize_json.c)
+    SET(raptor_yajl_libs ${YAJL_LIBRARIES})
 ENDIF(RAPTOR_SERIALIZER_JSON)
 
 IF(RAPTOR_WWW STREQUAL "curl")
-	SET(raptor_www_sources raptor_www_curl.c)
-	SET(raptor_www_libs ${CURL_LIBRARIES})
+    SET(raptor_www_sources raptor_www_curl.c)
+    SET(raptor_www_libs ${CURL_LIBRARIES})
 ELSEIF(RAPTOR_WWW STREQUAL "fetch")
-	SET(raptor_www_sources raptor_www_libfetch.c)
-	#SET(raptor_www_libs ${FETCH_LIBRARIES})
+    SET(raptor_www_sources raptor_www_libfetch.c)
+    #SET(raptor_www_libs ${FETCH_LIBRARIES})
 ELSEIF(RAPTOR_WWW STREQUAL "xml")
-	SET(raptor_www_sources raptor_www_libxml.c)
-	SET(raptor_www_libs ${LIBXML2_LIBRARIES})
+    SET(raptor_www_sources raptor_www_libxml.c)
+    SET(raptor_www_libs ${LIBXML2_LIBRARIES})
 ENDIF(RAPTOR_WWW STREQUAL "curl")
 
 IF(RAPTOR_XML STREQUAL "libxml")
-	SET(raptor_libxml_sources raptor_libxml.c)
-	SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
+    SET(raptor_libxml_sources raptor_libxml.c)
+    SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
 ENDIF(RAPTOR_XML STREQUAL "libxml")
 IF(RAPTOR_PARSER_RDFA)
-	SET(raptor_librdfa_sources
-		${CMAKE_SOURCE_DIR}/librdfa/context.c
-		${CMAKE_SOURCE_DIR}/librdfa/curie.c
-		${CMAKE_SOURCE_DIR}/librdfa/iri.c
-		${CMAKE_SOURCE_DIR}/librdfa/language.c
-		${CMAKE_SOURCE_DIR}/librdfa/lists.c
-		${CMAKE_SOURCE_DIR}/librdfa/namespace.c
-		${CMAKE_SOURCE_DIR}/librdfa/rdfa.c
-		${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.c
-		${CMAKE_SOURCE_DIR}/librdfa/strtok_r.c
-		${CMAKE_SOURCE_DIR}/librdfa/subject.c
-		${CMAKE_SOURCE_DIR}/librdfa/triple.c
-# 		${CMAKE_SOURCE_DIR}/librdfa/rdfa.h
-# 		${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.h
-# 		${CMAKE_SOURCE_DIR}/librdfa/strtok_r.h
-	)
+    SET(raptor_librdfa_sources
+        ${CMAKE_SOURCE_DIR}/librdfa/context.c
+        ${CMAKE_SOURCE_DIR}/librdfa/curie.c
+        ${CMAKE_SOURCE_DIR}/librdfa/iri.c
+        ${CMAKE_SOURCE_DIR}/librdfa/language.c
+        ${CMAKE_SOURCE_DIR}/librdfa/lists.c
+        ${CMAKE_SOURCE_DIR}/librdfa/namespace.c
+        ${CMAKE_SOURCE_DIR}/librdfa/rdfa.c
+        ${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.c
+        ${CMAKE_SOURCE_DIR}/librdfa/strtok_r.c
+        ${CMAKE_SOURCE_DIR}/librdfa/subject.c
+        ${CMAKE_SOURCE_DIR}/librdfa/triple.c
+#        ${CMAKE_SOURCE_DIR}/librdfa/rdfa.h
+#        ${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.h
+#        ${CMAKE_SOURCE_DIR}/librdfa/strtok_r.h
+    )
 ENDIF(RAPTOR_PARSER_RDFA)
 
 IF(NOT HAVE_STRCASECMP AND NOT HAVE_STRICMP)
-	SET(raptor_strcasecmp_sources strcasecmp.c)
+    SET(raptor_strcasecmp_sources strcasecmp.c)
 ENDIF(NOT HAVE_STRCASECMP AND NOT HAVE_STRICMP)
 
 IF(RAPTOR_PARSEDATE)
@@ -174,66 +174,66 @@ IF(RAPTOR_PARSEDATE)
 ENDIF(RAPTOR_PARSEDATE)
 
 IF(BUILD_SHARED_LIBS)
-	SET(LIB_TYPE SHARED)
+    SET(LIB_TYPE SHARED)
 ELSE(BUILD_SHARED_LIBS)
-	SET(LIB_TYPE STATIC)
+    SET(LIB_TYPE STATIC)
 ENDIF(BUILD_SHARED_LIBS)
 
 ADD_LIBRARY(raptor2 ${LIB_TYPE}
-	raptor_avltree.c
-	raptor_concepts.c
-	raptor_escaped.c
-	raptor_general.c
-	raptor_iostream.c
-	raptor_json_writer.c
-	raptor_locator.c
-	raptor_log.c
-	raptor_memstr.c
-	raptor_namespace.c
-	raptor_option.c
-	raptor_parse.c
-	raptor_qname.c
-	raptor_rfc2396.c
-	raptor_sax2.c
-	raptor_sequence.c
-	raptor_serialize.c
-	raptor_set.c
-	raptor_statement.c
-	raptor_stringbuffer.c
-	raptor_syntax_description.c
-	raptor_term.c
-	raptor_turtle_writer.c
-	raptor_unicode.c
-	raptor_uri.c
-	raptor_www.c
-	raptor_xml.c
-	raptor_xml_writer.c
-	snprintf.c
-	sort_r.c
-	turtle_common.c
-	${raptor_parser_rdfxml_sources}
-	${raptor_parser_ntriples_nquads_sources}
-	${raptor_parser_turtle_trig_sources}
-	${raptor_rss_common_sources}
-	${raptor_parser_rss_sources}
-	${raptor_parser_grddl_sources}
-	${raptor_parser_guess_sources}
-	${raptor_parser_rdfa_sources}
-	${raptor_parser_json_sources}
-	${raptor_serializer_rdfxml_sources}
-	${raptor_serializer_ntriples_nquads_sources}
-	${raptor_serializer_abbrev_sources}
-	${raptor_serializer_rdfxml_abbrev_sources}
-	${raptor_serializer_turtle_sources}
-	${raptor_serializer_rss_1_0_sources}
-	${raptor_serializer_dot_sources}
-	${raptor_serializer_html_sources}
-	${raptor_serializer_json_sources}
-	${raptor_www_sources}
-	${raptor_libxml_sources}
-	${raptor_librdfa_sources}
-	${raptor_strcasecmp_sources}
-	${raptor_parsedate_sources}
+    raptor_avltree.c
+    raptor_concepts.c
+    raptor_escaped.c
+    raptor_general.c
+    raptor_iostream.c
+    raptor_json_writer.c
+    raptor_locator.c
+    raptor_log.c
+    raptor_memstr.c
+    raptor_namespace.c
+    raptor_option.c
+    raptor_parse.c
+    raptor_qname.c
+    raptor_rfc2396.c
+    raptor_sax2.c
+    raptor_sequence.c
+    raptor_serialize.c
+    raptor_set.c
+    raptor_statement.c
+    raptor_stringbuffer.c
+    raptor_syntax_description.c
+    raptor_term.c
+    raptor_turtle_writer.c
+    raptor_unicode.c
+    raptor_uri.c
+    raptor_www.c
+    raptor_xml.c
+    raptor_xml_writer.c
+    snprintf.c
+    sort_r.c
+    turtle_common.c
+    ${raptor_parser_rdfxml_sources}
+    ${raptor_parser_ntriples_nquads_sources}
+    ${raptor_parser_turtle_trig_sources}
+    ${raptor_rss_common_sources}
+    ${raptor_parser_rss_sources}
+    ${raptor_parser_grddl_sources}
+    ${raptor_parser_guess_sources}
+    ${raptor_parser_rdfa_sources}
+    ${raptor_parser_json_sources}
+    ${raptor_serializer_rdfxml_sources}
+    ${raptor_serializer_ntriples_nquads_sources}
+    ${raptor_serializer_abbrev_sources}
+    ${raptor_serializer_rdfxml_abbrev_sources}
+    ${raptor_serializer_turtle_sources}
+    ${raptor_serializer_rss_1_0_sources}
+    ${raptor_serializer_dot_sources}
+    ${raptor_serializer_html_sources}
+    ${raptor_serializer_json_sources}
+    ${raptor_www_sources}
+    ${raptor_libxml_sources}
+    ${raptor_librdfa_sources}
+    ${raptor_strcasecmp_sources}
+    ${raptor_parsedate_sources}
 )
 IF(RAPTOR_PARSER_TURTLE OR RAPTOR_PARSER_TRIG)
   add_dependencies(raptor2 turtle_parser_tgt turtle_lexer_tgt)
@@ -243,30 +243,30 @@ IF(RAPTOR_PARSEDATE)
 ENDIF()
 
 TARGET_LINK_LIBRARIES(raptor2
-	${raptor_libxslt_libs}
-	${raptor_libxml_libs}
-	${raptor_yajl_libs}
-	${raptor_www_libs}
+    ${raptor_libxslt_libs}
+    ${raptor_libxml_libs}
+    ${raptor_yajl_libs}
+    ${raptor_www_libs}
 )
 
 SET_TARGET_PROPERTIES(
-	raptor2
-	PROPERTIES
-	COMPILE_DEFINITIONS "LIBRDFA_IN_RAPTOR;RAPTOR_INTERNAL;${LIBXML2_DEFINITIONS};${LIBXSLT_DEFINITIONS}"
+    raptor2
+    PROPERTIES
+    COMPILE_DEFINITIONS "LIBRDFA_IN_RAPTOR;RAPTOR_INTERNAL;${LIBXML2_DEFINITIONS};${LIBXSLT_DEFINITIONS}"
 )
 
 ADD_EXECUTABLE(turtle_lexer_test turtle_lexer.c)
 TARGET_LINK_LIBRARIES(turtle_lexer_test raptor2)
 
 IF(NOT WIN32 OR NOT BUILD_SHARED_LIBS)
-	# This currently cannot be built on Windows with DLL linkage
-	ADD_EXECUTABLE(turtle_parser_test turtle_parser.c)
-	TARGET_LINK_LIBRARIES(turtle_parser_test raptor2)
-	SET_TARGET_PROPERTIES(
-		turtle_parser_test
-		PROPERTIES
-		COMPILE_DEFINITIONS "RAPTOR_INTERNAL;STANDALONE"
-	)
+    # This currently cannot be built on Windows with DLL linkage
+    ADD_EXECUTABLE(turtle_parser_test turtle_parser.c)
+    TARGET_LINK_LIBRARIES(turtle_parser_test raptor2)
+    SET_TARGET_PROPERTIES(
+        turtle_parser_test
+        PROPERTIES
+        COMPILE_DEFINITIONS "RAPTOR_INTERNAL;STANDALONE"
+    )
 ENDIF(NOT WIN32 OR NOT BUILD_SHARED_LIBS)
 
 ADD_EXECUTABLE(raptor_parse_test raptor_parse.c)
@@ -334,43 +334,43 @@ TARGET_LINK_LIBRARIES(raptor_sort_r_test raptor2)
 ADD_TEST(raptor_sort_r_test raptor_sort_r_test)
 
 SET_TARGET_PROPERTIES(
-	turtle_lexer_test
-	#turtle_parser_test
-	raptor_parse_test
-	raptor_rfc2396_test
-	raptor_uri_test
-	raptor_namespace_test
-	strcasecmp_test
-	raptor_www_test
-	raptor_sequence_test
-	raptor_stringbuffer_test
-	raptor_iostream_test
-	raptor_xml_writer_test
-	raptor_turtle_writer_test
-	raptor_avltree_test
-	raptor_term_test
-	raptor_permute_test
-	raptor_snprintf_test
-	raptor_sort_r_test
-	PROPERTIES
-	COMPILE_DEFINITIONS "RAPTOR_INTERNAL;STANDALONE"
+    turtle_lexer_test
+    #turtle_parser_test
+    raptor_parse_test
+    raptor_rfc2396_test
+    raptor_uri_test
+    raptor_namespace_test
+    strcasecmp_test
+    raptor_www_test
+    raptor_sequence_test
+    raptor_stringbuffer_test
+    raptor_iostream_test
+    raptor_xml_writer_test
+    raptor_turtle_writer_test
+    raptor_avltree_test
+    raptor_term_test
+    raptor_permute_test
+    raptor_snprintf_test
+    raptor_sort_r_test
+    PROPERTIES
+    COMPILE_DEFINITIONS "RAPTOR_INTERNAL;STANDALONE"
 )
 
 IF(RAPTOR_PARSER_RDFXML)
-	ADD_EXECUTABLE(raptor_set_test raptor_set.c)
-	TARGET_LINK_LIBRARIES(raptor_set_test raptor2)
-	ADD_TEST(raptor_set_test raptor_set_test)
-
-	ADD_EXECUTABLE(raptor_xml_test raptor_xml.c)
-	TARGET_LINK_LIBRARIES(raptor_xml_test raptor2)
-	ADD_TEST(raptor_xml_test raptor_xml_test)
-
-	SET_TARGET_PROPERTIES(
-		raptor_set_test
-		raptor_xml_test
-		PROPERTIES
-		COMPILE_DEFINITIONS "RAPTOR_INTERNAL;STANDALONE"
-	)
+    ADD_EXECUTABLE(raptor_set_test raptor_set.c)
+    TARGET_LINK_LIBRARIES(raptor_set_test raptor2)
+    ADD_TEST(raptor_set_test raptor_set_test)
+
+    ADD_EXECUTABLE(raptor_xml_test raptor_xml.c)
+    TARGET_LINK_LIBRARIES(raptor_xml_test raptor2)
+    ADD_TEST(raptor_xml_test raptor_xml_test)
+
+    SET_TARGET_PROPERTIES(
+        raptor_set_test
+        raptor_xml_test
+        PROPERTIES
+        COMPILE_DEFINITIONS "RAPTOR_INTERNAL;STANDALONE"
+    )
 ENDIF(RAPTOR_PARSER_RDFXML)
 
 # Generate pkg-config metadata file
@@ -390,22 +390,22 @@ Cflags: -I\${includedir}
 ")
 
 INSTALL(FILES
-	raptor.h
-	${CMAKE_CURRENT_BINARY_DIR}/raptor2.h
-	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/raptor2
+    raptor.h
+    ${CMAKE_CURRENT_BINARY_DIR}/raptor2.h
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/raptor2
 )
 
 INSTALL(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/raptor2.pc
-	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+    ${CMAKE_CURRENT_BINARY_DIR}/raptor2.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
 
 INSTALL(
-	TARGETS raptor2
-	EXPORT  Raptor2Config
-	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    TARGETS raptor2
+    EXPORT  Raptor2Config
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
 INSTALL(EXPORT Raptor2Config DESTINATION  ${CMAKE_INSTALL_LIBDIR}/cmake)
-- 
cgit v1.2.1


From c7ac24a85e3927f14fed7996f61deef4b51d88a3 Mon Sep 17 00:00:00 2001
From: mathvich <mathvich@gmail.com>
Date: Fri, 24 Dec 2021 18:50:37 +0300
Subject: [POS-5230] librdfa directory fix

---
 CMakeLists.txt     | 232 +++++++++++++++++++-------------------
 src/CMakeLists.txt | 326 ++++++++++++++++++++++++++---------------------------
 2 files changed, 279 insertions(+), 279 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfdce330..abe02d76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,19 +36,19 @@ FIND_PACKAGE(BISON 3.4 REQUIRED)
 FIND_PACKAGE(FLEX 2.5.19 REQUIRED)
 
 if(EXISTS ${CURL_INCLUDE_DIRS})
-    INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+  INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
 endif(EXISTS ${CURL_INCLUDE_DIRS})
 
 if(EXISTS ${EXPAT_INCLUDE_DIRS})
-    INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIRS})
+  INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIRS})
 endif(EXISTS ${EXPAT_INCLUDE_DIRS})
 
 if(EXISTS ${LIBXML2_INCLUDE_DIR})
-    INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 endif(EXISTS ${LIBXML2_INCLUDE_DIR})
 
 if(EXISTS ${LIBXSLT_INCLUDE_DIRS})
-    INCLUDE_DIRECTORIES(${LIBXSLT_INCLUDE_DIRS})
+  INCLUDE_DIRECTORIES(${LIBXSLT_INCLUDE_DIRS})
 endif(EXISTS ${LIBXSLT_INCLUDE_DIRS})
 
 ################################################################
@@ -106,60 +106,60 @@ CHECK_TYPE_SIZE("unsigned long long"	SIZEOF_UNSIGNED_LONG_LONG)
 
 CHECK_C_SOURCE_COMPILES("
 int main(void){ printf(__FUNCTION__); }"
-    HAVE___FUNCTION__
+	HAVE___FUNCTION__
 )
 
 
 IF(LIBXML2_FOUND)
 
-    SET(CMAKE_REQUIRED_INCLUDES  ${LIBXML2_INCLUDE_DIR})
-    SET(CMAKE_REQUIRED_LIBRARIES ${LIBXML2_LIBRARIES})
-
-    CHECK_FUNCTION_EXISTS(xmlCtxtUseOptions     HAVE_XMLCTXTUSEOPTIONS)
-    CHECK_FUNCTION_EXISTS(xmlSAX2InternalSubset HAVE_XMLSAX2INTERNALSUBSET)
-
-    CHECK_STRUCT_HAS_MEMBER(
-        xmlEntity
-        name_length
-        libxml/parser.h
-        RAPTOR_LIBXML_ENTITY_NAME_LENGTH
-    )
-
-    CHECK_STRUCT_HAS_MEMBER(
-        xmlEntity
-        etype
-        libxml/parser.h
-        RAPTOR_LIBXML_ENTITY_ETYPE
-    )
-
-    CHECK_STRUCT_HAS_MEMBER(
-        xmlSAXHandler
-        initialized
-        libxml/parser.h
-        RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED
-    )
-
-    CHECK_STRUCT_HAS_MEMBER(
-        xmlSAXHandler
-        externalSubset
-        libxml/parser.h
-        RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET
-    )
-
-    CHECK_C_SOURCE_COMPILES("
+	SET(CMAKE_REQUIRED_INCLUDES  ${LIBXML2_INCLUDE_DIR})
+	SET(CMAKE_REQUIRED_LIBRARIES ${LIBXML2_LIBRARIES})
+
+	CHECK_FUNCTION_EXISTS(xmlCtxtUseOptions     HAVE_XMLCTXTUSEOPTIONS)
+	CHECK_FUNCTION_EXISTS(xmlSAX2InternalSubset HAVE_XMLSAX2INTERNALSUBSET)
+
+	CHECK_STRUCT_HAS_MEMBER(
+		xmlEntity
+		name_length
+		libxml/parser.h
+		RAPTOR_LIBXML_ENTITY_NAME_LENGTH
+	)
+
+	CHECK_STRUCT_HAS_MEMBER(
+		xmlEntity
+		etype
+		libxml/parser.h
+		RAPTOR_LIBXML_ENTITY_ETYPE
+	)
+
+	CHECK_STRUCT_HAS_MEMBER(
+		xmlSAXHandler
+		initialized
+		libxml/parser.h
+		RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED
+	)
+
+	CHECK_STRUCT_HAS_MEMBER(
+		xmlSAXHandler
+		externalSubset
+		libxml/parser.h
+		RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET
+	)
+
+	CHECK_C_SOURCE_COMPILES("
 #include <libxml/parser.h>
 int main(void){ xmlParserOption foo; foo = XML_PARSE_NONET; return 0; }"
-        RAPTOR_LIBXML_XML_PARSE_NONET
-    )
+		RAPTOR_LIBXML_XML_PARSE_NONET
+	)
 
-    CHECK_C_SOURCE_COMPILES("
+	CHECK_C_SOURCE_COMPILES("
 #include <libxml/HTMLparser.h>
 int main(void){ htmlParserOption foo; foo = HTML_PARSE_NONET; return 0; }"
-        RAPTOR_LIBXML_HTML_PARSE_NONET
-    )
+		RAPTOR_LIBXML_HTML_PARSE_NONET
+	)
 
-    SET(CMAKE_REQUIRED_INCLUDES)
-    SET(CMAKE_REQUIRED_LIBRARIES)
+	SET(CMAKE_REQUIRED_INCLUDES)
+	SET(CMAKE_REQUIRED_LIBRARIES)
 
 ENDIF(LIBXML2_FOUND)
 
@@ -171,117 +171,117 @@ ENDIF(LIBXML2_FOUND)
 # the order we use here)
 
 SET(BUILD_SHARED_LIBS OFF CACHE BOOL
-    "Build shared libraries instead of static ones.")
+	"Build shared libraries instead of static ones.")
 
 IF(BUILD_SHARED_LIBS)
-    SET(RAPTOR_STATIC FALSE)
+	SET(RAPTOR_STATIC FALSE)
 ELSE(BUILD_SHARED_LIBS)
-    SET(RAPTOR_STATIC TRUE)
+	SET(RAPTOR_STATIC TRUE)
 ENDIF(BUILD_SHARED_LIBS)
 
 SET(RAPTOR_XML_INIT none)
 IF(LIBXML2_FOUND)
-    SET(RAPTOR_XML_INIT libxml)
+	SET(RAPTOR_XML_INIT libxml)
 ENDIF(LIBXML2_FOUND)
 
 SET(RAPTOR_XML ${RAPTOR_XML_INIT} CACHE STRING
-    "Which XML library to use (any of \"libxml\", \"none\").")
+	"Which XML library to use (any of \"libxml\", \"none\").")
 
 SET(RAPTOR_XML_DEFINE RAPTOR_XML_NONE)
 IF(RAPTOR_XML STREQUAL "libxml")
-    SET(RAPTOR_XML_DEFINE RAPTOR_XML_LIBXML)
+	SET(RAPTOR_XML_DEFINE RAPTOR_XML_LIBXML)
 ENDIF(RAPTOR_XML STREQUAL "libxml")
 
 SET(RAPTOR_WWW_INIT none)
 IF(LIBXML2_FOUND)
-    SET(RAPTOR_WWW_INIT xml)
+	SET(RAPTOR_WWW_INIT xml)
 ENDIF(LIBXML2_FOUND)
 IF(CURL_FOUND)
-    SET(RAPTOR_WWW_INIT curl)
+	SET(RAPTOR_WWW_INIT curl)
 ENDIF(CURL_FOUND)
 
 SET(RAPTOR_WWW ${RAPTOR_WWW_INIT} CACHE STRING
-    "Which WWW library to use (any of \"curl\", \"xml\", \"none\").")
+	"Which WWW library to use (any of \"curl\", \"xml\", \"none\").")
 
 SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_NONE)
 IF(RAPTOR_WWW STREQUAL "curl")
-    SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_LIBCURL)
+	SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_LIBCURL)
 ELSEIF(RAPTOR_WWW STREQUAL "xml")
-    SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_LIBXML)
+	SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_LIBXML)
 ENDIF(RAPTOR_WWW STREQUAL "curl")
 
 SET(RAPTOR_XML_1_1 FALSE CACHE BOOL
-    "Use XML version 1.1 name checking.")
+	"Use XML version 1.1 name checking.")
 
 SET(HAVE_RAPTOR_PARSE_DATE 1)
 SET(RAPTOR_PARSEDATE 1)
 
 SET(RAPTOR_PARSER_RDFXML_INIT FALSE)
 IF(LIBXML2_FOUND)
-    SET(RAPTOR_PARSER_RDFXML_INIT TRUE)
+	SET(RAPTOR_PARSER_RDFXML_INIT TRUE)
 ENDIF(LIBXML2_FOUND)
 
 SET(RAPTOR_PARSER_GRDDL_INIT FALSE)
 IF(LIBXML2_FOUND AND LIBXSLT_FOUND)
-    SET(RAPTOR_PARSER_GRDDL_INIT TRUE)
+	SET(RAPTOR_PARSER_GRDDL_INIT TRUE)
 ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND)
 
 SET(RAPTOR_PARSER_RDFXML ${RAPTOR_PARSER_RDFXML_INIT}
-    CACHE BOOL "Build RDF/XML parser.")
+	CACHE BOOL "Build RDF/XML parser.")
 SET(RAPTOR_PARSER_NTRIPLES TRUE
-    CACHE BOOL "Build N-Triples parser.")
+	CACHE BOOL "Build N-Triples parser.")
 SET(RAPTOR_PARSER_TURTLE TRUE
-    CACHE BOOL "Build Turtle parser.")
+	CACHE BOOL "Build Turtle parser.")
 SET(RAPTOR_PARSER_TRIG TRUE
-    CACHE BOOL "Build TRiG parser.")
+	CACHE BOOL "Build TRiG parser.")
 SET(RAPTOR_PARSER_RSS ${LIBXML2_FOUND}
-    CACHE BOOL "Build RSS Tag Soup parser.")
+	CACHE BOOL "Build RSS Tag Soup parser.")
 SET(RAPTOR_PARSER_GRDDL ${RAPTOR_PARSER_GRDDL_INIT}
-    CACHE BOOL "Build GRDDL parser.")
+	CACHE BOOL "Build GRDDL parser.")
 SET(RAPTOR_PARSER_GUESS TRUE
-    CACHE BOOL "Build guess parser.")
+	CACHE BOOL "Build guess parser.")
 SET(RAPTOR_PARSER_RDFA ${LIBXML2_FOUND}
-    CACHE BOOL "Build RDFA parser.")
+	CACHE BOOL "Build RDFA parser.")
 SET(RAPTOR_PARSER_JSON ${YAJL_FOUND}
-    CACHE BOOL "Build JSON parser.")
+	CACHE BOOL "Build JSON parser.")
 SET(RAPTOR_PARSER_NQUADS TRUE
-    CACHE BOOL "Build N-Quads parser.")
+	CACHE BOOL "Build N-Quads parser.")
 
 SET(RAPTOR_SERIALIZER_RDFXML TRUE
-    CACHE BOOL "Build RDF/XML serializer.")
+	CACHE BOOL "Build RDF/XML serializer.")
 SET(RAPTOR_SERIALIZER_NTRIPLES TRUE
-    CACHE BOOL "Build N-Triples serializer.")
+	CACHE BOOL "Build N-Triples serializer.")
 SET(RAPTOR_SERIALIZER_RDFXML_ABBREV TRUE
-    CACHE BOOL "Build RDF/XML-abbreviated serializer.")
+	CACHE BOOL "Build RDF/XML-abbreviated serializer.")
 SET(RAPTOR_SERIALIZER_TURTLE TRUE
-    CACHE BOOL "Build Turtle serializer.")
+	CACHE BOOL "Build Turtle serializer.")
 SET(RAPTOR_SERIALIZER_RSS_1_0 TRUE
-    CACHE BOOL "Build RSS 1.0 serializer.")
+	CACHE BOOL "Build RSS 1.0 serializer.")
 SET(RAPTOR_SERIALIZER_ATOM TRUE
-    CACHE BOOL "Build Atom 1.0 serializer.")
+	CACHE BOOL "Build Atom 1.0 serializer.")
 SET(RAPTOR_SERIALIZER_DOT TRUE
-    CACHE BOOL "Build GraphViz DOT serializer.")
+	CACHE BOOL "Build GraphViz DOT serializer.")
 SET(RAPTOR_SERIALIZER_HTML TRUE
-    CACHE BOOL "Build HTML Table serializer.")
+	CACHE BOOL "Build HTML Table serializer.")
 SET(RAPTOR_SERIALIZER_JSON TRUE
-    CACHE BOOL "Build JSON serializer.")
+	CACHE BOOL "Build JSON serializer.")
 SET(RAPTOR_SERIALIZER_NQUADS TRUE
-    CACHE BOOL "Build N-Quads serializer.")
+	CACHE BOOL "Build N-Quads serializer.")
 
 ################################################################
 
 CONFIGURE_FILE(
-    src/raptor_config_cmake.h.in
-    src/raptor_config.h
-    @ONLY
+	src/raptor_config_cmake.h.in
+	src/raptor_config.h
+	@ONLY
 )
 
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
 CONFIGURE_FILE(
-    src/raptor2.h.in
-    src/raptor2.h
-    @ONLY
+	src/raptor2.h.in
+	src/raptor2.h
+	@ONLY
 )
 
 ################################################################
@@ -324,12 +324,12 @@ message( "  *** libxml2 (include)           ${LIBXML2_INCLUDE_DIR}")
 #
 # Note that a partial solution is described at
 #
-#    http://www.cmake.org/pipermail/cmake/2009-May/029464.html
+#	http://www.cmake.org/pipermail/cmake/2009-May/029464.html
 #
 # but we don't have a good way of knowing where the third-party DLLs are.
 #
 IF(CMAKE_GENERATOR MATCHES "Makefiles")
-    ENABLE_TESTING()
+	ENABLE_TESTING()
 ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")
 
 SUBDIRS(src)
@@ -339,32 +339,32 @@ SUBDIRS(utils)
 
 FIND_PROGRAM(JING jing)
 IF(NOT JING STREQUAL "JING-NOTFOUND")
-    SET(HAVE_JING TRUE)
+	SET(HAVE_JING TRUE)
 ENDIF(NOT JING STREQUAL "JING-NOTFOUND")
 
 SET(RAPPER  ${CMAKE_BINARY_DIR}/utils/rapper)
 SET(RDFDIFF ${CMAKE_BINARY_DIR}/utils/rdfdiff)
 
 MACRO(RAPPER_TEST NAME_PREFIX COMMAND OUTPUT REFERENCE)
-    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test-${NAME_PREFIX}.cmake "
+	FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test-${NAME_PREFIX}.cmake "
 EXECUTE_PROCESS(
-    COMMAND ${COMMAND}
-    TIMEOUT 10
-    OUTPUT_FILE ${OUTPUT}.raw
-    ERROR_QUIET
+	COMMAND ${COMMAND}
+	TIMEOUT 10
+	OUTPUT_FILE ${OUTPUT}.raw
+	ERROR_QUIET
 )
 
 # http://public.kitware.com/Bug/view.php?id=13007
 
 CONFIGURE_FILE(
-    ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT}.raw
-    ${OUTPUT}
-    @ONLY
-    NEWLINE_STYLE UNIX
+	${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT}.raw
+	${OUTPUT}
+	@ONLY
+	NEWLINE_STYLE UNIX
 )
 ")
-    ADD_TEST("${NAME_PREFIX}:run" ${CMAKE_COMMAND} -P test-${NAME_PREFIX}.cmake)
-    ADD_TEST("${NAME_PREFIX}:cmp" ${CMAKE_COMMAND} -E compare_files ${REFERENCE} ${OUTPUT})
+	ADD_TEST("${NAME_PREFIX}:run" ${CMAKE_COMMAND} -P test-${NAME_PREFIX}.cmake)
+	ADD_TEST("${NAME_PREFIX}:cmp" ${CMAKE_COMMAND} -E compare_files ${REFERENCE} ${OUTPUT})
 ENDMACRO(RAPPER_TEST NAME_PREFIX COMMAND OUTPUT REFERENCE)
 
 INCLUDE(CMakeParseArguments)
@@ -388,25 +388,25 @@ FUNCTION(RAPPER_RDFDIFF_TEST TEST_NAME RAPPER_COMMAND RAPPER_OUTPUT RDFDIFF_COMM
     SET(EXPECT_FAILURE 0)
   ENDIF()
 
-    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test-${TEST_NAME}.cmake "
+	FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test-${TEST_NAME}.cmake "
 SET(rdfdiff_status -1)
 
 EXECUTE_PROCESS(
-    COMMAND ${RAPPER_COMMAND}
-    TIMEOUT 10
-    OUTPUT_FILE ${RAPPER_OUTPUT}
-    ERROR_QUIET
-    RESULT_VARIABLE rapper_status
+	COMMAND ${RAPPER_COMMAND}
+	TIMEOUT 10
+	OUTPUT_FILE ${RAPPER_OUTPUT}
+	ERROR_QUIET
+	RESULT_VARIABLE rapper_status
 )
 
 IF(rapper_status EQUAL 0 OR rapper_status EQUAL 2)
-    EXECUTE_PROCESS(
-        COMMAND ${RDFDIFF_COMMAND}
-        TIMEOUT 10
-        OUTPUT_QUIET
-        ERROR_QUIET
-        RESULT_VARIABLE rdfdiff_status
-    )
+	EXECUTE_PROCESS(
+		COMMAND ${RDFDIFF_COMMAND}
+		TIMEOUT 10
+		OUTPUT_QUIET
+		ERROR_QUIET
+		RESULT_VARIABLE rdfdiff_status
+	)
 ENDIF(rapper_status EQUAL 0 OR rapper_status EQUAL 2)
 
 IF(${EXPECT_FAILURE})
@@ -420,7 +420,7 @@ ELSE()
 ENDIF()
 ")
 
-    ADD_TEST(${TEST_NAME} ${CMAKE_COMMAND} -P test-${TEST_NAME}.cmake)
+	ADD_TEST(${TEST_NAME} ${CMAKE_COMMAND} -P test-${TEST_NAME}.cmake)
 ENDFUNCTION(RAPPER_RDFDIFF_TEST)
 
 SUBDIRS(tests/feeds)
@@ -431,6 +431,6 @@ SUBDIRS(tests/rdfa)
 SUBDIRS(tests/rdfa11)
 SUBDIRS(tests/rdfxml)
 SUBDIRS(tests/trig)
-#SUBDIRS(tests/turtle)    # TODO
+#SUBDIRS(tests/turtle)	# TODO
 
 # end raptor/CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 51a65b6c..26330a10 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,20 +7,20 @@
 #
 
 IF(RAPTOR_PARSER_RDFA)
-    INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/librdfa)
+	INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/librdfa)
 ENDIF(RAPTOR_PARSER_RDFA)
 
 # ** Parser sources **
 
 # XML parser enabled
 IF(RAPTOR_PARSER_RDFXML)
-    SET(raptor_parser_rdfxml_sources raptor_rdfxml.c)
-    SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
+	SET(raptor_parser_rdfxml_sources raptor_rdfxml.c)
+	SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
 ENDIF(RAPTOR_PARSER_RDFXML)
 
 # N triples parser enabled
 IF(RAPTOR_PARSER_NTRIPLES OR RAPTOR_PARSER_NQUADS)
-    SET(raptor_parser_ntriples_nquads_sources ntriples_parse.c raptor_ntriples.c)
+	SET(raptor_parser_ntriples_nquads_sources ntriples_parse.c raptor_ntriples.c)
 ENDIF(RAPTOR_PARSER_NTRIPLES OR RAPTOR_PARSER_NQUADS)
 
 # Turtle parser enabled
@@ -60,102 +60,102 @@ ENDIF(RAPTOR_PARSER_TURTLE OR RAPTOR_PARSER_TRIG)
 
 # RSS feed parser enabled
 IF(RAPTOR_PARSER_RSS OR RAPTOR_SERIALIZER_RSS_1_0)
-    SET(raptor_rss_common_sources raptor_rss_common.c raptor_rss.h)
+	SET(raptor_rss_common_sources raptor_rss_common.c raptor_rss.h)
 ENDIF(RAPTOR_PARSER_RSS OR RAPTOR_SERIALIZER_RSS_1_0)
 IF(RAPTOR_PARSER_RSS)
-    SET(raptor_parser_rss_sources raptor_rss.c)
-    SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
+	SET(raptor_parser_rss_sources raptor_rss.c)
+	SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
 ENDIF(RAPTOR_PARSER_RSS)
 
 # GRDDL parser enabled
 IF(RAPTOR_PARSER_GRDDL)
-    SET(raptor_parser_grddl_sources raptor_grddl.c)
-    SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
-    SET(raptor_libxslt_libs ${LIBXSLT_LIBRARIES})
+	SET(raptor_parser_grddl_sources raptor_grddl.c)
+	SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
+	SET(raptor_libxslt_libs ${LIBXSLT_LIBRARIES})
 ENDIF(RAPTOR_PARSER_GRDDL)
 
 # Guess which parser to use based on context
 IF(RAPTOR_PARSER_GUESS)
-    SET(raptor_parser_guess_sources raptor_guess.c)
+	SET(raptor_parser_guess_sources raptor_guess.c)
 ENDIF(RAPTOR_PARSER_GUESS)
 
 # RDFA parser enabled
 IF(RAPTOR_PARSER_RDFA)
-    SET(raptor_parser_rdfa_sources raptor_librdfa.c)
+	SET(raptor_parser_rdfa_sources raptor_librdfa.c)
 ENDIF(RAPTOR_PARSER_RDFA)
 
 # JSON parser enabled
 IF(RAPTOR_PARSER_JSON)
-    SET(raptor_parser_json_sources raptor_json.c)
+	SET(raptor_parser_json_sources raptor_json.c)
 ENDIF(RAPTOR_PARSER_JSON)
 
 # ** Serializers **
 
 IF(RAPTOR_SERIALIZER_RDFXML)
-    SET(raptor_serializer_rdfxml_sources raptor_serialize_rdfxml.c)
+	SET(raptor_serializer_rdfxml_sources raptor_serialize_rdfxml.c)
 ENDIF(RAPTOR_SERIALIZER_RDFXML)
 IF(RAPTOR_SERIALIZER_NTRIPLES OR RAPTOR_SERIALIZER_NQUADS)
-    SET(raptor_serializer_ntriples_nquads_sources raptor_serialize_ntriples.c)
+	SET(raptor_serializer_ntriples_nquads_sources raptor_serialize_ntriples.c)
 ENDIF(RAPTOR_SERIALIZER_NTRIPLES OR RAPTOR_SERIALIZER_NQUADS)
 IF(RAPTOR_SERIALIZER_RDFXML_ABBREV OR RAPTOR_SERIALIZER_TURTLE OR RAPTOR_SERIALIZER_MKR)
-    SET(raptor_serializer_abbrev_sources raptor_abbrev.c)
+	SET(raptor_serializer_abbrev_sources raptor_abbrev.c)
 ENDIF(RAPTOR_SERIALIZER_RDFXML_ABBREV OR RAPTOR_SERIALIZER_TURTLE OR RAPTOR_SERIALIZER_MKR)
 IF(RAPTOR_SERIALIZER_RDFXML_ABBREV)
-    SET(raptor_serializer_rdfxml_abbrev_sources raptor_serialize_rdfxmla.c)
+	SET(raptor_serializer_rdfxml_abbrev_sources raptor_serialize_rdfxmla.c)
 ENDIF(RAPTOR_SERIALIZER_RDFXML_ABBREV)
 IF(RAPTOR_SERIALIZER_TURTLE OR RAPTOR_SERIALIZER_MKR)
-    SET(raptor_serializer_turtle_sources raptor_serialize_turtle.c)
+	SET(raptor_serializer_turtle_sources raptor_serialize_turtle.c)
 ENDIF(RAPTOR_SERIALIZER_TURTLE OR RAPTOR_SERIALIZER_MKR)
 IF(RAPTOR_SERIALIZER_RSS_1_0)
-    SET(raptor_serializer_rss_1_0_sources raptor_serialize_rss.c)
+	SET(raptor_serializer_rss_1_0_sources raptor_serialize_rss.c)
 ENDIF(RAPTOR_SERIALIZER_RSS_1_0)
 IF(RAPTOR_SERIALIZER_DOT)
-    SET(raptor_serializer_dot_sources raptor_serialize_dot.c)
+	SET(raptor_serializer_dot_sources raptor_serialize_dot.c)
 ENDIF(RAPTOR_SERIALIZER_DOT)
 IF(RAPTOR_SERIALIZER_HTML)
-    SET(raptor_serializer_html_sources raptor_serialize_html.c)
+	SET(raptor_serializer_html_sources raptor_serialize_html.c)
 ENDIF(RAPTOR_SERIALIZER_HTML)
 IF(RAPTOR_SERIALIZER_JSON)
-    SET(raptor_serializer_json_sources raptor_serialize_json.c)
-    SET(raptor_yajl_libs ${YAJL_LIBRARIES})
+	SET(raptor_serializer_json_sources raptor_serialize_json.c)
+	SET(raptor_yajl_libs ${YAJL_LIBRARIES})
 ENDIF(RAPTOR_SERIALIZER_JSON)
 
 IF(RAPTOR_WWW STREQUAL "curl")
-    SET(raptor_www_sources raptor_www_curl.c)
-    SET(raptor_www_libs ${CURL_LIBRARIES})
+	SET(raptor_www_sources raptor_www_curl.c)
+	SET(raptor_www_libs ${CURL_LIBRARIES})
 ELSEIF(RAPTOR_WWW STREQUAL "fetch")
-    SET(raptor_www_sources raptor_www_libfetch.c)
-    #SET(raptor_www_libs ${FETCH_LIBRARIES})
+	SET(raptor_www_sources raptor_www_libfetch.c)
+	#SET(raptor_www_libs ${FETCH_LIBRARIES})
 ELSEIF(RAPTOR_WWW STREQUAL "xml")
-    SET(raptor_www_sources raptor_www_libxml.c)
-    SET(raptor_www_libs ${LIBXML2_LIBRARIES})
+	SET(raptor_www_sources raptor_www_libxml.c)
+	SET(raptor_www_libs ${LIBXML2_LIBRARIES})
 ENDIF(RAPTOR_WWW STREQUAL "curl")
 
 IF(RAPTOR_XML STREQUAL "libxml")
-    SET(raptor_libxml_sources raptor_libxml.c)
-    SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
+	SET(raptor_libxml_sources raptor_libxml.c)
+	SET(raptor_libxml_libs ${LIBXML2_LIBRARIES})
 ENDIF(RAPTOR_XML STREQUAL "libxml")
 IF(RAPTOR_PARSER_RDFA)
-    SET(raptor_librdfa_sources
-        ${CMAKE_SOURCE_DIR}/librdfa/context.c
-        ${CMAKE_SOURCE_DIR}/librdfa/curie.c
-        ${CMAKE_SOURCE_DIR}/librdfa/iri.c
-        ${CMAKE_SOURCE_DIR}/librdfa/language.c
-        ${CMAKE_SOURCE_DIR}/librdfa/lists.c
-        ${CMAKE_SOURCE_DIR}/librdfa/namespace.c
-        ${CMAKE_SOURCE_DIR}/librdfa/rdfa.c
-        ${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.c
-        ${CMAKE_SOURCE_DIR}/librdfa/strtok_r.c
-        ${CMAKE_SOURCE_DIR}/librdfa/subject.c
-        ${CMAKE_SOURCE_DIR}/librdfa/triple.c
-#        ${CMAKE_SOURCE_DIR}/librdfa/rdfa.h
-#        ${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.h
-#        ${CMAKE_SOURCE_DIR}/librdfa/strtok_r.h
-    )
+	SET(raptor_librdfa_sources
+		${CMAKE_SOURCE_DIR}/librdfa/context.c
+		${CMAKE_SOURCE_DIR}/librdfa/curie.c
+		${CMAKE_SOURCE_DIR}/librdfa/iri.c
+		${CMAKE_SOURCE_DIR}/librdfa/language.c
+		${CMAKE_SOURCE_DIR}/librdfa/lists.c
+		${CMAKE_SOURCE_DIR}/librdfa/namespace.c
+		${CMAKE_SOURCE_DIR}/librdfa/rdfa.c
+		${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.c
+		${CMAKE_SOURCE_DIR}/librdfa/strtok_r.c
+		${CMAKE_SOURCE_DIR}/librdfa/subject.c
+		${CMAKE_SOURCE_DIR}/librdfa/triple.c
+# 		${CMAKE_SOURCE_DIR}/librdfa/rdfa.h
+# 		${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.h
+# 		${CMAKE_SOURCE_DIR}/librdfa/strtok_r.h
+	)
 ENDIF(RAPTOR_PARSER_RDFA)
 
 IF(NOT HAVE_STRCASECMP AND NOT HAVE_STRICMP)
-    SET(raptor_strcasecmp_sources strcasecmp.c)
+	SET(raptor_strcasecmp_sources strcasecmp.c)
 ENDIF(NOT HAVE_STRCASECMP AND NOT HAVE_STRICMP)
 
 IF(RAPTOR_PARSEDATE)
@@ -174,66 +174,66 @@ IF(RAPTOR_PARSEDATE)
 ENDIF(RAPTOR_PARSEDATE)
 
 IF(BUILD_SHARED_LIBS)
-    SET(LIB_TYPE SHARED)
+	SET(LIB_TYPE SHARED)
 ELSE(BUILD_SHARED_LIBS)
-    SET(LIB_TYPE STATIC)
+	SET(LIB_TYPE STATIC)
 ENDIF(BUILD_SHARED_LIBS)
 
 ADD_LIBRARY(raptor2 ${LIB_TYPE}
-    raptor_avltree.c
-    raptor_concepts.c
-    raptor_escaped.c
-    raptor_general.c
-    raptor_iostream.c
-    raptor_json_writer.c
-    raptor_locator.c
-    raptor_log.c
-    raptor_memstr.c
-    raptor_namespace.c
-    raptor_option.c
-    raptor_parse.c
-    raptor_qname.c
-    raptor_rfc2396.c
-    raptor_sax2.c
-    raptor_sequence.c
-    raptor_serialize.c
-    raptor_set.c
-    raptor_statement.c
-    raptor_stringbuffer.c
-    raptor_syntax_description.c
-    raptor_term.c
-    raptor_turtle_writer.c
-    raptor_unicode.c
-    raptor_uri.c
-    raptor_www.c
-    raptor_xml.c
-    raptor_xml_writer.c
-    snprintf.c
-    sort_r.c
-    turtle_common.c
-    ${raptor_parser_rdfxml_sources}
-    ${raptor_parser_ntriples_nquads_sources}
-    ${raptor_parser_turtle_trig_sources}
-    ${raptor_rss_common_sources}
-    ${raptor_parser_rss_sources}
-    ${raptor_parser_grddl_sources}
-    ${raptor_parser_guess_sources}
-    ${raptor_parser_rdfa_sources}
-    ${raptor_parser_json_sources}
-    ${raptor_serializer_rdfxml_sources}
-    ${raptor_serializer_ntriples_nquads_sources}
-    ${raptor_serializer_abbrev_sources}
-    ${raptor_serializer_rdfxml_abbrev_sources}
-    ${raptor_serializer_turtle_sources}
-    ${raptor_serializer_rss_1_0_sources}
-    ${raptor_serializer_dot_sources}
-    ${raptor_serializer_html_sources}
-    ${raptor_serializer_json_sources}
-    ${raptor_www_sources}
-    ${raptor_libxml_sources}
-    ${raptor_librdfa_sources}
-    ${raptor_strcasecmp_sources}
-    ${raptor_parsedate_sources}
+	raptor_avltree.c
+	raptor_concepts.c
+	raptor_escaped.c
+	raptor_general.c
+	raptor_iostream.c
+	raptor_json_writer.c
+	raptor_locator.c
+	raptor_log.c
+	raptor_memstr.c
+	raptor_namespace.c
+	raptor_option.c
+	raptor_parse.c
+	raptor_qname.c
+	raptor_rfc2396.c
+	raptor_sax2.c
+	raptor_sequence.c
+	raptor_serialize.c
+	raptor_set.c
+	raptor_statement.c
+	raptor_stringbuffer.c
+	raptor_syntax_description.c
+	raptor_term.c
+	raptor_turtle_writer.c
+	raptor_unicode.c
+	raptor_uri.c
+	raptor_www.c
+	raptor_xml.c
+	raptor_xml_writer.c
+	snprintf.c
+	sort_r.c
+	turtle_common.c
+	${raptor_parser_rdfxml_sources}
+	${raptor_parser_ntriples_nquads_sources}
+	${raptor_parser_turtle_trig_sources}
+	${raptor_rss_common_sources}
+	${raptor_parser_rss_sources}
+	${raptor_parser_grddl_sources}
+	${raptor_parser_guess_sources}
+	${raptor_parser_rdfa_sources}
+	${raptor_parser_json_sources}
+	${raptor_serializer_rdfxml_sources}
+	${raptor_serializer_ntriples_nquads_sources}
+	${raptor_serializer_abbrev_sources}
+	${raptor_serializer_rdfxml_abbrev_sources}
+	${raptor_serializer_turtle_sources}
+	${raptor_serializer_rss_1_0_sources}
+	${raptor_serializer_dot_sources}
+	${raptor_serializer_html_sources}
+	${raptor_serializer_json_sources}
+	${raptor_www_sources}
+	${raptor_libxml_sources}
+	${raptor_librdfa_sources}
+	${raptor_strcasecmp_sources}
+	${raptor_parsedate_sources}
 )
 IF(RAPTOR_PARSER_TURTLE OR RAPTOR_PARSER_TRIG)
   add_dependencies(raptor2 turtle_parser_tgt turtle_lexer_tgt)
@@ -243,30 +243,30 @@ IF(RAPTOR_PARSEDATE)
 ENDIF()
 
 TARGET_LINK_LIBRARIES(raptor2
-    ${raptor_libxslt_libs}
-    ${raptor_libxml_libs}
-    ${raptor_yajl_libs}
-    ${raptor_www_libs}
+	${raptor_libxslt_libs}
+	${raptor_libxml_libs}
+	${raptor_yajl_libs}
+	${raptor_www_libs}
 )
 
 SET_TARGET_PROPERTIES(
-    raptor2
-    PROPERTIES
-    COMPILE_DEFINITIONS "LIBRDFA_IN_RAPTOR;RAPTOR_INTERNAL;${LIBXML2_DEFINITIONS};${LIBXSLT_DEFINITIONS}"
+	raptor2
+	PROPERTIES
+	COMPILE_DEFINITIONS "LIBRDFA_IN_RAPTOR;RAPTOR_INTERNAL;${LIBXML2_DEFINITIONS};${LIBXSLT_DEFINITIONS}"
 )
 
 ADD_EXECUTABLE(turtle_lexer_test turtle_lexer.c)
 TARGET_LINK_LIBRARIES(turtle_lexer_test raptor2)
 
 IF(NOT WIN32 OR NOT BUILD_SHARED_LIBS)
-    # This currently cannot be built on Windows with DLL linkage
-    ADD_EXECUTABLE(turtle_parser_test turtle_parser.c)
-    TARGET_LINK_LIBRARIES(turtle_parser_test raptor2)
-    SET_TARGET_PROPERTIES(
-        turtle_parser_test
-        PROPERTIES
-        COMPILE_DEFINITIONS "RAPTOR_INTERNAL;STANDALONE"
-    )
+	# This currently cannot be built on Windows with DLL linkage
+	ADD_EXECUTABLE(turtle_parser_test turtle_parser.c)
+	TARGET_LINK_LIBRARIES(turtle_parser_test raptor2)
+	SET_TARGET_PROPERTIES(
+		turtle_parser_test
+		PROPERTIES
+		COMPILE_DEFINITIONS "RAPTOR_INTERNAL;STANDALONE"
+	)
 ENDIF(NOT WIN32 OR NOT BUILD_SHARED_LIBS)
 
 ADD_EXECUTABLE(raptor_parse_test raptor_parse.c)
@@ -334,43 +334,43 @@ TARGET_LINK_LIBRARIES(raptor_sort_r_test raptor2)
 ADD_TEST(raptor_sort_r_test raptor_sort_r_test)
 
 SET_TARGET_PROPERTIES(
-    turtle_lexer_test
-    #turtle_parser_test
-    raptor_parse_test
-    raptor_rfc2396_test
-    raptor_uri_test
-    raptor_namespace_test
-    strcasecmp_test
-    raptor_www_test
-    raptor_sequence_test
-    raptor_stringbuffer_test
-    raptor_iostream_test
-    raptor_xml_writer_test
-    raptor_turtle_writer_test
-    raptor_avltree_test
-    raptor_term_test
-    raptor_permute_test
-    raptor_snprintf_test
-    raptor_sort_r_test
-    PROPERTIES
-    COMPILE_DEFINITIONS "RAPTOR_INTERNAL;STANDALONE"
+	turtle_lexer_test
+	#turtle_parser_test
+	raptor_parse_test
+	raptor_rfc2396_test
+	raptor_uri_test
+	raptor_namespace_test
+	strcasecmp_test
+	raptor_www_test
+	raptor_sequence_test
+	raptor_stringbuffer_test
+	raptor_iostream_test
+	raptor_xml_writer_test
+	raptor_turtle_writer_test
+	raptor_avltree_test
+	raptor_term_test
+	raptor_permute_test
+	raptor_snprintf_test
+	raptor_sort_r_test
+	PROPERTIES
+	COMPILE_DEFINITIONS "RAPTOR_INTERNAL;STANDALONE"
 )
 
 IF(RAPTOR_PARSER_RDFXML)
-    ADD_EXECUTABLE(raptor_set_test raptor_set.c)
-    TARGET_LINK_LIBRARIES(raptor_set_test raptor2)
-    ADD_TEST(raptor_set_test raptor_set_test)
-
-    ADD_EXECUTABLE(raptor_xml_test raptor_xml.c)
-    TARGET_LINK_LIBRARIES(raptor_xml_test raptor2)
-    ADD_TEST(raptor_xml_test raptor_xml_test)
-
-    SET_TARGET_PROPERTIES(
-        raptor_set_test
-        raptor_xml_test
-        PROPERTIES
-        COMPILE_DEFINITIONS "RAPTOR_INTERNAL;STANDALONE"
-    )
+	ADD_EXECUTABLE(raptor_set_test raptor_set.c)
+	TARGET_LINK_LIBRARIES(raptor_set_test raptor2)
+	ADD_TEST(raptor_set_test raptor_set_test)
+
+	ADD_EXECUTABLE(raptor_xml_test raptor_xml.c)
+	TARGET_LINK_LIBRARIES(raptor_xml_test raptor2)
+	ADD_TEST(raptor_xml_test raptor_xml_test)
+
+	SET_TARGET_PROPERTIES(
+		raptor_set_test
+		raptor_xml_test
+		PROPERTIES
+		COMPILE_DEFINITIONS "RAPTOR_INTERNAL;STANDALONE"
+	)
 ENDIF(RAPTOR_PARSER_RDFXML)
 
 # Generate pkg-config metadata file
@@ -390,22 +390,22 @@ Cflags: -I\${includedir}
 ")
 
 INSTALL(FILES
-    raptor.h
-    ${CMAKE_CURRENT_BINARY_DIR}/raptor2.h
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/raptor2
+	raptor.h
+	${CMAKE_CURRENT_BINARY_DIR}/raptor2.h
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/raptor2
 )
 
 INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/raptor2.pc
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+	${CMAKE_CURRENT_BINARY_DIR}/raptor2.pc
+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
 
 INSTALL(
-    TARGETS raptor2
-    EXPORT  Raptor2Config
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+	TARGETS raptor2
+	EXPORT  Raptor2Config
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
 INSTALL(EXPORT Raptor2Config DESTINATION  ${CMAKE_INSTALL_LIBDIR}/cmake)
-- 
cgit v1.2.1


From 58a4587967a57d4ed0a429ca03daf24f42ec01d3 Mon Sep 17 00:00:00 2001
From: mathvich <mathvich@gmail.com>
Date: Fri, 24 Dec 2021 23:02:16 +0300
Subject: [POS-5320] librdfa directory fix

---
 src/CMakeLists.txt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 26330a10..42f0552a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,7 @@
 #
 
 IF(RAPTOR_PARSER_RDFA)
-	INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/librdfa)
+	INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../librdfa)
 ENDIF(RAPTOR_PARSER_RDFA)
 
 # ** Parser sources **
@@ -137,17 +137,17 @@ IF(RAPTOR_XML STREQUAL "libxml")
 ENDIF(RAPTOR_XML STREQUAL "libxml")
 IF(RAPTOR_PARSER_RDFA)
 	SET(raptor_librdfa_sources
-		${CMAKE_SOURCE_DIR}/librdfa/context.c
-		${CMAKE_SOURCE_DIR}/librdfa/curie.c
-		${CMAKE_SOURCE_DIR}/librdfa/iri.c
-		${CMAKE_SOURCE_DIR}/librdfa/language.c
-		${CMAKE_SOURCE_DIR}/librdfa/lists.c
-		${CMAKE_SOURCE_DIR}/librdfa/namespace.c
-		${CMAKE_SOURCE_DIR}/librdfa/rdfa.c
-		${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.c
-		${CMAKE_SOURCE_DIR}/librdfa/strtok_r.c
-		${CMAKE_SOURCE_DIR}/librdfa/subject.c
-		${CMAKE_SOURCE_DIR}/librdfa/triple.c
+		context.c
+		curie.c
+		iri.c
+		language.c
+		lists.c
+		namespace.c
+		rdfa.c
+		rdfa_utils.c
+		strtok_r.c
+		subject.c
+		triple.c
 # 		${CMAKE_SOURCE_DIR}/librdfa/rdfa.h
 # 		${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.h
 # 		${CMAKE_SOURCE_DIR}/librdfa/strtok_r.h
-- 
cgit v1.2.1


From 22390c1daeaeb00febf46b41b8731d007f1e2d4e Mon Sep 17 00:00:00 2001
From: mathvich <mathvich@gmail.com>
Date: Fri, 24 Dec 2021 23:07:39 +0300
Subject: [POS-5230] directory fix

---
 src/CMakeLists.txt | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 42f0552a..77e17990 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -137,17 +137,17 @@ IF(RAPTOR_XML STREQUAL "libxml")
 ENDIF(RAPTOR_XML STREQUAL "libxml")
 IF(RAPTOR_PARSER_RDFA)
 	SET(raptor_librdfa_sources
-		context.c
-		curie.c
-		iri.c
-		language.c
-		lists.c
-		namespace.c
-		rdfa.c
-		rdfa_utils.c
-		strtok_r.c
-		subject.c
-		triple.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/context.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/curie.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/iri.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/language.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/lists.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/namespace.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/rdfa.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/rdfa_utils.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/strtok_r.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/subject.c
+		${CMAKE_CURRENT_SOURCE_DIR}/../librdfa/triple.c
 # 		${CMAKE_SOURCE_DIR}/librdfa/rdfa.h
 # 		${CMAKE_SOURCE_DIR}/librdfa/rdfa_utils.h
 # 		${CMAKE_SOURCE_DIR}/librdfa/strtok_r.h
-- 
cgit v1.2.1