From c7ac24a85e3927f14fed7996f61deef4b51d88a3 Mon Sep 17 00:00:00 2001 From: mathvich 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 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 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