diff --git a/CMake/PackageDepends/MITK_Redland_Config.cmake b/CMake/PackageDepends/MITK_Redland_Config.cmake deleted file mode 100644 index ef3916d081..0000000000 --- a/CMake/PackageDepends/MITK_Redland_Config.cmake +++ /dev/null @@ -1,2 +0,0 @@ -list(APPEND ALL_INCLUDE_DIRECTORIES ${Redland_INCLUDE_DIR}) -list(APPEND ALL_LIBRARIES rdf) diff --git a/CMakeExternals/ExternalProjectList.cmake b/CMakeExternals/ExternalProjectList.cmake index 69a55fd803..69fe058787 100644 --- a/CMakeExternals/ExternalProjectList.cmake +++ b/CMakeExternals/ExternalProjectList.cmake @@ -1,42 +1,39 @@ mitkFunctionAddExternalProject(NAME Poco ON COMPONENTS Foundation Net Util XML Zip) mitkFunctionAddExternalProject(NAME DCMTK ON DOC "EXPERIMENTAL, superbuild only: Use DCMTK in MITK") mitkFunctionAddExternalProject(NAME OpenIGTLink OFF) mitkFunctionAddExternalProject(NAME tinyxml ON ADVANCED) mitkFunctionAddExternalProject(NAME GDCM ON ADVANCED) -mitkFunctionAddExternalProject(NAME Raptor2 OFF ADVANCED) mitkFunctionAddExternalProject(NAME Eigen ON ADVANCED DOC "Use the Eigen library") mitkFunctionAddExternalProject(NAME ANN ON ADVANCED DOC "Use Approximate Nearest Neighbor Library") mitkFunctionAddExternalProject(NAME CppUnit ON ADVANCED DOC "Use CppUnit for unit tests") mitkFunctionAddExternalProject(NAME PCRE OFF ADVANCED NO_PACKAGE) mitkFunctionAddExternalProject(NAME HDF5 ON ADVANCED) mitkFunctionAddExternalProject(NAME OpenMP ON) # ----------------------------------------- # The following external projects must be # ordered according to their # inter-dependencies mitkFunctionAddExternalProject(NAME SWIG OFF ADVANCED NO_PACKAGE DEPENDS PCRE) mitkFunctionAddExternalProject(NAME Python OFF) mitkFunctionAddExternalProject(NAME OpenCV OFF) mitkFunctionAddExternalProject(NAME Vigra OFF DEPENDS HDF5) # These are "hard" dependencies and always set to ON mitkFunctionAddExternalProject(NAME ITK ON NO_CACHE DEPENDS HDF5) mitkFunctionAddExternalProject(NAME VTK ON NO_CACHE) mitkFunctionAddExternalProject(NAME Boost ON NO_CACHE) mitkFunctionAddExternalProject(NAME ZLIB OFF ADVANCED) mitkFunctionAddExternalProject(NAME cpprestsdk OFF DEPENDS Boost ZLIB ADVANCED) mitkFunctionAddExternalProject(NAME ACVD OFF DOC "Use Approximated Centroidal Voronoi Diagrams") mitkFunctionAddExternalProject(NAME CTK ON DEPENDS Qt5 DCMTK DOC "Use CTK in MITK") -mitkFunctionAddExternalProject(NAME Rasqal OFF DEPENDS Raptor2 PCRE ADVANCED) -mitkFunctionAddExternalProject(NAME Redland OFF DEPENDS Rasqal DOC "Use the Redland RDF library") mitkFunctionAddExternalProject(NAME DCMQI ON DEPENDS DCMTK ITK DOC "Use dcmqi in MITK") mitkFunctionAddExternalProject(NAME MatchPoint OFF ADVANCED DEPENDS ITK DOC "Use the MatchPoint translation image registration library") if(MITK_USE_Qt5) mitkFunctionAddExternalProject(NAME Qwt ON ADVANCED DEPENDS Qt5) endif() diff --git a/CMakeExternals/Raptor2-2.0.15.patch b/CMakeExternals/Raptor2-2.0.15.patch deleted file mode 100644 index baede38078..0000000000 --- a/CMakeExternals/Raptor2-2.0.15.patch +++ /dev/null @@ -1,493 +0,0 @@ -diff -urNb raptor2-2.0.15-orig/CMakeLists.txt raptor2-2.0.15-patched/CMakeLists.txt ---- raptor2-2.0.15-orig/CMakeLists.txt 2014-11-26 00:11:12.836343793 +0100 -+++ raptor2-2.0.15-patched/CMakeLists.txt 2014-11-20 01:16:40.168582633 +0100 -@@ -30,12 +30,24 @@ - FIND_PACKAGE(LibXslt) - #FIND_PACKAGE(YAJL) - --INCLUDE_DIRECTORIES( -+IF(CURL_FOUND) -+ INCLUDE_DIRECTORIES( - ${CURL_INCLUDE_DIRS} -+ ) -+ENDIF() -+ -+IF(LIBXML2_FOUND) -+ INCLUDE_DIRECTORIES( - ${EXPAT_INCLUDE_DIRS} - ${LIBXML2_INCLUDE_DIR} -+ ) -+ENDIF() -+ -+IF(LIBXSLT_FOUND) -+ INCLUDE_DIRECTORIES( - ${LIBXSLT_INCLUDE_DIR} --) -+ ) -+ENDIF() - - ################################################################ - -@@ -89,6 +101,15 @@ - CHECK_TYPE_SIZE("unsigned long" SIZEOF_UNSIGNED_LONG) - CHECK_TYPE_SIZE("unsigned long long" SIZEOF_UNSIGNED_LONG_LONG) - -+CHECK_C_SOURCE_COMPILES(" -+int main() {char *function_name = __func__; return 0;}" -+ HAVE___FUNC__ -+) -+CHECK_C_SOURCE_COMPILES(" -+int main() {char *function_name = __FUNCTION__; return 0;}" -+ HAVE___FUNCTION__ -+) -+ - IF(LIBXML2_FOUND) - - SET(CMAKE_REQUIRED_INCLUDES ${LIBXML2_INCLUDE_DIR}) -@@ -152,103 +173,142 @@ - SET(BUILD_SHARED_LIBS OFF CACHE BOOL - "Build shared libraries instead of static ones.") - -+SET(RAPTOR_ENABLE_TESTING TRUE CACHE BOOL -+ "Enable unit tests") -+ - IF(BUILD_SHARED_LIBS) - SET(RAPTOR_STATIC FALSE) - ELSE(BUILD_SHARED_LIBS) - SET(RAPTOR_STATIC TRUE) - ENDIF(BUILD_SHARED_LIBS) - --SET(RAPTOR_XML_INIT none) --IF(LIBXML2_FOUND) -- 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\").") -+SET(HAVE_RAPTOR_PARSE_DATE 1) -+SET(RAPTOR_PARSEDATE 1) - --SET(RAPTOR_XML_DEFINE RAPTOR_XML_NONE) --IF(RAPTOR_XML STREQUAL "libxml") -- SET(RAPTOR_XML_DEFINE RAPTOR_XML_LIBXML) --ENDIF(RAPTOR_XML STREQUAL "libxml") -+# --------------- XML library ---------------- - --SET(RAPTOR_WWW_INIT none) --IF(LIBXML2_FOUND) -- SET(RAPTOR_WWW_INIT xml) --ENDIF(LIBXML2_FOUND) --IF(CURL_FOUND) -- SET(RAPTOR_WWW_INIT curl) --ENDIF(CURL_FOUND) -+set(RAPTOR_XML_INIT none) -+if(LIBXML2_FOUND) -+ set(RAPTOR_XML_INIT libxml) -+endif() - --SET(RAPTOR_WWW ${RAPTOR_WWW_INIT} CACHE STRING -- "Which WWW library to use (any of \"curl\", \"xml\", \"none\").") -+set(RAPTOR_XML ${RAPTOR_XML_INIT} CACHE STRING -+ "Which XML library to use (any of \"libxml\", \"none\").") - --SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_NONE) --IF(RAPTOR_WWW STREQUAL "curl") -- SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_LIBCURL) --ELSEIF(RAPTOR_WWW STREQUAL "xml") -- SET(RAPTOR_WWW_DEFINE RAPTOR_WWW_LIBXML) --ENDIF(RAPTOR_WWW STREQUAL "curl") -+set(RAPTOR_XML_DEFINE RAPTOR_XML_NONE) -+if(RAPTOR_XML STREQUAL "libxml") -+ set(RAPTOR_XML_DEFINE RAPTOR_XML_LIBXML) -+endif() - --SET(RAPTOR_XML_1_1 FALSE CACHE BOOL -+set(RAPTOR_XML_1_1 FALSE CACHE BOOL - "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) --ENDIF(LIBXML2_FOUND) -+# --------------- WWW library ---------------- - --SET(RAPTOR_PARSER_GRDDL_INIT FALSE) --IF(LIBXML2_FOUND AND LIBXSLT_FOUND) -- 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.") --SET(RAPTOR_PARSER_NTRIPLES TRUE -- CACHE BOOL "Build N-Triples parser.") --SET(RAPTOR_PARSER_TURTLE TRUE -- CACHE BOOL "Build Turtle parser.") --SET(RAPTOR_PARSER_TRIG TRUE -- CACHE BOOL "Build TRiG parser.") --SET(RAPTOR_PARSER_RSS ${LIBXML2_FOUND} -- CACHE BOOL "Build RSS Tag Soup parser.") --SET(RAPTOR_PARSER_GRDDL ${RAPTOR_PARSER_GRDDL_INIT} -- CACHE BOOL "Build GRDDL parser.") --SET(RAPTOR_PARSER_GUESS TRUE -- CACHE BOOL "Build guess parser.") --SET(RAPTOR_PARSER_RDFA ${LIBXML2_FOUND} -- CACHE BOOL "Build RDFA parser.") --SET(RAPTOR_PARSER_JSON ${YAJL_FOUND} -- CACHE BOOL "Build JSON parser.") --SET(RAPTOR_PARSER_NQUADS TRUE -- CACHE BOOL "Build N-Quads parser.") -- --SET(RAPTOR_SERIALIZER_RDFXML TRUE -- CACHE BOOL "Build RDF/XML serializer.") --SET(RAPTOR_SERIALIZER_NTRIPLES TRUE -- CACHE BOOL "Build N-Triples serializer.") --SET(RAPTOR_SERIALIZER_RDFXML_ABBREV TRUE -- CACHE BOOL "Build RDF/XML-abbreviated serializer.") --SET(RAPTOR_SERIALIZER_TURTLE TRUE -- CACHE BOOL "Build Turtle serializer.") --SET(RAPTOR_SERIALIZER_RSS_1_0 TRUE -- CACHE BOOL "Build RSS 1.0 serializer.") --SET(RAPTOR_SERIALIZER_ATOM TRUE -- CACHE BOOL "Build Atom 1.0 serializer.") --SET(RAPTOR_SERIALIZER_DOT TRUE -- CACHE BOOL "Build GraphViz DOT serializer.") --SET(RAPTOR_SERIALIZER_HTML TRUE -- CACHE BOOL "Build HTML Table serializer.") --SET(RAPTOR_SERIALIZER_JSON TRUE -- CACHE BOOL "Build JSON serializer.") --SET(RAPTOR_SERIALIZER_NQUADS TRUE -- CACHE BOOL "Build N-Quads serializer.") -+set(RAPTOR_WWW_INIT none) -+if(LIBXML2_FOUND) -+ set(RAPTOR_WWW_INIT xml) -+endif() -+if(CURL_FOUND) -+ set(RAPTOR_WWW_INIT curl) -+endif() -+if(FETCH_FOUND) -+ set(RAPTOR_WWW_INIT fetch) -+endif() -+ -+set(RAPTOR_WWW ${RAPTOR_WWW_INIT} CACHE STRING -+ "Which WWW library to use (any of \"curl\", \"xml\", \"fetch\", \"none\").") -+ -+set(RAPTOR_WWW_DEFINE RAPTOR_WWW_NONE) -+if(RAPTOR_WWW STREQUAL "curl") -+ set(RAPTOR_WWW_DEFINE RAPTOR_WWW_LIBCURL) -+elseif(RAPTOR_WWW STREQUAL "xml") -+ set(RAPTOR_WWW_DEFINE RAPTOR_WWW_LIBXML) -+elseif(RAPTOR_WWW STREQUAL "fetch") -+ set(RAPTOR_WWW_DEFINE RAPTOR_WWW_FETCH) -+endif() -+ -+if(RAPTOR_WWW STREQUAL "none") -+ message(WARNING "No WWW library in use - only file: URLs will work") -+ message(WARNING "Install libcurl, libxml2 or BSD libfetch for WWW access") -+endif() -+ -+# --------------- RDF parsers ---------------- -+ -+set(rdf_parsers_available ntriples turtle trig guess nquads) -+set(rdfxml_name "RDF/XML") -+set(ntriples_name "N-Triples") -+set(turtle_name "Turtle") -+set(trig_name "TRiG") -+set(guess_name "guess") -+set(rss_name "RSS Tag Soup") -+set(rdfa_name "RDFA") -+set(nquads_name "N-Quads") -+set(grddl_name "GRDDL") -+set(json_name "JSON") -+ -+if(LIBXML2_FOUND) -+ list(APPEND rdf_parsers_available rdfxml rss rdfa grddl) -+endif() -+if(YAJL_FOUND) -+ list(APPEND rdf_parsers_available json) -+endif() -+ -+set(RAPTOR_PARSER_RDFXML_INIT ${LIBXML2_FOUND}) -+ -+set(RAPTOR_PARSER_GRDDL_INIT FALSE) -+if(LIBXML2_FOUND AND LIBXSLT_FOUND) -+ set(RAPTOR_PARSER_GRDDL_INIT TRUE) -+endif() -+ -+set(rdf_parsers_enabled ) -+foreach(parser ${rdf_parsers_available}) -+ string(TOUPPER ${parser} parser_uc) -+ if(DEFINED RAPTOR_PARSER_${parser_uc}_INIT) -+ set(parser_init ${RAPTOR_PARSER_${parser_uc}_INIT}) -+ else() -+ set(parser_init TRUE) -+ endif() -+ set(RAPTOR_PARSER_${parser_uc} ${parser_init} -+ CACHE BOOL "Build ${${parser}_name} parser.") -+ if(RAPTOR_PARSER_${parser_uc}) -+ list(APPEND rdf_parsers_enabled ${parser}) -+ endif() -+endforeach() -+ -+# --------------- RDF serializers ---------------- -+ -+set(rdf_serializers_available rdfxml rdfxml-abbrev turtle ntriples rss-1.0 dot html json atom nquads) -+set(rdfxml-abbrev_name "RDF/XML-abbreviated") -+set(rss-1.0_name "RSS 1.0") -+set(dot_name "GraphViz DOT") -+set(html_name "HTML Table") -+set(atom_name "Atom 1.0") -+ -+set(rdf_serializers_enabled ) -+foreach(serializer ${rdf_serializers_available}) -+ string(TOUPPER ${serializer} serializer_uc) -+ string(REGEX REPLACE "[-\\.]" "_" serializer_uc ${serializer_uc}) -+ set(RAPTOR_SERIALIZER_${serializer_uc} TRUE -+ CACHE BOOL "Build ${${serializer}_name} serializer.") -+ if(RAPTOR_SERIALIZER_${serializer_uc}) -+ list(APPEND rdf_serializers_enabled ${serializer}) -+ endif() -+endforeach() -+ -+# --------------- NFC library ---------------- -+ -+set(use_nfc FALSE) -+if(RAPTOR_PARSER_RDFXML AND LIBXML2_FOUND) -+ set(use_nfc TRUE) -+endif() -+# TODO -+set(nfc_library none) - - ################################################################ - -+INCLUDE(CMakePackageConfigHelpers) -+ - CONFIGURE_FILE( - src/raptor_config_cmake.h.in - src/raptor_config.h -@@ -263,6 +323,11 @@ - @ONLY - ) - -+set(INCLUDE_INSTALL_DIR include/raptor2) -+set(LIB_INSTALL_DIR lib) -+set(BIN_INSTALL_DIR bin) -+set(CMAKE_INSTALL_DIR lib/raptor2/cmake) -+ - # On Windows, the test/utility programs usually have DLL dependencies that - # make them cumbersome to invoke within IDE environments, so we enable the - # test suite only when makefiles are being used. -@@ -273,13 +338,30 @@ - # - # but we don't have a good way of knowing where the third-party DLLs are. - # --IF(CMAKE_GENERATOR MATCHES "Makefiles") -+IF(RAPTOR_ENABLE_TESTING AND CMAKE_GENERATOR MATCHES "Makefiles") - ENABLE_TESTING() --ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") -+ENDIF(RAPTOR_ENABLE_TESTING AND CMAKE_GENERATOR MATCHES "Makefiles") - - SUBDIRS(src) - SUBDIRS(utils) - -+configure_package_config_file(Raptor2Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Raptor2Config.cmake -+ INSTALL_DESTINATION ${CMAKE_INSTALL_DIR} -+ PATH_VARS INCLUDE_INSTALL_DIR -+ NO_CHECK_REQUIRED_COMPONENTS_MACRO -+) -+ -+write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/Raptor2ConfigVersion.cmake -+ VERSION ${VERSION} -+ COMPATIBILITY AnyNewerVersion -+) -+ -+install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/Raptor2Config.cmake -+ ${CMAKE_CURRENT_BINARY_DIR}/Raptor2ConfigVersion.cmake -+ DESTINATION ${CMAKE_INSTALL_DIR} -+) -+ - ################################################################ - - FIND_PROGRAM(JING jing) -@@ -335,21 +417,33 @@ - ENDIF(rapper_status EQUAL 0 OR rapper_status EQUAL 2) - - IF(NOT rdfdiff_status EQUAL 0) -- MESSAGE(FATAL_ERROR "Test failed.") -+ MESSAGE(FATAL_ERROR \"Test failed.\") - ENDIF(NOT rdfdiff_status EQUAL 0) - ") - - ADD_TEST(${NAME} ${CMAKE_COMMAND} -P test-${NAME}.cmake) - ENDMACRO(RAPPER_RDFDIFF_TEST NAME RAPPER_COMMAND RAPPER_OUTPUT RDFDIFF_COMMAND) - --SUBDIRS(tests/feeds) --SUBDIRS(tests/grddl) --SUBDIRS(tests/json) --SUBDIRS(tests/ntriples) --SUBDIRS(tests/rdfa) --SUBDIRS(tests/rdfa11) --SUBDIRS(tests/rdfxml) --SUBDIRS(tests/trig) --#SUBDIRS(tests/turtle) # TODO -+IF(RAPTOR_ENABLE_TESTING) -+ SUBDIRS(tests/feeds) -+ SUBDIRS(tests/grddl) -+ SUBDIRS(tests/json) -+ SUBDIRS(tests/ntriples) -+ SUBDIRS(tests/rdfa) -+ SUBDIRS(tests/rdfa11) -+ SUBDIRS(tests/rdfxml) -+ SUBDIRS(tests/trig) -+ #SUBDIRS(tests/turtle) # TODO -+ENDIF(RAPTOR_ENABLE_TESTING) -+ -+message("Raptor build summary: -+ RDF parsers available : ${rdf_parsers_available} -+ RDF parsers enabled : ${rdf_parsers_enabled} -+ RDF serializers available : ${rdf_serializers_available} -+ RDF serializers enabled : ${rdf_serializers_enabled} -+ XML parser : ${RAPTOR_XML} -+ WWW library : ${RAPTOR_WWW} -+ NFC check library : ${nfc_library}" -+) - - # end raptor/CMakeLists.txt -diff -urNb raptor2-2.0.15-orig/Raptor2Config.cmake.in raptor2-2.0.15-patched/Raptor2Config.cmake.in ---- raptor2-2.0.15-orig/Raptor2Config.cmake.in 1970-01-01 01:00:00.000000000 +0100 -+++ raptor2-2.0.15-patched/Raptor2Config.cmake.in 2014-11-17 02:26:45.384582192 +0100 -@@ -0,0 +1,9 @@ -+set(Raptor2_VERSION @VERSION@) -+ -+@PACKAGE_INIT@ -+ -+set_and_check(Raptor2_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") -+ -+if(NOT TARGET raptor2 AND EXISTS ${CMAKE_CURRENT_LIST_DIR}/Raptor2Targets.cmake) -+ include(${CMAKE_CURRENT_LIST_DIR}/Raptor2Targets.cmake) -+endif() -diff -urNb raptor2-2.0.15-orig/src/CMakeLists.txt raptor2-2.0.15-patched/src/CMakeLists.txt ---- raptor2-2.0.15-orig/src/CMakeLists.txt 2014-11-26 00:11:12.844343793 +0100 -+++ raptor2-2.0.15-patched/src/CMakeLists.txt 2014-11-18 01:23:15.200582940 +0100 -@@ -118,6 +118,7 @@ - ADD_LIBRARY(raptor2 - raptor_avltree.c - raptor_concepts.c -+ raptor_escaped.c - raptor_general.c - raptor_iostream.c - raptor_json_writer.c -@@ -125,6 +126,7 @@ - raptor_log.c - raptor_memstr.c - raptor_namespace.c -+ raptor_ntriples.c - raptor_option.c - raptor_parse.c - raptor_qname.c -@@ -144,6 +146,9 @@ - raptor_xml.c - raptor_xml_writer.c - snprintf.c -+ sort_r.c -+ sort_r.h -+ ssort.h - turtle_common.c - ${raptor_parser_rdfxml_sources} - ${raptor_parser_ntriples_nquads_sources} -@@ -183,6 +188,8 @@ - COMPILE_DEFINITIONS "LIBRDFA_IN_RAPTOR;RAPTOR_INTERNAL;${LIBXML2_DEFINITIONS};${LIBXSLT_DEFINITIONS}" - ) - -+IF(RAPTOR_ENABLE_TESTING) -+ - ADD_EXECUTABLE(turtle_lexer_test turtle_lexer.c) - TARGET_LINK_LIBRARIES(turtle_lexer_test raptor2) - -@@ -291,13 +298,15 @@ - ) - ENDIF(RAPTOR_PARSER_RDFXML) - -+ENDIF(RAPTOR_ENABLE_TESTING) -+ - # Generate pkg-config metadata file - # - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/raptor2.pc - "prefix=${CMAKE_INSTALL_PREFIX} - exec_prefix=\${prefix} --libdir=\${exec_prefix}/lib --includedir=\${prefix}/include/raptor2 -+libdir=\${exec_prefix}/${LIB_INSTALL_DIR} -+includedir=\${prefix}/${INCLUDE_INSTALL_DIR} - - Name: Raptor RDF Parsing Library - Description: RDF Parser Toolkit Library -@@ -310,22 +319,22 @@ - INSTALL(FILES - raptor.h - ${CMAKE_CURRENT_BINARY_DIR}/raptor2.h -- DESTINATION include/raptor2 -+ DESTINATION ${INCLUDE_INSTALL_DIR} - ) - - INSTALL(FILES - ${CMAKE_CURRENT_BINARY_DIR}/raptor2.pc -- DESTINATION lib/pkgconfig -+ DESTINATION ${LIB_INSTALL_DIR}/pkgconfig - ) - - INSTALL( - TARGETS raptor2 -- EXPORT Raptor2Config -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib -- RUNTIME DESTINATION bin -+ EXPORT Raptor2Targets -+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} -+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} -+ RUNTIME DESTINATION ${BIN_INSTALL_DIR} - ) - --INSTALL(EXPORT Raptor2Config DESTINATION lib/cmake) -+INSTALL(EXPORT Raptor2Targets DESTINATION ${CMAKE_INSTALL_DIR}) - - # end raptor/src/CMakeLists.txt -diff -urNb raptor2-2.0.15-orig/src/raptor_config_cmake.h.in raptor2-2.0.15-patched/src/raptor_config_cmake.h.in ---- raptor2-2.0.15-orig/src/raptor_config_cmake.h.in 2014-11-26 00:11:12.848343793 +0100 -+++ raptor2-2.0.15-patched/src/raptor_config_cmake.h.in 2014-11-16 22:17:24.896583977 +0100 -@@ -44,6 +44,9 @@ - #define SIZEOF_UNSIGNED_LONG @SIZEOF_UNSIGNED_LONG@ - #define SIZEOF_UNSIGNED_LONG_LONG @SIZEOF_UNSIGNED_LONG_LONG@ - -+#cmakedefine HAVE___FUNC__ -+#cmakedefine HAVE___FUNCTION__ -+ - #cmakedefine HAVE_XMLCTXTUSEOPTIONS - #cmakedefine HAVE_XMLSAX2INTERNALSUBSET - #cmakedefine RAPTOR_LIBXML_ENTITY_ETYPE -@@ -87,8 +90,9 @@ - # define _CRT_SECURE_NO_DEPRECATE - - # ifdef _MSC_VER --# if _MSC_VER >= 1300 -+# if (_MSC_VER >= 1300) && !defined(__func__) - # define __func__ __FUNCTION__ -+# define HAVE___FUNC__ - # else - /* better than nothing */ - # define raptor_str(s) #s -@@ -126,6 +130,11 @@ - /* These prevent parsedate.c from declaring malloc() and free() */ - # define YYMALLOC malloc - # define YYFREE free -+ -+# if !defined(YY_NO_UNISTD_H) -+# define YY_NO_UNISTD_H -+# endif -+ - #endif - - /* end raptor_config.h */ diff --git a/CMakeExternals/Raptor2.cmake b/CMakeExternals/Raptor2.cmake deleted file mode 100644 index 5fed212c3e..0000000000 --- a/CMakeExternals/Raptor2.cmake +++ /dev/null @@ -1,72 +0,0 @@ -#----------------------------------------------------------------------------- -# raptor2 -#----------------------------------------------------------------------------- - -if(MITK_USE_Raptor2) - -# Sanity checks -if(DEFINED Raptor2_DIR AND NOT EXISTS ${Raptor2_DIR}) - message(FATAL_ERROR "Raptor2_DIR variable is defined but corresponds to non-existing directory") -endif() - -set(proj Raptor2) -set(proj_DEPENDENCIES ) -set(${proj}_DEPENDS ${proj}) - -if(NOT DEFINED Raptor2_DIR) - - set(additional_cmake_args ) - if(CTEST_USE_LAUNCHERS) - list(APPEND additional_cmake_args - "-DCMAKE_PROJECT_${proj}_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake" - ) - endif() - - ExternalProject_Add(${proj} - LIST_SEPARATOR ${sep} - URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/raptor2-2.0.15.tar.gz - URL_MD5 a39f6c07ddb20d7dd2ff1f95fa21e2cd - PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/Raptor2-2.0.15.patch - CMAKE_GENERATOR ${gen} - CMAKE_GENERATOR_PLATFORM ${gen_platform} - CMAKE_ARGS - ${ep_common_args} - ${additional_cmake_args} - -DRAPTOR_ENABLE_TESTING:BOOL=OFF - -DRAPTOR_PARSER_GRDDL:BOOL=OFF - -DRAPTOR_PARSER_GUESS:BOOL=OFF - -DRAPTOR_PARSER_JSON:BOOL=OFF - -DRAPTOR_PARSER_NQUADS:BOOL=ON - -DRAPTOR_PARSER_NTRIPLES:BOOL=ON - -DRAPTOR_PARSER_RDFA:BOOL=OFF - -DRAPTOR_PARSER_RDFXML:BOOL=OFF - -DRAPTOR_PARSER_RSS:BOOL=OFF - -DRAPTOR_PARSER_TRIG:BOOL=OFF - -DRAPTOR_PARSER_TURTLE:BOOL=ON - -DRAPTOR_SERIALIZER_ATOM:BOOL=OFF - -DRAPTOR_SERIALIZER_DOT:BOOL=OFF - -DRAPTOR_SERIALIZER_HTML:BOOL=OFF - -DRAPTOR_SERIALIZER_JSON:BOOL=OFF - -DRAPTOR_SERIALIZER_NQUADS:BOOL=ON - -DRAPTOR_SERIALIZER_NTRIPLES:BOOL=ON - -DRAPTOR_SERIALIZER_RDFXML:BOOL=OFF - -DRAPTOR_SERIALIZER_RDFXML_ABBREV:BOOL=OFF - -DRAPTOR_SERIALIZER_RSS_1_0:BOOL=OFF - -DRAPTOR_SERIALIZER_TURTLE:BOOL=ON - CMAKE_CACHE_ARGS - ${ep_common_cache_args} - CMAKE_CACHE_DEFAULT_ARGS - ${ep_common_cache_default_args} - DEPENDS ${proj_DEPENDENCIES} - ) - - set(${proj}_DIR ${ep_prefix}/lib/raptor2/cmake) - mitkFunctionInstallExternalCMakeProject(${proj}) - -else() - - mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") - -endif() - -endif() diff --git a/CMakeExternals/Rasqal-0.9.32.patch b/CMakeExternals/Rasqal-0.9.32.patch deleted file mode 100644 index c4e568d3d1..0000000000 --- a/CMakeExternals/Rasqal-0.9.32.patch +++ /dev/null @@ -1,1017 +0,0 @@ -diff -urNb rasqal-0.9.32-orig/CMakeLists.txt rasqal-0.9.32-patched/CMakeLists.txt ---- rasqal-0.9.32-orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ rasqal-0.9.32-patched/CMakeLists.txt 2014-11-26 03:43:49.708342271 +0100 -@@ -0,0 +1,395 @@ -+# rasqal/CMakeLists.txt -+# -+# This file allows building rasqal with the CMake configuration tool. -+# Download CMake in source or binary form from http://www.cmake.org/ -+# -+# Based on the CMakeLists.txt file from Raptor. -+# This file is in the public domain. -+# -+ -+set(RASQAL_VERSION_MAJOR 0) -+set(RASQAL_VERSION_MINOR 9) -+set(RASQAL_VERSION_RELEASE 32) -+set(RASQAL_MIN_VERSION_DECIMAL 00932) -+ -+set(VERSION "${RASQAL_VERSION_MAJOR}.${RASQAL_VERSION_MINOR}.${RASQAL_VERSION_RELEASE}") -+math(EXPR RASQAL_VERSION_DECIMAL "${RASQAL_VERSION_MAJOR} * 10000 + ${RASQAL_VERSION_MINOR} * 100 + ${RASQAL_VERSION_RELEASE}") -+ -+project(rasqal C) -+ -+cmake_minimum_required(VERSION 2.8.9) -+ -+set(CMAKE_include_CURRENT_DIR 1) -+ -+set(PROJECT_DESCRIPTION "Rasqal RDF Query Library") -+ -+################################################################ -+ -+# Third-party libraries -+ -+set(RAPTOR_MIN_VERSION 2.0.7) -+find_package(Raptor2 ${RAPTOR_MIN_VERSION} REQUIRED) -+include_directories(${Raptor2_INCLUDE_DIR}) -+ -+find_package(LibXml2) -+ -+if(LIBXML2_FOUND) -+ include_directories( -+ ${EXPAT_include_DIRS} -+ ${LIBXML2_include_DIR} -+ ) -+endif() -+ -+################################################################ -+ -+# Configuration checks -+ -+include(CheckIncludeFile) -+include(CheckIncludeFiles) -+include(CheckFunctionExists) -+include(CheckTypeSize) -+include(CheckStructHasMember) -+include(CheckCSourceCompiles) -+ -+check_include_file(dlfcn.h HAVE_DLFCN_H) -+check_include_file(errno.h HAVE_ERRNO_H) -+check_include_file(stddef.h HAVE_STDDEF_H) -+check_include_file(stdlib.h HAVE_STDLIB_H) -+check_include_file(stdint.h HAVE_STDINT_H) -+check_include_file(unistd.h HAVE_UNISTD_H) -+check_include_file(string.h HAVE_STRING_H) -+check_include_file(strings.h HAVE_STRINGS_H) -+check_include_file(getopt.h HAVE_GETOPT_H) -+check_include_file(regex.h HAVE_REGEX_H) -+check_include_file(uuid/uuid.h HAVE_UUID_UUID_H) -+ -+check_include_file(sys/time.h HAVE_SYS_TIME_H) -+check_include_file(time.h HAVE_TIME_H) -+CHECK_include_FILES("sys/time.h;time.h" TIME_WITH_SYS_TIME) -+ -+# Make sure these variables are set to a specific value -+# because they are substituted in rasqal.h.in -+if(NOT HAVE_SYS_TIME_H) -+ set(HAVE_SYS_TIME_H 0) -+endif() -+if(NOT HAVE_TIME_H) -+ set(HAVE_TIME_H 0) -+endif() -+ -+check_include_file(math.h HAVE_MATH_H) -+check_include_file(limits.h HAVE_LIMITS_H) -+check_include_file(float.h HAVE_FLOAT_H) -+check_include_file(memory.h HAVE_MEMORY_H) -+check_include_file(sys/stat.h HAVE_SYS_STAT_H) -+check_include_file(sys/types.h HAVE_SYS_TYPES_H) -+check_include_file(inttypes.h HAVE_INTTYPES_H) -+ -+if(LIBXML2_FOUND) -+ check_include_file(libxml/xmlschemas.h HAVE_LIBXML_XMLSCHEMAS_H) -+ check_include_file(libxml/xmlschemastypes.h HAVE_LIBXML_XMLSCHEMASTYPES_H) -+ check_include_file(libxml/schemasInternals.h HAVE_LIBXML_SCHEMASINTERNALS_H) -+endif() -+ -+CHECK_FUNCTION_EXISTS(access HAVE_ACCESS) -+CHECK_FUNCTION_EXISTS(_access HAVE__ACCESS) -+CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT) -+CHECK_FUNCTION_EXISTS(getopt_long HAVE_GETOPT_LONG) -+CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) -+CHECK_FUNCTION_EXISTS(getmtime_r HAVE_GETMTIME_R) -+CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF) -+CHECK_FUNCTION_EXISTS(_snprintf HAVE__SNPRINTF) -+CHECK_FUNCTION_EXISTS(initstate HAVE_INITSTATE) -+CHECK_FUNCTION_EXISTS(initstate_r HAVE_INITSTATE_R) -+CHECK_FUNCTION_EXISTS(rand HAVE_RAND) -+CHECK_FUNCTION_EXISTS(random HAVE_RANDOM) -+CHECK_FUNCTION_EXISTS(random_r HAVE_RANDOM_R) -+CHECK_FUNCTION_EXISTS(rand_r HAVE_RAND_R) -+CHECK_FUNCTION_EXISTS(srand HAVE_SRAND) -+CHECK_FUNCTION_EXISTS(strcasecmp HAVE_STRCASECMP) -+CHECK_FUNCTION_EXISTS(stricmp HAVE_STRICMP) -+CHECK_FUNCTION_EXISTS(_stricmp HAVE__STRICMP) -+CHECK_FUNCTION_EXISTS(strnicmp HAVE_STRNICMP) -+CHECK_FUNCTION_EXISTS(_strnicmp HAVE__STRNICMP) -+CHECK_FUNCTION_EXISTS(timegm HAVE_TIMEGM) -+CHECK_FUNCTION_EXISTS(vasprintf HAVE_VASPRINTF) -+CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF) -+CHECK_FUNCTION_EXISTS(_vsnprintf HAVE__VSNPRINTF) -+ -+CHECK_C_SOURCE_COMPILES(" -+\#include -+int main() {struct tm x; x.tm_gmtoff = 0; return 0;}" -+ HAVE_TM_GMTOFF -+) -+ -+CHECK_C_SOURCE_COMPILES(" -+int main() {char *function_name = __func__; return 0;}" -+ HAVE___FUNC__ -+) -+CHECK_C_SOURCE_COMPILES(" -+int main() {char *function_name = __FUNCTION__; return 0;}" -+ HAVE___FUNCTION__ -+) -+ -+CHECK_C_SOURCE_COMPILES(" -+\#include -+\#include -+int main() {regex_t reg; char *pat=\"abc\"; regcomp(®, pat, 0); return 0;}" -+ HAVE_REGEX_POSIX -+) -+ -+find_library(PCRE_LIBRARY_DEBUG NAMES libpcred libpcre pcred pcre) -+find_library(PCRE_LIBRARY_RELEASE NAMES libpcre pcre) -+find_path(PCRE_INCLUDE_DIR pcre.h) -+if((PCRE_LIBRARY_DEBUG OR PCRE_LIBRARY_RELEASE) AND PCRE_INCLUDE_DIR) -+ set(HAVE_REGEX_PCRE 1) -+ set(PCRE_LIBRARY ) -+ if(PCRE_LIBRARY_DEBUG) -+ list(APPEND PCRE_LIBRARY debug ${PCRE_LIBRARY_DEBUG}) -+ endif() -+ if(PCRE_LIBRARY_RELEASE) -+ list(APPEND PCRE_LIBRARY optimized ${PCRE_LIBRARY_RELEASE}) -+ endif() -+endif() -+ -+################################################################ -+ -+# User-configurable options -+# -+# (Note: The CMake GUI displays these in alphabetical order, regardless of -+# the order we use here) -+ -+set(BUILD_SHARED_LIBS OFF CACHE BOOL -+ "Build shared libraries instead of static ones.") -+ -+#set(RASQAL_ENABLE_TESTING TRUE CACHE BOOL -+# "Enable unit tests") -+ -+if(BUILD_SHARED_LIBS) -+ set(RASQAL_STATIC FALSE) -+else() -+ set(RASQAL_STATIC TRUE) -+endif() -+ -+# ----------------------- REGEX library ----------------------- -+ -+set(RASQAL_REGEX_INIT none) -+if(HAVE_REGEX_POSIX) -+ set(RASQAL_REGEX_INIT posix) -+elseif(PCRE_LIBRARY) -+ set(RASQAL_REGEX_INIT pcre) -+endif() -+ -+set(RASQAL_REGEX ${RASQAL_REGEX_INIT} CACHE STRING -+ "Which regular expression library to use (any of \"posix\", \"pcre\", \"none\").") -+ -+set(RASQAL_REGEX_LIBRARY ) -+if(RASQAL_REGEX STREQUAL "none") -+ set(RASQAL_REGEX_NONE 1) -+ set(RASQAL_REGEX_POSIX 0) -+ set(RASQAL_REGEX_PCRE 0) -+elseif(RASQAL_REGEX STREQUAL "posix") -+ set(RASQAL_REGEX_NONE 0) -+ set(RASQAL_REGEX_POSIX 1) -+ set(RASQAL_REGEX_PCRE 0) -+elseif(RASQAL_REGEX STREQUAL "pcre") -+ set(RASQAL_REGEX_NONE 0) -+ set(RASQAL_REGEX_POSIX 0) -+ set(RASQAL_REGEX_PCRE 1) -+ set(RASQAL_REGEX_LIBRARY ${PCRE_LIBRARY}) -+ include_directories(${PCRE_INCLUDE_DIR}) -+else() -+ set(RASQAL_REGEX_NONE 0) -+ set(RASQAL_REGEX_POSIX 0) -+ set(RASQAL_REGEX_PCRE 0) -+endif() -+ -+# ----------------------- Decimal number library ----------------------- -+ -+set(RASQAL_DECIMAL_INIT none) -+ -+set(RASQAL_DECIMAL ${RASQAL_DECIMAL_INIT} CACHE STRING -+ "Which decimal number library to use (any of \"gmp\", \"mpfr\", \"none\").") -+ -+if(RASQAL_DECIMAL STREQUAL "none") -+ set(RASQAL_DECIMAL_NONE 1) -+ set(RASQAL_DECIMAL_GMP 0) -+ set(RASQAL_DECIMAL_MPFR 0) -+elseif(RASQAL_DECIMAL STREQUAL "gmp") -+ set(RASQAL_DECIMAL_NONE 0) -+ set(RASQAL_DECIMAL_GMP 1) -+ set(RASQAL_DECIMAL_MPFR 0) -+elseif(RASQAL_DECIMAL STREQUAL "mpfr") -+ set(RASQAL_DECIMAL_NONE 0) -+ set(RASQAL_DECIMAL_GMP 0) -+ set(RASQAL_DECIMAL_MPFR 1) -+ELSE() -+ set(RASQAL_DECIMAL_NONE 0) -+ set(RASQAL_DECIMAL_GMP 0) -+ set(RASQAL_DECIMAL_MPFR 0) -+endif() -+ -+# ----------------------- Digest library ----------------------- -+ -+set(RASQAL_DIGEST_INIT internal) -+ -+set(RASQAL_DIGEST ${RASQAL_DIGEST_INIT} CACHE STRING -+ "Which message digest library to use (any of \"gcrypt\", \"internal\", \"mhash\", \"none\").") -+ -+if(RASQAL_DIGEST STREQUAL "none") -+ set(RASQAL_DIGEST_NONE 1) -+ set(RASQAL_DIGEST_GCRYPT 0) -+ set(RASQAL_DIGEST_INTERNAL 0) -+ set(RASQAL_DIGEST_MHASH 0) -+elseif(RASQAL_DIGEST STREQUAL "gcrypt") -+ set(RASQAL_DIGEST_NONE 0) -+ set(RASQAL_DIGEST_GCRYPT 1) -+ set(RASQAL_DIGEST_INTERNAL 0) -+ set(RASQAL_DIGEST_MHASH 0) -+elseif(RASQAL_DIGEST STREQUAL "internal") -+ set(RASQAL_DIGEST_NONE 0) -+ set(RASQAL_DIGEST_GCRYPT 0) -+ set(RASQAL_DIGEST_INTERNAL 1) -+ set(RASQAL_DIGEST_MHASH 0) -+elseif(RASQAL_DIGEST STREQUAL "mhash") -+ set(RASQAL_DIGEST_NONE 0) -+ set(RASQAL_DIGEST_GCRYPT 0) -+ set(RASQAL_DIGEST_INTERNAL 0) -+ set(RASQAL_DIGEST_MHASH 1) -+else() -+ set(RASQAL_DIGEST_NONE 0) -+ set(RASQAL_DIGEST_GCRYPT 0) -+ set(RASQAL_DIGEST_INTERNAL 0) -+ set(RASQAL_DIGEST_MHASH 0) -+endif() -+ -+# ----------------------- uuid library ----------------------- -+ -+set(RASQAL_UUID_INIT internal) -+ -+set(RASQAL_UUID ${RASQAL_UUID_INIT} CACHE STRING -+ "Which uuid library to use (any of \"internal\", \"libc\", \"libuuid\", \"none\").") -+ -+if(RASQAL_UUID STREQUAL "none") -+ set(RASQAL_UUID_NONE 1) -+ set(RASQAL_UUID_LIBC 0) -+ set(RASQAL_UUID_INTERNAL 0) -+ set(RASQAL_UUID_LIBUUID 0) -+elseif(RASQAL_UUID STREQUAL "libc") -+ set(RASQAL_UUID_NONE 0) -+ set(RASQAL_UUID_LIBC 1) -+ set(RASQAL_UUID_INTERNAL 0) -+ set(RASQAL_UUID_LIBUUID 0) -+elseif(RASQAL_UUID STREQUAL "internal") -+ set(RASQAL_UUID_NONE 0) -+ set(RASQAL_UUID_LIBC 0) -+ set(RASQAL_UUID_INTERNAL 1) -+ set(RASQAL_UUID_LIBUUID 0) -+elseif(RASQAL_UUID STREQUAL "libuuid") -+ set(RASQAL_UUID_NONE 0) -+ set(RASQAL_UUID_LIBC 0) -+ set(RASQAL_UUID_INTERNAL 0) -+ set(RASQAL_UUID_LIBUUID 1) -+else() -+ set(RASQAL_UUID_NONE 0) -+ set(RASQAL_UUID_LIBC 0) -+ set(RASQAL_UUID_INTERNAL 0) -+ set(RASQAL_UUID_LIBUUID 0) -+endif() -+ -+# ----------------------- random number generator ----------------------- -+ -+set(RASQAL_RANDOM_ALGO_INIT rand) -+ -+set(RASQAL_RANDOM_ALGO ${RASQAL_RANDOM_ALGO_INIT} CACHE STRING -+ "Which random number generator to use (any of \"gmp_rand\", \"mtwist\", \"rand\", \"random\", \"random_r\", \"rand_r\").") -+ -+set(RANDOM_ALGO_GMP_RAND 0) -+set(RANDOM_ALGO_MTWIST 0) -+set(RANDOM_ALGO_RAND 0) -+set(RANDOM_ALGO_RANDOM 0) -+set(RANDOM_ALGO_RANDOM_R 0) -+set(RANDOM_ALGO_RAND_R 0) -+ -+string(TOUPPER ${RASQAL_RANDOM_ALGO} _random_algo_uc) -+set(RANDOM_ALGO_${_random_algo_uc} 1) -+ -+# ----------------------- Query language ----------------------- -+ -+set(RASQAL_QUERY_INIT all) -+ -+set(RASQAL_QUERY ${RASQAL_QUERY_INIT} CACHE STRING -+ "Which query languages to enable (semi-colon separated list of \"sparql\", \"laqrs\", or just \"all\").") -+ -+set(_query_languages SPARQL LAQRS) -+set(_query_lang_default 0) -+list(FIND RASQAL_QUERY all _result) -+if(NOT _result EQUAL -1) -+ set(_query_lang_default 1) -+endif() -+foreach(_lang ${_query_languages}) -+ set(RASQAL_QUERY_${_lang} ${_query_lang_default}) -+ string(TOLOWER ${_lang} _lang_lc) -+ list(FIND RASQAL_QUERY ${_lang_lc} _result) -+ if(NOT _result EQUAL -1) -+ set(RASQAL_QUERY_${_lang} 1) -+ endif() -+endforeach() -+ -+ -+################################################################ -+ -+include(CMakePackageConfigHelpers) -+ -+configure_file( -+ src/rasqal_config_cmake.h.in -+ src/rasqal_config.h -+ @ONLY -+) -+ -+add_definitions(-DHAVE_CONFIG_H) -+ -+configure_file( -+ src/rasqal.h.in -+ src/rasqal.h -+ @ONLY -+) -+ -+set(INCLUDE_INSTALL_DIR include/rasqal) -+set(LIB_INSTALL_DIR lib) -+set(BIN_INSTALL_DIR bin) -+set(CMAKE_INSTALL_DIR lib/rasqal/cmake) -+ -+add_subdirectory(libsv) -+add_subdirectory(src) -+#SUBDIRS(utils) -+ -+configure_package_config_file(RasqalConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/RasqalConfig.cmake -+ INSTALL_DESTINATION ${CMAKE_INSTALL_DIR} -+ PATH_VARS INCLUDE_INSTALL_DIR -+ NO_CHECK_REQUIRED_COMPONENTS_MACRO -+) -+ -+write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/RasqalConfigVersion.cmake -+ VERSION ${VERSION} -+ COMPATIBILITY AnyNewerVersion -+) -+ -+install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/RasqalConfig.cmake -+ ${CMAKE_CURRENT_BINARY_DIR}/RasqalConfigVersion.cmake -+ DESTINATION ${CMAKE_INSTALL_DIR} -+) -+ -+ -+message("Rasqal configuration: -+ RDF query languages available : ${_query_languages} -+ RDF query languages enabled : ${RASQAL_QUERY} -+ Raptor version : ${Raptor2_VERSION} -+ Decimal library : ${RASQAL_DECIMAL} -+ Regex library : ${RASQAL_REGEX} -+ Message digest library : ${RASQAL_DIGEST} -+ UUID library : ${RASQAL_UUID} -+ Random approach : ${RASQAL_RANDOM_ALGO}" -+) -+ -+# end rasqal/CMakeLists.txt -diff -urNb rasqal-0.9.32-orig/libsv/CMakeLists.txt rasqal-0.9.32-patched/libsv/CMakeLists.txt ---- rasqal-0.9.32-orig/libsv/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ rasqal-0.9.32-patched/libsv/CMakeLists.txt 2014-11-26 00:50:20.188343513 +0100 -@@ -0,0 +1,12 @@ -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src) -+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../src) -+ -+add_library(sv STATIC sv.c sv.h) -+ -+set_target_properties( -+ sv -+ PROPERTIES -+ COMPILE_DEFINITIONS "SV_CONFIG" -+ POSITION_INDEPENDENT_CODE ON -+) -diff -urNb rasqal-0.9.32-orig/RasqalConfig.cmake.in rasqal-0.9.32-patched/RasqalConfig.cmake.in ---- rasqal-0.9.32-orig/RasqalConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 -+++ rasqal-0.9.32-patched/RasqalConfig.cmake.in 2014-11-17 02:35:41.080582128 +0100 -@@ -0,0 +1,9 @@ -+set(Rasqal_VERSION @VERSION@) -+ -+@PACKAGE_INIT@ -+ -+set_and_check(Rasqal_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") -+ -+if(NOT TARGET rasqal AND EXISTS ${CMAKE_CURRENT_LIST_DIR}/RasqalTargets.cmake) -+ include(${CMAKE_CURRENT_LIST_DIR}/RasqalTargets.cmake) -+endif() -diff -urNb rasqal-0.9.32-orig/src/CMakeLists.txt rasqal-0.9.32-patched/src/CMakeLists.txt ---- rasqal-0.9.32-orig/src/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ rasqal-0.9.32-patched/src/CMakeLists.txt 2014-11-26 01:52:37.032343067 +0100 -@@ -0,0 +1,159 @@ -+# rasqal/src/CMakeLists.txt -+# -+# Based on the src/CMakeLists.txt file from Raptor -+# This file is in the public domain. -+# -+ -+set(rasqal_srcs -+ rasqal_algebra.c -+ rasqal_bindings.c -+ rasqal_data_graph.c -+ rasqal_dataset.c -+ rasqal_datetime.c -+ rasqal_decimal.c -+ rasqal_digest.c -+ rasqal_double.c -+ rasqal_engine_algebra.c -+ rasqal_engine.c -+ rasqal_engine_sort.c -+ rasqal_expr.c -+ rasqal_expr_datetimes.c -+ rasqal_expr_evaluate.c -+ rasqal_expr_numerics.c -+ rasqal_expr_strings.c -+ rasqal_feature.c -+ rasqal_format_html.c -+ rasqal_format_json.c -+ rasqal_format_rdf.c -+ rasqal_format_sparql_xml.c -+ rasqal_format_sv.c -+ rasqal_format_table.c -+ rasqal_formula.c -+ rasqal_general.c -+ rasqal_graph_pattern.c -+ rasqal_iostream.c -+ rasqal_literal.c -+ rasqal_map.c -+ rasqal_ntriples.c -+ rasqal_prefix.c -+ rasqal_projection.c -+ rasqal_query.c -+ rasqal_query_results.c -+ rasqal_query_transform.c -+ rasqal_query_write.c -+ rasqal_random.c -+ rasqal_raptor.c -+ rasqal_regex.c -+ rasqal_result_formats.c -+ rasqal_row.c -+ rasqal_row_compatible.c -+ rasqal_rowsource_aggregation.c -+ rasqal_rowsource_assignment.c -+ rasqal_rowsource_bindings.c -+ rasqal_rowsource.c -+ rasqal_rowsource_distinct.c -+ rasqal_rowsource_empty.c -+ rasqal_rowsource_filter.c -+ rasqal_rowsource_graph.c -+ rasqal_rowsource_groupby.c -+ rasqal_rowsource_having.c -+ rasqal_rowsource_join.c -+ rasqal_rowsource_project.c -+ rasqal_rowsource_rowsequence.c -+ rasqal_rowsource_service.c -+ rasqal_rowsource_slice.c -+ rasqal_rowsource_sort.c -+ rasqal_rowsource_triples.c -+ rasqal_rowsource_union.c -+ rasqal_service.c -+ rasqal_solution_modifier.c -+ rasqal_triple.c -+ rasqal_triples_source.c -+ rasqal_update.c -+ rasqal_variable.c -+ rasqal_xsd_datatypes.c -+ snprintf.c -+) -+ -+if(RASQAL_QUERY_SPARQL) -+ list(APPEND rasqal_srcs -+ sparql_lexer.c -+ sparql_lexer.h -+ sparql_parser.c -+ sparql_parser.h -+ sparql_common.h -+ ) -+endif() -+ -+if(NOT HAVE_STRCASECMP AND NOT HAVE_STRICMP) -+ list(APPEND rasqal_srcs strcasecmp.c) -+endif() -+ -+if(NOT HAVE_TIMEGM) -+ list(APPEND rasqal_srcs timegm.c) -+endif() -+ -+if(NOT HAVE_GETTIMEOFDAY) -+ list(APPEND rasqal_srcs gettimeofday.c) -+endif() -+ -+if(RASQAL_DIGEST_INTERNAL) -+ list(APPEND rasqal_srcs -+ rasqal_digest_md5.c -+ rasqal_digest_sha1.c -+ ) -+endif() -+ -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -+include_directories(${CMAKE_CURRENT_BINARY_DIR}) -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libsv) -+add_library(rasqal ${rasqal_srcs}) -+ -+target_link_libraries(rasqal LINK_PRIVATE sv ${RASQAL_REGEX_LIBRARY}) -+target_link_libraries(rasqal LINK_PUBLIC raptor2) -+ -+set_target_properties( -+ rasqal -+ PROPERTIES -+ COMPILE_DEFINITIONS "RASQAL_INTERNAL;SV_CONFIG" #;${LIBXML2_DEFINITIONS};${LIBXSLT_DEFINITIONS}" -+) -+ -+# Generate pkg-config metadata file -+# -+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/rasqal.pc -+"prefix=${CMAKE_INSTALL_PREFIX} -+exec_prefix=\${prefix} -+libdir=\${exec_prefix}/${LIB_INSTALL_DIR} -+includedir=\${prefix}/${INCLUDE_INSTALL_DIR} -+ -+have_raptor2_api=1 -+ -+Name: ${PROJECT_DESCRIPTION} -+Description: Rasqal RDF Query parsing and execution library -+Requires: raptor2 >= ${RAPTOR_MIN_VERSION} -+Version: ${VERSION} -+Libs: -L\${libdir} -lrasqal -+Cflags: -I\${includedir} -+") -+ -+install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/rasqal.h -+ DESTINATION ${INCLUDE_INSTALL_DIR} -+) -+ -+install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/rasqal.pc -+ DESTINATION ${LIB_INSTALL_DIR}/pkgconfig -+) -+ -+install( -+ TARGETS rasqal -+ EXPORT RasqalTargets -+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} -+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} -+ RUNTIME DESTINATION ${BIN_INSTALL_DIR} -+) -+ -+install(EXPORT RasqalTargets DESTINATION ${CMAKE_INSTALL_DIR}) -+ -+# end rasqal/src/CMakeLists.txt -diff -urNb rasqal-0.9.32-orig/src/gettimeofday.c rasqal-0.9.32-patched/src/gettimeofday.c ---- rasqal-0.9.32-orig/src/gettimeofday.c 2011-08-22 23:20:56.000000000 +0200 -+++ rasqal-0.9.32-patched/src/gettimeofday.c 2014-11-19 03:53:51.512582102 +0100 -@@ -7,7 +7,7 @@ - */ - - #ifdef WIN32 --#include -+#include - - #include - #include -diff -urNb rasqal-0.9.32-orig/src/rasqal_config_cmake.h.in rasqal-0.9.32-patched/src/rasqal_config_cmake.h.in ---- rasqal-0.9.32-orig/src/rasqal_config_cmake.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ rasqal-0.9.32-patched/src/rasqal_config_cmake.h.in 2014-11-19 04:56:07.408581656 +0100 -@@ -0,0 +1,340 @@ -+/* rasqal_config.h */ -+ -+#ifndef RASQAL_CONFIG_H -+ -+/* Release version as a decimal */ -+#define RASQAL_VERSION_DECIMAL @RASQAL_VERSION_DECIMAL@ -+ -+/* Major version number */ -+#define RASQAL_VERSION_MAJOR @RASQAL_VERSION_MAJOR@ -+ -+/* Minor version number */ -+#define RASQAL_VERSION_MINOR @RASQAL_VERSION_MINOR@ -+ -+/* Release version number */ -+#define RASQAL_VERSION_RELEASE @RASQAL_VERSION_RELEASE@ -+ -+/* ---------- package information ------------ */ -+ -+/* Name of package */ -+#define PACKAGE "@PROJECT_NAME@" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "http://bugs.librdf.org/" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "@PROJECT_DESCRIPTION@" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "@PROJECT_DESCRIPTION@ @VERSION@" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "@PROJECT_NAME@" -+ -+/* Define to the home page for this package. */ -+#define PACKAGE_URL "" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "@VERSION@" -+ -+/* Version number of package */ -+#define VERSION "@VERSION@" -+ -+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most -+ significant byte first (like Motorola and SPARC, unlike Intel). */ -+#if defined AC_APPLE_UNIVERSAL_BUILD -+# if defined __BIG_ENDIAN__ -+# define WORDS_BIGENDIAN 1 -+# endif -+#else -+# ifndef WORDS_BIGENDIAN -+# undef WORDS_BIGENDIAN -+# endif -+#endif -+ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. */ -+#cmakedefine LT_OBJDIR -+ -+/* ------------ header availability --------------- */ -+ -+#cmakedefine HAVE_DLFCN_H -+#cmakedefine HAVE_ERRNO_H -+#cmakedefine HAVE_STDDEF_H -+#cmakedefine HAVE_STDLIB_H -+#cmakedefine HAVE_STDINT_H -+#cmakedefine HAVE_UNISTD_H -+#cmakedefine HAVE_STRING_H -+#cmakedefine HAVE_STRINGS_H -+#cmakedefine HAVE_GETOPT_H -+#cmakedefine HAVE_REGEX_H -+#cmakedefine HAVE_UUID_UUID_H -+ -+#cmakedefine HAVE_SYS_TIME_H -+#cmakedefine HAVE_TIME_H -+ -+#cmakedefine HAVE_MATH_H -+#cmakedefine HAVE_LIMITS_H -+#cmakedefine HAVE_FLOAT_H -+#cmakedefine HAVE_MEMORY_H -+#cmakedefine HAVE_SYS_STAT_H -+#cmakedefine HAVE_SYS_TYPES_H -+#cmakedefine HAVE_INTTYPES_H -+ -+#cmakedefine HAVE_MHASH_H -+#cmakedefine HAVE_MPFR_H -+#cmakedefine HAVE_GCRYPT_H -+#cmakedefine HAVE_GMP_H -+ -+#cmakedefine HAVE_LIBXML_SCHEMASINTERNALS_H -+#cmakedefine HAVE_LIBXML_XMLSCHEMASTYPES_H -+#cmakedefine HAVE_LIBXML_XMLSCHEMAS_H -+ -+ -+/* --------- feature availability ------------ */ -+ -+#cmakedefine HAVE_GMP_VERSION -+ -+#cmakedefine HAVE_REGEX_PCRE -+#cmakedefine HAVE_REGEX_POSIX -+ -+/* need 'extern int optind' declaration? */ -+#cmakedefine NEED_OPTIND_DECLARATION -+ -+/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -+#cmakedefine NO_MINUS_C_MINUS_O -+ -+/* Use GMP gmp_randseed_ui() and mpz_urandomm() */ -+#cmakedefine RANDOM_ALGO_GMP_RAND -+ -+/* Use internal Mersenne Twister */ -+#cmakedefine RANDOM_ALGO_MTWIST -+ -+/* Use POSIX srand() and rand() */ -+#cmakedefine RANDOM_ALGO_RAND -+ -+/* Use BSD initstate() and random() */ -+#cmakedefine RANDOM_ALGO_RANDOM -+ -+/* Use glibc initstate_r() and random_r() */ -+#cmakedefine RANDOM_ALGO_RANDOM_R -+ -+/* Use POSIX rand_r() */ -+#cmakedefine RANDOM_ALGO_RAND_R -+ -+/* Decimal from GNU MP library */ -+#cmakedefine RASQAL_DECIMAL_GMP -+ -+/* Decimal from MPFR library */ -+#cmakedefine RASQAL_DECIMAL_MPFR -+ -+/* Decimal without a library */ -+#cmakedefine RASQAL_DECIMAL_NONE -+ -+/* Use gcrypt library for message digests */ -+#cmakedefine RASQAL_DIGEST_GCRYPT -+ -+/* Use internal routines for message digests */ -+#cmakedefine RASQAL_DIGEST_INTERNAL -+ -+/* Use mhash library for message digests */ -+#cmakedefine RASQAL_DIGEST_MHASH -+ -+/* Use no message digest library */ -+#cmakedefine RASQAL_DIGEST_NONE -+ -+/* Building LAQRS query */ -+#cmakedefine RASQAL_QUERY_LAQRS -+ -+/* Building SPARQL query */ -+#cmakedefine RASQAL_QUERY_SPARQL -+ -+/* Use no regex library */ -+#cmakedefine RASQAL_REGEX_NONE -+ -+/* Use PCRE regex library */ -+#cmakedefine RASQAL_REGEX_PCRE -+ -+/* Use POSIX regex library */ -+#cmakedefine RASQAL_REGEX_POSIX -+ -+/* Use internal routines for UUID */ -+#cmakedefine RASQAL_UUID_INTERNAL -+ -+/* Use UUID in libc library for UUID */ -+#cmakedefine RASQAL_UUID_LIBC -+ -+/* Use libuuid library for UUID */ -+#cmakedefine RASQAL_UUID_LIBUUID -+ -+/* Use no UUID library */ -+#cmakedefine RASQAL_UUID_NONE -+ -+/* Use OSSP library for UUID */ -+#cmakedefine RASQAL_UUID_OSSP -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#cmakedefine STDC_HEADERS -+ -+/* Define to 1 if you can safely include both and . */ -+#cmakedefine TIME_WITH_SYS_TIME -+ -+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a -+ `char[]'. */ -+#cmakedefine YYTEXT_POINTER -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+// #cmakedefine const -+ -+/* --------- function availability ----------- */ -+ -+#cmakedefine HAVE_ACCESS -+#cmakedefine HAVE__ACCESS -+#cmakedefine HAVE_GETOPT -+#cmakedefine HAVE_GETOPT_LONG -+#cmakedefine HAVE_GETTIMEOFDAY -+#cmakedefine HAVE_GMTIME_R -+#cmakedefine HAVE_SNPRINTF -+#cmakedefine HAVE__SNPRINTF -+#cmakedefine HAVE_INITSTATE -+#cmakedefine HAVE_INITSTATE_R -+#cmakedefine HAVE_RAND -+#cmakedefine HAVE_RANDOM -+#cmakedefine HAVE_RANDOM_R -+#cmakedefine HAVE_RAND_R -+#cmakedefine HAVE_SRAND -+#cmakedefine HAVE_STRCASECMP -+#cmakedefine HAVE_STRICMP -+#cmakedefine HAVE__STRICMP -+#cmakedefine HAVE_STRNICMP -+#cmakedefine HAVE__STRNICMP -+#cmakedefine HAVE_TIMEGM -+#cmakedefine HAVE_VASPRINTF -+#cmakedefine HAVE_VSNPRINTF -+#cmakedefine HAVE__VSNPRINTF -+ -+/* struct tm has tm_gmtoff field */ -+#cmakedefine HAVE_TM_GMTOFF -+#cmakedefine HAVE___FUNC__ -+ -+ -+/* --------- WIN32 config ----------- */ -+ -+#ifdef WIN32 -+ -+# ifdef __cplusplus -+ extern "C" { -+# endif -+ -+# define WIN32_LEAN_AND_MEAN 1 -+# define _CRT_NONSTDC_NO_DEPRECATE -+# define _CRT_SECURE_NO_DEPRECATE -+# include -+ -+ /* MS names for these functions */ -+ // next line breaks build on wntmsci12 -+ //#define vsnprintf _vsnprintf -+# if !defined(HAVE_SNPRINTF) && defined(HAVE__SNPRINTF) -+# define snprintf _snprintf -+# endif -+# if !defined(HAVE_STRICMP) && defined(HAVE__STRICMP) -+# define stricmp _stricmp -+# endif -+# if !defined(HAVE_STRNICMP) && defined(HAVE__STRNICMP) -+# define strnicmp _strnicmp -+# endif -+ -+ /* definition from winsock2.h */ -+# ifndef _TIMEVAL_DEFINED -+# define _TIMEVAL_DEFINED -+ typedef struct timeval { -+ long tv_sec; -+ long tv_usec; -+ } timeval; -+# endif -+ -+# ifndef _TIMEZONE_DEFINED -+# define _TIMEZONE_DEFINED -+ struct timezone -+ { -+ int tz_minuteswest; /* minutes West of Greenwich */ -+ int tz_dsttime; /* type of dst correction */ -+ }; -+# endif -+ -+# ifndef HAVE_GETTIMEOFDAY -+ int rasqal_gettimeofday(struct timeval *tv, struct timezone *tz); -+# endif -+ -+# include -+# define isnan(n) _isnan(n) -+# ifdef _MSC_VER -+# if (_MSC_VER < 1800) -+# define round(x) floor(x+0.5) -+# endif -+# endif -+ -+ /* These are SPARQL token definitions */ -+# ifdef OPTIONAL -+# undef OPTIONAL -+# endif -+ -+# ifdef DELETE -+# undef DELETE -+# endif -+ -+# ifdef IN -+# undef IN -+# endif -+ -+# ifdef GROUP -+# undef GROUP -+# endif -+ -+ /* for access() which is POSIX but doesn't seem to have the defines in VC */ -+# ifndef R_OK -+# define R_OK 4 -+# endif -+ -+# ifndef W_OK -+# define W_OK 2 -+# endif -+ -+ /* bison: output uses ERROR in an enum which breaks if this is defined */ -+# ifdef ERROR -+# undef ERROR -+# endif -+ -+# ifdef _MSC_VER -+# if (_MSC_VER >= 1300) && !defined(__func__) -+# define __func__ __FUNCTION__ -+# define HAVE___FUNC__ -+# elif !defined(__func__) -+ /* better than nothing */ -+# define rasqal_str(s) #s -+# define __func__ "func@" __FILE__ ":" rasqal_str(__LINE__) -+# endif -+# endif -+ -+# if !defined(HAVE_ACCESS) && defined(HAVE__ACCESS) -+# define access(p,m) _access(p,m) -+# endif -+ -+ /* flex: const is available */ -+# define YY_USE_CONST -+ /* looks like the .c files define this anyway */ -+ /* #define YY_NO_UNISTD_H */ -+ -+# undef RASQAL_INLINE -+# define RASQAL_INLINE __inline -+ -+# ifdef _DEBUG -+# define RASQAL_DEBUG 1 -+# endif -+ -+# ifdef __cplusplus -+ } -+# endif -+ -+#endif -+ -+#endif -diff -urNb rasqal-0.9.32-orig/src/rasqal_config.h.in rasqal-0.9.32-patched/src/rasqal_config.h.in ---- rasqal-0.9.32-orig/src/rasqal_config.h.in 2014-02-23 16:22:21.000000000 +0100 -+++ rasqal-0.9.32-patched/src/rasqal_config.h.in 2014-11-18 02:32:39.740582443 +0100 -@@ -245,16 +245,16 @@ - #undef RASQAL_UUID_OSSP - - /* Release version as a decimal */ --#undef RASQAL_VERSION_DECIMAL -+#define RASQAL_VERSION_DECIMAL @RASQAL_VERSION_DECIMAL@ - - /* Major version number */ --#undef RASQAL_VERSION_MAJOR -+#define RASQAL_VERSION_MAJOR @RASQAL_VERSION_MAJOR@ - - /* Minor version number */ --#undef RASQAL_VERSION_MINOR -+#define RASQAL_VERSION_MINOR @RASQAL_VERSION_MINOR@ - - /* Release version number */ --#undef RASQAL_VERSION_RELEASE -+#define RASQAL_VERSION_RELEASE @RASQAL_VERSION_RELEASE@ - - /* Define to 1 if you have the ANSI C header files. */ - #undef STDC_HEADERS -diff -urNb rasqal-0.9.32-orig/src/rasqal_regex.c rasqal-0.9.32-patched/src/rasqal_regex.c ---- rasqal-0.9.32-orig/src/rasqal_regex.c 2014-02-20 06:00:40.000000000 +0100 -+++ rasqal-0.9.32-patched/src/rasqal_regex.c 2014-11-19 02:55:04.604582523 +0100 -@@ -161,7 +161,7 @@ - #ifdef RASQAL_REGEX_NONE - rasqal_log_warning_simple(world, RASQAL_WARNING_LEVEL_MISSING_SUPPORT, locator, - "Regex support missing, cannot compare '%s' to '%s'", -- match_string, pattern); -+ subject, pattern); - rc = -1; - #endif - -diff -urNb rasqal-0.9.32-orig/src/win32_rasqal_config.h rasqal-0.9.32-patched/src/win32_rasqal_config.h ---- rasqal-0.9.32-orig/src/win32_rasqal_config.h 2014-02-23 17:39:47.000000000 +0100 -+++ rasqal-0.9.32-patched/src/win32_rasqal_config.h 2014-11-19 02:34:19.852582671 +0100 -@@ -21,7 +21,7 @@ - * - */ - -- -+#if 0 - #ifndef WIN32_CONFIG_H - #define WIN32_CONFIG_H - -@@ -171,3 +171,4 @@ - #endif - - #endif -+#endif -diff -urNb rasqal-0.9.32-orig/src/win32_rasqal_config.h.in rasqal-0.9.32-patched/src/win32_rasqal_config.h.in ---- rasqal-0.9.32-orig/src/win32_rasqal_config.h.in 2013-04-05 19:17:36.000000000 +0200 -+++ rasqal-0.9.32-patched/src/win32_rasqal_config.h.in 2014-11-19 02:34:14.668582672 +0100 -@@ -21,7 +21,7 @@ - * - */ - -- -+#if 0 - #ifndef WIN32_CONFIG_H - #define WIN32_CONFIG_H - -@@ -171,3 +171,4 @@ - #endif - - #endif -+#endif diff --git a/CMakeExternals/Rasqal.cmake b/CMakeExternals/Rasqal.cmake deleted file mode 100644 index e89464272e..0000000000 --- a/CMakeExternals/Rasqal.cmake +++ /dev/null @@ -1,56 +0,0 @@ -#----------------------------------------------------------------------------- -# rasqal -#----------------------------------------------------------------------------- - -if(MITK_USE_Rasqal) - -# Sanity checks -if(DEFINED Rasqal_DIR AND NOT EXISTS ${Rasqal_DIR}) - message(FATAL_ERROR "Rasqal_DIR variable is defined but corresponds to non-existing directory") -endif() - -set(proj Rasqal) -set(proj_DEPENDENCIES ${Raptor2_DEPENDS} ${PCRE_DEPENDS}) -set(${proj}_DEPENDS ${proj}) - -if(NOT DEFINED Rasqal_DIR) - - set(additional_cmake_args ) - if(CTEST_USE_LAUNCHERS) - list(APPEND additional_cmake_args - "-DCMAKE_PROJECT_${proj}_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake" - ) - endif() - - ExternalProject_Add(${proj} - LIST_SEPARATOR ${sep} - URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/rasqal-0.9.32.tar.gz - URL_MD5 dc7c6107de00c47f85f6ab7db164a136 - PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/Rasqal-0.9.32.patch - LIST_SEPARATOR ${sep} - CMAKE_GENERATOR ${gen} - CMAKE_GENERATOR_PLATFORM ${gen_platform} - CMAKE_ARGS - ${ep_common_args} - ${additional_cmake_args} - "-DCMAKE_C_FLAGS:STRING=-DPCRE_STATIC ${CMAKE_C_FLAGS}" - -DRASQAL_REGEX:STRING=pcre - -DCMAKE_PREFIX_PATH:STRING=${PCRE_DIR}^^${REDLAND_INSTALL_DIR} - -DPCRE_INCLUDE_DIR:PATH=${PCRE_DIR}/include - CMAKE_CACHE_ARGS - ${ep_common_cache_args} - CMAKE_CACHE_DEFAULT_ARGS - ${ep_common_cache_default_args} - DEPENDS ${proj_DEPENDENCIES} - ) - - set(${proj}_DIR ${ep_prefix}/lib/rasqal/cmake) - mitkFunctionInstallExternalCMakeProject(${proj}) - -else() - - mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") - -endif() - -endif() diff --git a/CMakeExternals/Redland-1.0.17.patch b/CMakeExternals/Redland-1.0.17.patch deleted file mode 100644 index fc7d457c18..0000000000 --- a/CMakeExternals/Redland-1.0.17.patch +++ /dev/null @@ -1,1051 +0,0 @@ -diff -burN redland-1.0.17-orig/CMakeLists.txt redland-1.0.17-patched/CMakeLists.txt ---- redland-1.0.17-orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ redland-1.0.17-patched/CMakeLists.txt 2014-11-26 14:03:18.518283855 +0100 -@@ -0,0 +1,298 @@ -+# redland/CMakeLists.txt -+# -+# This file allows building Redland with the CMake configuration tool. -+# Download CMake in source or binary form from http://www.cmake.org/ -+# -+# Based on the CMakeLists.txt file from Raptor. -+# This file is in the public domain. -+# -+ -+SET(REDLAND_VERSION_MAJOR 1) -+SET(REDLAND_VERSION_MINOR 0) -+SET(REDLAND_VERSION_RELEASE 17) -+SET(REDLAND_MIN_VERSION_DECIMAL 10017) -+ -+SET(VERSION "${REDLAND_VERSION_MAJOR}.${REDLAND_VERSION_MINOR}.${REDLAND_VERSION_RELEASE}") -+MATH(EXPR REDLAND_VERSION_DECIMAL "${REDLAND_VERSION_MAJOR} * 10000 + ${REDLAND_VERSION_MINOR} * 100 + ${REDLAND_VERSION_RELEASE}") -+ -+PROJECT(redland C) -+ -+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -+ -+SET(CMAKE_INCLUDE_CURRENT_DIR 1) -+ -+SET(PROJECT_DESCRIPTION "Redland RDF API Library") -+ -+################################################################ -+ -+# Third-party libraries -+ -+SET(RAPTOR_MIN_VERSION 2.0.7) -+FIND_PACKAGE(Raptor2 ${RAPTOR_MIN_VERSION} REQUIRED) -+include_directories(${Raptor2_INCLUDE_DIR}) -+ -+set(rdf_parsers_available "raptor(${Raptor2_VERSION})") -+ -+find_package(Rasqal REQUIRED) -+include_directories(${Rasqal_INCLUDE_DIR}) -+ -+set(rdf_query "rasqal(${Rasqal_VERSION})") -+ -+################################################################ -+ -+# Configuration checks -+ -+INCLUDE(CheckIncludeFile) -+INCLUDE(CheckIncludeFiles) -+INCLUDE(CheckFunctionExists) -+INCLUDE(CheckTypeSize) -+INCLUDE(CheckStructHasMember) -+INCLUDE(CheckCSourceCompiles) -+ -+CHECK_INCLUDE_FILE(errno.h HAVE_ERRNO_H) -+CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H) -+CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H) -+CHECK_INCLUDE_FILE(string.h HAVE_STRING_H) -+CHECK_INCLUDE_FILE(fcntl.h HAVE_FCNTL_H) -+CHECK_INCLUDE_FILE(getopt.h HAVE_GETOPT_H) -+CHECK_INCLUDE_FILE(stddef.h HAVE_STDDEF_H) -+CHECK_INCLUDE_FILE(memory.h HAVE_MEMORY_H) -+CHECK_INCLUDE_FILE(pthread.h HAVE_PTHREAD_H) -+ -+CHECK_INCLUDE_FILE(sys/time.h HAVE_SYS_TIME_H) -+CHECK_INCLUDE_FILE(time.h HAVE_TIME_H) -+CHECK_INCLUDE_FILES("sys/time.h;time.h" TIME_WITH_SYS_TIME) -+ -+CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H) -+ -+CHECK_FUNCTION_EXISTS(access HAVE_ACCESS) -+CHECK_FUNCTION_EXISTS(_access HAVE__ACCESS) -+CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT) -+CHECK_FUNCTION_EXISTS(getopt_long HAVE_GETOPT_LONG) -+CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) -+CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF) -+CHECK_FUNCTION_EXISTS(_snprintf HAVE__SNPRINTF) -+CHECK_FUNCTION_EXISTS(strcasecmp HAVE_STRCASECMP) -+CHECK_FUNCTION_EXISTS(stricmp HAVE_STRICMP) -+CHECK_FUNCTION_EXISTS(_stricmp HAVE__STRICMP) -+CHECK_FUNCTION_EXISTS(strnicmp HAVE_STRNICMP) -+CHECK_FUNCTION_EXISTS(_strnicmp HAVE__STRNICMP) -+CHECK_FUNCTION_EXISTS(vasprintf HAVE_VASPRINTF) -+CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF) -+CHECK_FUNCTION_EXISTS(_vsnprintf HAVE__VSNPRINTF) -+CHECK_FUNCTION_EXISTS(opendir HAVE_OPENDIR) -+CHECK_FUNCTION_EXISTS(readdir HAVE_READDIR) -+CHECK_FUNCTION_EXISTS(shl_load HAVE_SHL_LOAD) -+CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT) -+CHECK_FUNCTION_EXISTS(strlcpy HAVE_STRLCPY) -+ -+CHECK_FUNCTION_EXISTS(memcmp HAVE_MEMCMP) -+CHECK_FUNCTION_EXISTS(mkstemp HAVE_MKSTEMP) -+CHECK_FUNCTION_EXISTS(mktemp HAVE_MKTEMP) -+CHECK_FUNCTION_EXISTS(mktemp HAVE__MKTEMP) -+CHECK_FUNCTION_EXISTS(tmpnam HAVE_TMPNAM) -+CHECK_FUNCTION_EXISTS(getenv HAVE_GETENV) -+CHECK_FUNCTION_EXISTS(close HAVE_CLOSE) -+CHECK_FUNCTION_EXISTS(_close HAVE__CLOSE) -+CHECK_FUNCTION_EXISTS(unlink HAVE_UNLINK) -+CHECK_FUNCTION_EXISTS(_unlink HAVE__UNLINK) -+ -+CHECK_TYPE_SIZE(byte BYTE) -+CHECK_TYPE_SIZE(u32 U32) -+CHECK_TYPE_SIZE(u64 U64) -+ -+CHECK_TYPE_SIZE("unsigned char" SIZEOF_UNSIGNED_CHAR) -+CHECK_TYPE_SIZE("unsigned int" SIZEOF_UNSIGNED_INT) -+CHECK_TYPE_SIZE("unsigned long" SIZEOF_UNSIGNED_LONG) -+CHECK_TYPE_SIZE("unsigned long long" SIZEOF_UNSIGNED_LONG_LONG) -+ -+CHECK_C_SOURCE_COMPILES(" -+int main() {char *function_name = __func__; return 0;}" -+ HAVE___FUNC__ -+) -+CHECK_C_SOURCE_COMPILES(" -+int main() {char *function_name = __FUNCTION__; return 0;}" -+ HAVE___FUNCTION__ -+) -+ -+################################################################ -+ -+# User-configurable options -+# -+# (Note: The CMake GUI displays these in alphabetical order, regardless of -+# the order we use here) -+ -+SET(BUILD_SHARED_LIBS OFF CACHE BOOL -+ "Build shared libraries instead of static ones.") -+ -+#SET(REDLAND_ENABLE_TESTING TRUE CACHE BOOL -+# "Enable unit tests") -+ -+IF(BUILD_SHARED_LIBS) -+ SET(REDLAND_STATIC FALSE) -+ELSE() -+ SET(REDLAND_STATIC TRUE) -+ENDIF() -+ -+# ---------- Threading ----------- -+ -+if(HAVE_PTHREAD_H) -+ set(WITH_THREADS OFF CACHE BOOL "With POSIX thread support") -+ if(WITH_THREADS) -+ set(CMAKE_THREAD_PREFER_PTHREAD) -+ find_package(Threads REQUIRED) -+ if(NOT CMAKE_USE_PTHREADS_INIT) -+ message(SEND_ERROR "POSIX pthread library not found") -+ endif() -+ endif() -+endif() -+ -+ -+########## ------- Storage Backends ------- ########### -+ -+set(persistent_storages "file tstore mysql sqlite") -+set(persistent_store 0) -+set(all_storages memory file hashes trees mysql sqlite tstore postgresql virtuoso) -+set(always_available_storages memory file hashes trees) -+set(storages_enabled ) -+ -+set(ENABLE_ALL_STORAGES OFF CACHE BOOL "Use all available storages") -+ -+# default availabilities and enablements -+foreach(storage ${all_storages}) -+ set(${storage}_storage_available 0) -+ set(${storage}_storage 0) -+endforeach() -+foreach(storage ${always_available_storages}) -+ set(${storage}_storage_available 1) -+ string(TOUPPER ${storage} storage_uc) -+ if(NOT ${storage} STREQUAL "memory") -+ set(ENABLE_${storage_uc} 1 CACHE BOOL "Use ${storage} storage backend") -+ endif() -+endforeach() -+set(ENABLE_MEMORY 1) -+ -+# ----------- BerkeleyDB ------------- -+ -+set(bdb_available "Missing") -+set(bdb_version "n/a") -+set(storages_available ${always_available_storages}) -+ -+if(HAVE_LIBDB) -+ list(APPEND storages_available "hashes(bdb ${bdb_version})") -+endif() -+ -+# ----------- MySql ------------- -+ -+set(ENABLE_MYSQL_INIT 0) -+set(libmysql_min_version 3.23.56) -+set(mysql_storage_available 0) -+ -+find_program(MYSQL_CONFIG mysql_config) -+if(MYSQL_CONFIG) -+ execute_process(COMMAND ${MYSQL_CONFIG} --version -+ OUTPUT_VARIABLE LIBMYSQL_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE -+ ) -+ message("mysql version: ${LIBMYSQL_VERSION}") -+ execute_process(COMMAND ${MYSQL_CONFIG} --libs -+ OUTPUT_VARIABLE LIBMYSQL_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE -+ ) -+ execute_process(COMMAND ${MYSQL_CONFIG} --include -+ OUTPUT_VARIABLE LIBMYSQL_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE -+ ) -+ string(REPLACE "-I" "" LIBMYSQL_INCLUDE_DIR ${LIBMYSQL_INCLUDE_DIR}) -+ message("mysql include dir: ${LIBMYSQL_INCLUDE_DIR}") -+ list(APPEND storages_available "mysql(${LIBMYSQL_VERSION})") -+ set(ENABLE_MYSQL_INIT 1) -+ set(mysql_storage_available 1) -+endif() -+ -+set(ENABLE_MYSQL ${ENABLE_MYSQL_INIT} CACHE BOOL "Use MySQL 3/4 storage backend") -+ -+foreach(storage ${all_storages}) -+ string(TOUPPER ${storage} storage_uc) -+ if(${storage}_storage_available AND -+ (ENABLE_${storage_uc} OR ENABLE_ALL_STORAGES)) -+ set(STORAGE_${storage_uc} 1) -+ list(APPEND storages_enabled ${storage}) -+ list(FIND persistent_storages ${storage} _index) -+ if(${_index} GREATER -1) -+ set(persistent_store 1) -+ endif() -+ endif() -+endforeach() -+ -+if(NOT persistent_store) -+ message("WARNING: No persistant storage is available or enabled") -+endif() -+ -+########## ------- Digest Modules ------- ########### -+ -+set(digest_modules md5 sha1 ripemd160) -+set(digest_modules_available ) -+ -+set(digest_srcs ) -+foreach(module ${digest_modules}) -+ string(TOUPPER ${module} module_uc) -+ set(base rdf_digest_${module}) -+ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/${base}.c) -+ set(HAVE_LOCAL_${module_uc}_DIGEST 1) -+ list(APPEND digest_srcs ${base}.c) -+ list(APPEND digest_modules_available ${module}) -+ endif() -+endforeach() -+ -+################################################################ -+ -+include(CMakePackageConfigHelpers) -+ -+CONFIGURE_FILE( -+ src/rdf_config_cmake.h.in -+ src/rdf_config.h -+ @ONLY -+) -+ -+ADD_DEFINITIONS(-DHAVE_CONFIG_H) -+ -+#CONFIGURE_FILE( -+# src/rasqal.h.in -+# src/rasqal.h -+# @ONLY -+#) -+ -+set(INCLUDE_INSTALL_DIR include) -+set(LIB_INSTALL_DIR lib) -+set(BIN_INSTALL_DIR bin) -+set(CMAKE_INSTALL_DIR lib/redland/cmake) -+set(DATA_INSTALL_DIR share/redland) -+ -+add_subdirectory(src) -+ -+configure_package_config_file(RedlandConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/RedlandConfig.cmake -+ INSTALL_DESTINATION ${CMAKE_INSTALL_DIR} -+ PATH_VARS INCLUDE_INSTALL_DIR -+ NO_CHECK_REQUIRED_COMPONENTS_MACRO -+) -+ -+write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/RedlandConfigVersion.cmake -+ VERSION ${VERSION} -+ COMPATIBILITY AnyNewerVersion -+) -+ -+install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/RedlandConfig.cmake -+ ${CMAKE_CURRENT_BINARY_DIR}/RedlandConfigVersion.cmake -+ DESTINATION ${CMAKE_INSTALL_DIR} -+) -+ -+ -+message("Redland configuration: -+ Oracle Berkeley DB (BDB) : ${bdb_available} -+ Triple stores available : ${storages_available} -+ Triple stores enabled : ${storages_enabled} -+ RDF parsers : ${rdf_parsers_available} -+ RDF query : ${rdf_query} -+ Content digests : ${digest_modules_available}" -+) -+ -+# end redland/CMakeLists.txt -diff -burN redland-1.0.17-orig/RedlandConfig.cmake.in redland-1.0.17-patched/RedlandConfig.cmake.in ---- redland-1.0.17-orig/RedlandConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 -+++ redland-1.0.17-patched/RedlandConfig.cmake.in 2014-11-26 14:08:47.781299653 +0100 -@@ -0,0 +1,13 @@ -+set(Redland_VERSION @VERSION@) -+ -+@PACKAGE_INIT@ -+ -+set_and_check(Redland_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") -+ -+find_package(Raptor2 REQUIRED) -+find_package(Rasqal REQUIRED) -+list(APPEND Redland_INCLUDE_DIR ${Rasqal_INCLUDE_DIR} ${Raptor2_INCLUDE_DIR}) -+ -+if(NOT TARGET rdf AND EXISTS ${CMAKE_CURRENT_LIST_DIR}/RedlandTargets.cmake) -+ include(${CMAKE_CURRENT_LIST_DIR}/RedlandTargets.cmake) -+endif() -diff -burN redland-1.0.17-orig/RedlandConfig.cmake.in~ redland-1.0.17-patched/RedlandConfig.cmake.in~ ---- redland-1.0.17-orig/RedlandConfig.cmake.in~ 1970-01-01 01:00:00.000000000 +0100 -+++ redland-1.0.17-patched/RedlandConfig.cmake.in~ 2014-11-26 14:03:18.518283855 +0100 -@@ -0,0 +1,9 @@ -+set(Redland_VERSION @VERSION@) -+ -+@PACKAGE_INIT@ -+ -+set_and_check(Redland_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") -+ -+if(NOT TARGET rdf AND EXISTS ${CMAKE_CURRENT_LIST_DIR}/RedlandTargets.cmake) -+ include(${CMAKE_CURRENT_LIST_DIR}/RedlandTargets.cmake) -+endif() -diff -burN redland-1.0.17-orig/src/CMakeLists.txt redland-1.0.17-patched/src/CMakeLists.txt ---- redland-1.0.17-orig/src/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ redland-1.0.17-patched/src/CMakeLists.txt 2014-11-26 14:03:18.518283855 +0100 -@@ -0,0 +1,171 @@ -+# redland/src/CMakeLists.txt -+# -+# Based on the src/CMakeLists.txt file from Raptor -+# This file is in the public domain. -+# -+ -+set(public_headers -+ librdf.h -+ rdf_concepts.h -+ rdf_digest.h -+ rdf_hash.h -+ rdf_init.h -+ rdf_iterator.h -+ rdf_list.h -+ rdf_log.h -+ rdf_model.h -+ rdf_node.h -+ rdf_parser.h -+ rdf_query.h -+ rdf_raptor.h -+ rdf_serializer.h -+ rdf_statement.h -+ rdf_storage.h -+ rdf_storage_module.h -+ rdf_stream.h -+ rdf_uri.h -+ rdf_utf8.h -+ redland.h -+) -+ -+set(internal_headers -+ rdf_concepts_internal.h -+ rdf_digest_internal.h -+ rdf_files.h -+ rdf_hash_internal.h -+ rdf_heuristics.h -+ rdf_init_internal.h -+ rdf_internal.h -+ rdf_iterator_internal.h -+ rdf_list_internal.h -+ rdf_log_internal.h -+ rdf_model_internal.h -+ rdf_node_internal.h -+ rdf_parser_internal.h -+ rdf_query_internal.h -+ rdf_raptor_internal.h -+ rdf_serializer_internal.h -+ rdf_statement_internal.h -+ rdf_storage_internal.h -+ rdf_stream_internal.h -+ rdf_types.h -+ rdf_uri_internal.h -+) -+ -+set(srcs -+ rdf_concepts.c -+ rdf_digest.c -+ rdf_files.c -+ rdf_hash.c -+ rdf_hash_cursor.c -+ rdf_hash_memory.c -+ rdf_heuristics.c -+ rdf_init.c -+ rdf_iterator.c -+ rdf_list.c -+ rdf_log.c -+ rdf_model.c -+ rdf_model_storage.c -+ rdf_node_common.c -+ rdf_node.c -+ rdf_parser.c -+ rdf_parser_raptor.c -+ rdf_query.c -+ rdf_query_rasqal.c -+ rdf_query_results.c -+ rdf_raptor.c -+ rdf_serializer.c -+ rdf_serializer_raptor.c -+ rdf_statement.c -+ rdf_statement_common.c -+ rdf_storage.c -+ rdf_storage_sql.c -+ rdf_stream.c -+ rdf_uri.c -+ rdf_utf8.c -+ ${digest_srcs} -+ ${internal_headers} -+) -+ -+if(NOT HAVE_MEMCMP) -+ list(APPEND srcs memcmp.c) -+endif() -+ -+# Storages always built-in -+list(APPEND srcs rdf_storage_list.c rdf_storage_hashes.c rdf_storage_trees.c) -+if(STORAGE_FILE) -+ list(APPEND srcs rdf_storage_file.c) -+endif() -+ -+set(storage_libs ) -+if(STORAGE_TSTORE) -+ list(APPEND srcs rdf_storage_tstore.c) -+endif() -+if(STORAGE_MYSQL) -+ list(APPEND srcs rdf_storage_mysql.c) -+ include_directories(${LIBMYSQL_INCLUDE_DIR}) -+ list(APPEND storage_libs ${LIBMYSQL_LIBRARIES}) -+ INSTALL(FILES mysql-v1.ttl mysql-v2.ttl -+ DESTINATION ${DATA_INSTALL_DIR} -+ ) -+endif() -+if(STORAGE_SQLITE) -+ list(APPEND srcs rdf_storage_sqlite.c) -+endif() -+if(STORAGE_POSTGRESQL) -+ list(APPEND srcs rdf_storage_postgresql.c) -+endif() -+if(STORAGE_VIRTUOSO) -+ list(APPEND srcs rdf_storage_virtuoso.c rdf_query_virtuoso.c rdf_storage_virtuoso_internal.h) -+endif() -+ -+add_library(rdf ${srcs}) -+ -+target_link_libraries(rdf raptor2 rasqal ${storage_libs}) -+if(WITH_THREADS) -+ target_link_libraries(rdf ${CMAKE_THREAD_LIBS_INIT}) -+endif() -+ -+SET_TARGET_PROPERTIES( -+ rdf -+ PROPERTIES -+ COMPILE_DEFINITIONS "LIBRDF_INTERNAL;PKGDATADIR=\"${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}\"" -+ PUBLIC_HEADER "${public_headers}" -+) -+ -+# Generate pkg-config metadata file -+# -+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/redland.pc -+"prefix=${CMAKE_INSTALL_PREFIX} -+exec_prefix=\${prefix} -+libdir=\${exec_prefix}/${LIB_INSTALL_DIR} -+includedir=\${prefix}/${INCLUDE_INSTALL_DIR} -+ -+have_raptor2_api=1 -+ -+Name: ${PROJECT_DESCRIPTION} -+Description: Redland RDF API and triple store library -+Requires.private: raptor2 >= ${RAPTOR_MIN_VERSION}, rasqal >= ${RASQAL_MIN_VERSION}, rasqal <= 0.9.99 -+Version: ${VERSION} -+Libs: -L\${libdir} -lrdf -+Libs.private: -ldl -+Cflags: -I\${includedir} -+") -+ -+INSTALL(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/redland.pc -+ DESTINATION ${LIB_INSTALL_DIR}/pkgconfig -+) -+ -+INSTALL( -+ TARGETS rdf -+ EXPORT RedlandTargets -+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} -+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} -+ RUNTIME DESTINATION ${BIN_INSTALL_DIR} -+ PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR} -+) -+ -+INSTALL(EXPORT RedlandTargets DESTINATION ${CMAKE_INSTALL_DIR}) -+ -+# end redland/src/CMakeLists.txt -diff -burN redland-1.0.17-orig/src/rdf_config_cmake.h.in redland-1.0.17-patched/src/rdf_config_cmake.h.in ---- redland-1.0.17-orig/src/rdf_config_cmake.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ redland-1.0.17-patched/src/rdf_config_cmake.h.in 2014-11-26 14:03:18.519283855 +0100 -@@ -0,0 +1,508 @@ -+/* src/rdf_config_cmake.h.in.*/ -+ -+/* Release version as a decimal */ -+#define LIBRDF_VERSION_DECIMAL @REDLAND_VERSION_DECIMAL@ -+ -+/* Major version number */ -+#define LIBRDF_VERSION_MAJOR @REDLAND_VERSION_MAJOR@ -+ -+/* Minor version number */ -+#define LIBRDF_VERSION_MINOR @REDLAND_VERSION_MINOR@ -+ -+/* Release version number */ -+#define LIBRDF_VERSION_RELEASE @REDLAND_VERSION_RELEASE@ -+ -+/* ---------- package information ------------ */ -+ -+/* Name of package */ -+#define PACKAGE @PROJECT_NAME@ -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "http://bugs.librdf.org/" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "@PROJECT_DESCRIPTION@" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "@PROJECT_DESCRIPTION@ @VERSION@" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME librdf -+ -+/* Define to the home page for this package. */ -+#define PACKAGE_URL "" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "@VERSION@" -+ -+/* Version number of package */ -+#define VERSION "@VERSION@" -+ -+/* Define if building universal (internal helper macro) */ -+#cmakedefine AC_APPLE_UNIVERSAL_BUILD -+ -+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most -+ significant byte first (like Motorola and SPARC, unlike Intel). */ -+#if defined AC_APPLE_UNIVERSAL_BUILD -+# if defined __BIG_ENDIAN__ -+# define WORDS_BIGENDIAN 1 -+# endif -+#else -+# ifndef WORDS_BIGENDIAN -+# undef WORDS_BIGENDIAN -+# endif -+#endif -+ -+/* ------------ header availability --------------- */ -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_DB_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_DIRENT_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_DLD_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_DLFCN_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_DL_H -+ -+/* Define if you have the _dyld_func_lookup function. */ -+#cmakedefine HAVE_DYLD -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_ERRNO_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_FCNTL_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_GETOPT_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_INTTYPES_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_LIBPQ_FE_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_MACH_O_DYLD_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_MEMORY_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_PTHREAD_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_SQLITE3_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_SQLITE_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_STDDEF_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_STDINT_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_STDLIB_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_STRINGS_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_STRING_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_SYS_DL_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_SYS_STAT_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine01 HAVE_SYS_TIME_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_SYS_TYPES_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_TIME_H -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_UNISTD_H -+ -+ -+/* --------- feature availability ------------ */ -+ -+/* Define so that glibc/gnulib argp.h does not typedef error_t. */ -+#undef __error_t_defined -+ -+/* Define to a type to use for `error_t' if it is not otherwise available. */ -+#undef error_t -+ -+/* BDB has close method with 2 args */ -+#cmakedefine HAVE_BDB_CLOSE_2_ARGS -+ -+/* BDB defines DBC */ -+#cmakedefine HAVE_BDB_CURSOR -+ -+/* BDB cursor method has 4 arguments */ -+#cmakedefine HAVE_BDB_CURSOR_4_ARGS -+ -+/* BDB defines DB_TXN */ -+#cmakedefine HAVE_BDB_DB_TXN -+ -+/* BDB has fd method with 2 args */ -+#cmakedefine HAVE_BDB_FD_2_ARGS -+ -+/* Have BDB hash support */ -+#cmakedefine HAVE_BDB_HASH -+ -+/* BDB has open method with 6 args */ -+#cmakedefine HAVE_BDB_OPEN_6_ARGS -+ -+/* BDB has open method with 7 args */ -+#cmakedefine HAVE_BDB_OPEN_7_ARGS -+ -+/* BDB has set_flags method */ -+#cmakedefine HAVE_BDB_SET_FLAGS -+ -+/* Define to 1 if the system has the type `byte'. */ -+#cmakedefine HAVE_BYTE -+ -+/* Define if you have the GNU dld library. */ -+#cmakedefine HAVE_DLD -+ -+/* Have local MD5 digest */ -+#cmakedefine HAVE_LOCAL_MD5_DIGEST -+ -+/* Have local RIPEMD160 digest */ -+#cmakedefine HAVE_LOCAL_RIPEMD160_DIGEST -+ -+/* Have local SHA1 digest */ -+#cmakedefine HAVE_LOCAL_SHA1_DIGEST -+ -+/* Define this if a modern libltdl is already installed */ -+#cmakedefine HAVE_LTDL -+ -+/* Define if you have the libdl library or equivalent. */ -+#cmakedefine HAVE_LIBDL -+ -+/* Define if libdlloader will be built on this platform */ -+#cmakedefine HAVE_LIBDLLOADER -+ -+/* have MYSQL_OPT_RECONNECT declared */ -+#cmakedefine HAVE_MYSQL_OPT_RECONNECT -+ -+/* Define if libtool can extract symbol lists from object files. */ -+#cmakedefine HAVE_PRELOADED_SYMBOLS -+ -+/* Define to 1 if the system has the type `u32'. */ -+#cmakedefine HAVE_U32 -+ -+/* Define to 1 if the system has the type `u64'. */ -+#cmakedefine HAVE_U64 -+ -+/* This value is set to 1 to indicate that the system argz facility works */ -+#cmakedefine HAVE_WORKING_ARGZ -+ -+/* Run time assertion checks. */ -+#cmakedefine LIBRDF_ASSERT -+ -+/* Print run time assertion check failure messages. */ -+#cmakedefine LIBRDF_ASSERT_MESSAGES -+ -+/* Define if the OS needs help to load dependent libraries for dlopen(). */ -+#cmakedefine LTDL_DLOPEN_DEPLIBS -+ -+/* Define to the system default library search path. */ -+#cmakedefine LT_DLSEARCH_PATH -+ -+/* The archive extension */ -+#cmakedefine LT_LIBEXT -+ -+/* The archive prefix */ -+#cmakedefine LT_LIBPREFIX -+ -+/* Define to the extension used for runtime loadable modules, say, ".so". */ -+#cmakedefine LT_MODULE_EXT -+ -+/* Define to the name of the environment variable that determines the run-time -+ module search path. */ -+#cmakedefine LT_MODULE_PATH_VAR -+ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ -+#cmakedefine LT_OBJDIR -+ -+/* Define to the shared library suffix, say, ".dylib". */ -+#cmakedefine LT_SHARED_EXT -+ -+/* Build storage backends as modules */ -+#cmakedefine MODULAR_LIBRDF -+ -+/* Define if dlsym() requires a leading underscore in symbol names. */ -+#cmakedefine NEED_USCORE -+ -+/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -+#cmakedefine NO_MINUS_C_MINUS_O -+ -+ -+/* The size of `unsigned char', as computed by sizeof. */ -+#define SIZEOF_UNSIGNED_CHAR @SIZEOF_UNSIGNED_CHAR@ -+ -+/* The size of `unsigned int', as computed by sizeof. */ -+#define SIZEOF_UNSIGNED_INT @SIZEOF_UNSIGNED_INT@ -+ -+/* The size of `unsigned long', as computed by sizeof. */ -+#define SIZEOF_UNSIGNED_LONG @SIZEOF_UNSIGNED_LONG@ -+ -+/* The size of `unsigned long long', as computed by sizeof. */ -+#define SIZEOF_UNSIGNED_LONG_LONG @SIZEOF_UNSIGNED_LONG_LONG@ -+ -+/* define to SQLINTEGER if not defined in the ODBC headers */ -+#cmakedefine SQLLEN -+ -+/* define to SQLUINTEGER if not defined in the ODBC headers */ -+#cmakedefine SQLULEN -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#cmakedefine STDC_HEADERS -+ -+/* Building file storage */ -+#cmakedefine STORAGE_FILE -+ -+/* Building hashes storage */ -+#cmakedefine STORAGE_HASHES -+ -+/* Building memory storage */ -+#cmakedefine STORAGE_MEMORY -+ -+/* Building MySQL storage */ -+#cmakedefine STORAGE_MYSQL -+ -+/* Building PostgreSQL storage */ -+#cmakedefine STORAGE_POSTGRESQL -+ -+/* Building SQLite storage */ -+#cmakedefine STORAGE_SQLITE -+ -+/* Building trees storage */ -+#cmakedefine STORAGE_TREES -+ -+/* Building 3store storage */ -+#cmakedefine STORAGE_TSTORE -+ -+/* Building Virtuoso storage */ -+#cmakedefine STORAGE_VIRTUOSO -+ -+/* Define to 1 if you can safely include both and . */ -+#cmakedefine01 TIME_WITH_SYS_TIME -+ -+/* Use POSIX threads */ -+#cmakedefine WITH_THREADS -+ -+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most -+ significant byte first (like Motorola and SPARC, unlike Intel). */ -+#if defined AC_APPLE_UNIVERSAL_BUILD -+# if defined __BIG_ENDIAN__ -+# define WORDS_BIGENDIAN 1 -+# endif -+#else -+# ifndef WORDS_BIGENDIAN -+# undef WORDS_BIGENDIAN -+# endif -+#endif -+ -+/* --------- function availability ----------- */ -+ -+/* Define to 1 if you have the `argz_add' function. */ -+#cmakedefine HAVE_ARGZ_ADD -+ -+/* Define to 1 if you have the `argz_append' function. */ -+#cmakedefine HAVE_ARGZ_APPEND -+ -+/* Define to 1 if you have the `argz_count' function. */ -+#cmakedefine HAVE_ARGZ_COUNT -+ -+/* Define to 1 if you have the `argz_create_sep' function. */ -+#cmakedefine HAVE_ARGZ_CREATE_SEP -+ -+/* Define to 1 if you have the header file. */ -+#cmakedefine HAVE_ARGZ_H -+ -+/* Define to 1 if you have the `argz_insert' function. */ -+#cmakedefine HAVE_ARGZ_INSERT -+ -+/* Define to 1 if you have the `argz_next' function. */ -+#cmakedefine HAVE_ARGZ_NEXT -+ -+/* Define to 1 if you have the `argz_stringify' function. */ -+#cmakedefine HAVE_ARGZ_STRINGIFY -+ -+/* Define to 1 if you have the `closedir' function. */ -+#cmakedefine HAVE_CLOSEDIR -+ -+/* BDB has dbopen method */ -+#cmakedefine HAVE_DBOPEN -+ -+/* BDB has db_create method */ -+#cmakedefine HAVE_DB_CREATE -+ -+/* BDB has db_open method */ -+#cmakedefine HAVE_DB_OPEN -+ -+/* Define to 1 if you have the declaration of `cygwin_conv_path', and to 0 if -+ you don't. */ -+#cmakedefine HAVE_DECL_CYGWIN_CONV_PATH -+ -+/* Define to 1 if you have the `dlerror' function. */ -+#cmakedefine HAVE_DLERROR -+ -+/* Define to 1 if the system has the type `error_t'. */ -+#cmakedefine HAVE_ERROR_T -+ -+/* Define to 1 if you have the `getenv' function. */ -+#cmakedefine HAVE_GETENV -+ -+/* Define to 1 if you have the `getopt' function. */ -+#cmakedefine HAVE_GETOPT -+ -+/* Define to 1 if you have the `getopt_long' function. */ -+#cmakedefine HAVE_GETOPT_LONG -+ -+/* Define to 1 if you have the `gettimeofday' function. */ -+#cmakedefine HAVE_GETTIMEOFDAY -+ -+#cmakedefine HAVE_ACCESS -+#cmakedefine HAVE__ACCESS -+#cmakedefine HAVE_SNPRINTF -+#cmakedefine HAVE__SNPRINTF -+#cmakedefine HAVE_STRCASECMP -+#cmakedefine HAVE_STRICMP -+#cmakedefine HAVE__STRICMP -+#cmakedefine HAVE_STRNICMP -+#cmakedefine HAVE__STRNICMP -+#cmakedefine HAVE_VASPRINTF -+#cmakedefine HAVE_VSNPRINTF -+#cmakedefine HAVE__VSNPRINTF -+ -+/* Define to 1 if you have the `memcmp' function. */ -+#cmakedefine HAVE_MEMCMP -+ -+/* Define to 1 if you have the `mkstemp' function. */ -+#cmakedefine HAVE_MKSTEMP -+ -+/* Define to 1 if you have the `mktemp' function. */ -+#cmakedefine HAVE_MKTEMP -+#cmakedefine HAVE__MKTEMP -+ -+/* Define to 1 if you have the `opendir' function. */ -+#cmakedefine HAVE_OPENDIR -+ -+/* Define to 1 if you have the `readdir' function. */ -+#cmakedefine HAVE_READDIR -+ -+/* Define if you have the shl_load function. */ -+#cmakedefine HAVE_SHL_LOAD -+ -+/* Define to 1 if you have the `strlcat' function. */ -+#cmakedefine HAVE_STRLCAT -+ -+/* Define to 1 if you have the `strlcpy' function. */ -+#cmakedefine HAVE_STRLCPY -+ -+/* Define to 1 if you have the `tmpnam' function. */ -+#cmakedefine HAVE_TMPNAM -+ -+#cmakedefine HAVE_CLOSE -+#cmakedefine HAVE__CLOSE -+ -+#cmakedefine HAVE_UNLINK -+#cmakedefine HAVE__UNLINK -+ -+ -+/* --------- WIN32 config ----------- */ -+ -+#ifdef WIN32 -+ -+# ifdef __cplusplus -+ extern "C" { -+# endif -+ -+# define WIN32_LEAN_AND_MEAN 1 -+# define _CRT_NONSTDC_NO_DEPRECATE -+# define _CRT_SECURE_NO_DEPRECATE -+ -+ -+ /* MS names for these functions */ -+ // next line breaks build on wntmsci12 -+ //#define vsnprintf _vsnprintf -+# if !defined(HAVE_SNPRINTF) && defined(HAVE__SNPRINTF) -+# define snprintf _snprintf -+# endif -+# if !defined(HAVE_STRICMP) && defined(HAVE__STRICMP) -+# define stricmp _stricmp -+# endif -+# if !defined(HAVE_STRNICMP) && defined(HAVE__STRNICMP) -+# define strnicmp _strnicmp -+# endif -+ -+# if !defined(HAVE_CLOSE) && defined(HAVE__CLOSE) -+# define close _close -+# endif -+# if !defined(HAVE_UNLINK) && defined(HAVE__UNLINK) -+# define unlink _unlink -+# endif -+# if !defined(HAVE_MKTEMP) && defined(HAVE__MKTEMP) -+# define mktemp _mktemp -+# endif -+ -+/* Define the following if you are calling the librdf from C# or any language which uses stdcall */ -+#define USE_STDCALL_CALLBACKS 1 -+ -+/* for access() which is POSIX but doesn't seem to have the defines in VC */ -+# ifndef R_OK -+# define F_OK 0 -+# define R_OK 4 -+# endif -+ -+# ifdef _MSC_VER -+# if (_MSC_VER >= 1300) && !defined(__func__) -+# define __func__ __FUNCTION__ -+# define HAVE___FUNC__ -+# elif !defined(__func__) -+ /* better than nothing */ -+# define rasqal_str(s) #s -+# define __func__ "func@" __FILE__ ":" rasqal_str(__LINE__) -+# endif -+# endif -+ -+# if !defined(HAVE_ACCESS) && defined(HAVE__ACCESS) -+# define access(p,m) _access(p,m) -+# endif -+ -+# undef REDLAND_INLINE -+# define REDLAND_INLINE __inline -+ -+# include -+# include -+# include -+# include -+ -+ /* get _isnan() since it is not in math.h */ -+# include -+# ifndef isnan -+# define isnan(d) (_isnan(d)) -+# endif -+ -+# ifdef __cplusplus -+ } -+# endif -+ -+#endif -diff -burN redland-1.0.17-orig/src/win32_rdf_config.h redland-1.0.17-patched/src/win32_rdf_config.h ---- redland-1.0.17-orig/src/win32_rdf_config.h 2013-12-28 17:31:20.000000000 +0100 -+++ redland-1.0.17-patched/src/win32_rdf_config.h 2014-11-26 14:03:18.520283855 +0100 -@@ -21,6 +21,7 @@ - * - */ - -+#if 0 - #ifndef WIN32_RDF_CONFIG_H - #define WIN32_RDF_CONFIG_H - -@@ -300,3 +301,4 @@ - #endif - - #endif -+#endif -diff -burN redland-1.0.17-orig/src/win32_rdf_config.h.in redland-1.0.17-patched/src/win32_rdf_config.h.in ---- redland-1.0.17-orig/src/win32_rdf_config.h.in 2013-04-05 19:17:40.000000000 +0200 -+++ redland-1.0.17-patched/src/win32_rdf_config.h.in 2014-11-26 14:03:18.521283855 +0100 -@@ -21,6 +21,7 @@ - * - */ - -+#if 0 - #ifndef WIN32_RDF_CONFIG_H - #define WIN32_RDF_CONFIG_H - -@@ -300,3 +301,4 @@ - #endif - - #endif -+#endif diff --git a/CMakeExternals/Redland.cmake b/CMakeExternals/Redland.cmake deleted file mode 100644 index 6ba7d5dac3..0000000000 --- a/CMakeExternals/Redland.cmake +++ /dev/null @@ -1,52 +0,0 @@ -#----------------------------------------------------------------------------- -# redland -#----------------------------------------------------------------------------- - -if(MITK_USE_Redland) - -# Sanity checks -if(DEFINED Redland_DIR AND NOT EXISTS ${Redland_DIR}) - message(FATAL_ERROR "Redland_DIR variable is defined but corresponds to non-existing directory") -endif() - -set(proj Redland) -set(proj_DEPENDENCIES ${Raptor2_DEPENDS} ${Rasqal_DEPENDS}) -set(${proj}_DEPENDS ${proj}) - -if(NOT DEFINED Redland_DIR) - - set(additional_cmake_args ) - if(CTEST_USE_LAUNCHERS) - list(APPEND additional_cmake_args - "-DCMAKE_PROJECT_${proj}_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake" - ) - endif() - - ExternalProject_Add(${proj} - LIST_SEPARATOR ${sep} - URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/redland-1.0.17.tar.gz - URL_MD5 e5be03eda13ef68aabab6e42aa67715e - PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/Redland-1.0.17.patch - CMAKE_GENERATOR ${gen} - CMAKE_GENERATOR_PLATFORM ${gen_platform} - CMAKE_ARGS - ${ep_common_args} - ${additional_cmake_args} - -DWITH_THREADS:BOOL=OFF - CMAKE_CACHE_ARGS - ${ep_common_cache_args} - CMAKE_CACHE_DEFAULT_ARGS - ${ep_common_cache_default_args} - DEPENDS ${proj_DEPENDENCIES} - ) - - set(${proj}_DIR ${ep_prefix}/lib/redland/cmake) - mitkFunctionInstallExternalCMakeProject(${proj}) - -else() - - mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}") - -endif() - -endif() diff --git a/Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/ThirdPartyLibs.dox b/Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/ThirdPartyLibs.dox index 20bb698686..315fe01900 100644 --- a/Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/ThirdPartyLibs.dox +++ b/Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/ThirdPartyLibs.dox @@ -1,131 +1,111 @@ /** \page thirdpartylibs Third-party libraries The following third-party libraries can be used with MITK by default and can, in part, be automatically downloaded during superbuild. \par ACVD http://www.creatis.insa-lyon.fr/site/en/acvd \par ANN http://www.cs.umd.edu/~mount/ANN/ \par Boost http://www.boost.org/ \par C++ REST SDK https://github.com/Microsoft/cpprestsdk/ \par CppUnit http://sourceforge.net/projects/cppunit/ \par CTK http://www.commontk.org/ \par DCMTK http://dicom.offis.de/dcmtk.php.en \par Eigen http://eigen.tuxfamily.org/index.php?title=Main_Page \par GDCM http://gdcm.sourceforge.net/ \par HDF5 https://support.hdfgroup.org/HDF5/ \par ITK http://www.itk.org/ \par MatchPoint https://www.dkfz.de/en/sidt/projects/matchpoint/info.html \par NumPy http://www.numpy.org/ \par OpenCL https://www.khronos.org/opencl/ \par OpenCV http://opencv.willowgarage.com/wiki/Welcome \par OpenIGTLink http://openigtlink.org/ \par PCRE http://www.pcre.org/ \par POCO http://pocoproject.org \par Python https://www.python.org/ \par Qt http://www.qt.io/ \par Qwt http://qwt.sourceforge.net/ -\par Rasqal - -http://librdf.org/rasqal/ - -\par Raptor2 - -http://librdf.org/raptor/ - -\par Redland - -http://librdf.org/ - -\par SimpleITK - -http://www.simpleitk.org/ - \par SWIG http://swig.org/ \par tinyxml http://sourceforge.net/projects/tinyxml/ \par VIGRA http://ukoethe.github.io/vigra/ \par VTK http://www.vtk.org/ \par zlib https://github.com/madler/zlib/ -\par libSVM -http://www.csie.ntu.edu.tw/~cjlin/libsvm/ - - For copyright information on any of the above toolkits see the corresponding home page or the corresponding source folder. */ diff --git a/Modules/ModuleList.cmake b/Modules/ModuleList.cmake index a5e4263022..436add1ccc 100644 --- a/Modules/ModuleList.cmake +++ b/Modules/ModuleList.cmake @@ -1,88 +1,87 @@ # The entries in the mitk_modules list must be # ordered according to their dependencies. set(MITK_MODULES Core CommandLine AppUtil - RDF LegacyIO DataTypesExt Annotation LegacyGL AlgorithmsExt MapperExt DICOMReader DICOMReaderServices DICOMQI DICOMTesting SceneSerializationBase PlanarFigure ImageDenoising ImageExtraction SceneSerialization Gizmo GraphAlgorithms Multilabel Chart ImageStatistics ContourModel SurfaceInterpolation Segmentation PlanarFigureSegmentation QtWidgets QtWidgetsExt ImageStatisticsUI SegmentationUI MatchPointRegistration MatchPointRegistrationUI Classification GPGPU OpenIGTLink IGTBase IGT CameraCalibration OpenCL OpenCVVideoSupport QtOverlays ToFHardware ToFProcessing ToFUI PhotoacousticsHardware PhotoacousticsAlgorithms PhotoacousticsLib US USUI DicomUI Remeshing Python QtPython Persistence OpenIGTLinkUI IGTUI DicomRT RTUI IOExt XNAT TubeGraph BiophotonicsHardware # TumorInvasionAnalysis BoundingShape RenderWindowManager RenderWindowManagerUI SemanticRelations SemanticRelationsUI CEST BasicImageProcessing ModelFit ModelFitUI Pharmacokinetics PharmacokineticsUI DICOMPM REST RESTService ) if(MITK_ENABLE_PIC_READER) list(APPEND MITK_MODULES IpPicSupportIO) endif() diff --git a/Modules/RDF/CMakeLists.txt b/Modules/RDF/CMakeLists.txt deleted file mode 100644 index 7cfc957572..0000000000 --- a/Modules/RDF/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -mitk_create_module( - DEPENDS MitkCore - PACKAGE_DEPENDS Redland -) - -add_subdirectory(Testing) diff --git a/Modules/RDF/Documentation/Doxygen/Modules.dox b/Modules/RDF/Documentation/Doxygen/Modules.dox deleted file mode 100644 index bffddac499..0000000000 --- a/Modules/RDF/Documentation/Doxygen/Modules.dox +++ /dev/null @@ -1,8 +0,0 @@ -/** - \defgroup MitkRDFModule MitkRDF - \ingroup MITKModules - - \brief MITK RDF Library - - This module provides classes to work with RDF concepts and data formats. -*/ diff --git a/Modules/RDF/Testing/CMakeLists.txt b/Modules/RDF/Testing/CMakeLists.txt deleted file mode 100644 index 42638c56cd..0000000000 --- a/Modules/RDF/Testing/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -mitk_create_module_tests() diff --git a/Modules/RDF/Testing/files.cmake b/Modules/RDF/Testing/files.cmake deleted file mode 100644 index ce71323c63..0000000000 --- a/Modules/RDF/Testing/files.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# tests with no extra command line parameter -set(MODULE_TESTS - mitkRdfUriTest.cpp - mitkRdfNodeTest.cpp - mitkRdfTripleTest.cpp - mitkRdfStoreTest.cpp -) - -set(RESOURCE_FILES -) diff --git a/Modules/RDF/Testing/mitkRdfNodeTest.cpp b/Modules/RDF/Testing/mitkRdfNodeTest.cpp deleted file mode 100644 index 51021f0ad9..0000000000 --- a/Modules/RDF/Testing/mitkRdfNodeTest.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#include "mitkTestingMacros.h" -#include -#include - -#include "mitkRdfNode.h" - -class mitkRdfNodeTestSuite : public mitk::TestFixture -{ - CPPUNIT_TEST_SUITE(mitkRdfNodeTestSuite); - - // List of Tests - MITK_TEST(TestInvalidNode); - MITK_TEST(TestUriNode); - MITK_TEST(TestLiteralNode); - MITK_TEST(TestLiteralNodeWithDataType); - MITK_TEST(TestValueOfNode); - MITK_TEST(TestTypeOfNode); - MITK_TEST(TestDatatypeOfNode); - - CPPUNIT_TEST_SUITE_END(); - -private: - - mitk::RdfNode emptyNode; - mitk::RdfUri base; - -public: - - void setUp() override - { - emptyNode = mitk::RdfNode(); - base = mitk::RdfUri("http://mitk.org/wiki/MITK/data/BaseOntology.rdf#"); - } - - void tearDown() override - { - } - - // Test functions - - void TestInvalidNode() - { - mitk::RdfNode anotherInvalidNode("", mitk::RdfUri()); - anotherInvalidNode.SetType(mitk::RdfNode::NOTHING); - CPPUNIT_ASSERT(emptyNode == anotherInvalidNode); - } - - void TestUriNode() - { - mitk::RdfNode uriNode = mitk::RdfNode(base); - emptyNode.SetValue(base.ToString()); - emptyNode.SetType(mitk::RdfNode::URI); - emptyNode.SetDatatype(mitk::RdfUri()); - CPPUNIT_ASSERT(uriNode == emptyNode); - } - - void TestLiteralNode() - { - mitk::RdfNode literalNode = mitk::RdfNode("Example"); - emptyNode.SetValue("Example"); - emptyNode.SetType(mitk::RdfNode::LITERAL); - emptyNode.SetDatatype(mitk::RdfUri()); - CPPUNIT_ASSERT(literalNode == emptyNode); - } - - void TestLiteralNodeWithDataType() - { - mitk::RdfNode literalNode = mitk::RdfNode("MyTest", mitk::RdfUri("xsd:string")); - emptyNode.SetValue("MyTest"); - emptyNode.SetType(mitk::RdfNode::LITERAL); - emptyNode.SetDatatype(mitk::RdfUri("xsd:string")); - CPPUNIT_ASSERT(literalNode == emptyNode); - } - - void TestValueOfNode() - { - mitk::RdfNode node(base); - CPPUNIT_ASSERT(base.ToString().compare(node.GetValue()) == 0); - } - - void TestTypeOfNode() - { - mitk::RdfNode node(base); - CPPUNIT_ASSERT(node.GetType() == mitk::RdfNode::URI); - } - - void TestDatatypeOfNode() - { - mitk::RdfNode literalNodeAgain = mitk::RdfNode("42", mitk::RdfUri("xsd:integer")); - CPPUNIT_ASSERT(literalNodeAgain.GetDatatype() == mitk::RdfUri("xsd:integer")); - } -}; - -MITK_TEST_SUITE_REGISTRATION(mitkRdfNode) diff --git a/Modules/RDF/Testing/mitkRdfStoreTest.cpp b/Modules/RDF/Testing/mitkRdfStoreTest.cpp deleted file mode 100644 index 63c40a6781..0000000000 --- a/Modules/RDF/Testing/mitkRdfStoreTest.cpp +++ /dev/null @@ -1,159 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#include "mitkTestingMacros.h" -#include -#include - -#include "mitkRdfStore.h" -#include - -#include - -class mitkRdfStoreTestSuite : public mitk::TestFixture -{ - CPPUNIT_TEST_SUITE(mitkRdfStoreTestSuite); - - // List of Tests - MITK_TEST(TestAddPrefix); - MITK_TEST(TestAddTriple); - MITK_TEST(TestRemoveTriple); - MITK_TEST(TestQueryTriple); - MITK_TEST(TestSaveStore); - MITK_TEST(TestImportStore); - - MITK_TEST(ExecuteBooleanQuery_PatternHasSolution_ReturnsTrue); - MITK_TEST(ExecuteBooleanQuery_PatternDoesNotHaveSolution_ReturnsFalse); - MITK_TEST(ExecuteBooleanQuery_MalformedBooleanQuery_ThrowsException); - MITK_TEST(ExecuteBooleanQuery_NonBooleanQuery_ThrowsException); - - CPPUNIT_TEST_SUITE_END(); - -private: - - mitk::RdfStore store; - mitk::RdfTriple triple; - -public: - - void setUp() override - { - store.SetBaseUri(mitk::RdfUri("http://mitk.org/wiki/MITK/data/instances.rdf#")); - store.AddPrefix("dcterms", mitk::RdfUri("http://purl.org/dc/terms/")); - store.AddPrefix("mitk", mitk::RdfUri("http://mitk.org/wiki/MITK/data/BaseOntology.rdf#")); - triple = mitk::RdfTriple(mitk::RdfNode(mitk::RdfUri("http://mitk.org/wiki/MITK/data/instances.rdf#i0012")), - mitk::RdfNode(mitk::RdfUri("dcterms:title")), mitk::RdfNode("TestImage")); - } - - void tearDown() override - { - store.CleanUp(); - } - - // Test functions - - void TestAddPrefix() - { - mitk::RdfUri fma = mitk::RdfUri("http://www.bioontology.org/projects/ontologies/fma/"); - store.AddPrefix("fma", fma); - std::map testMap = store.GetPrefixes(); - CPPUNIT_ASSERT(testMap.find("fma") != testMap.end()); - } - - void TestAddTriple() - { - store.Add(triple); - CPPUNIT_ASSERT(store.Contains(triple)); - } - - void TestRemoveTriple() - { - store.Add(triple); - store.Remove(triple); - CPPUNIT_ASSERT(!store.Contains(triple)); - } - - void TestQueryTriple() - { - store.Add(triple); - std::string query = "SELECT ?x WHERE { ?x ?z ?y . }"; - mitk::RdfStore::ResultMap queryResult = store.ExecuteTupleQuery(query); - std::list list = queryResult["x"]; - CPPUNIT_ASSERT(triple.GetTripleSubject() == list.back()); - } - - void TestSaveStore() - { - store.Add(triple); - - std::ofstream tmpStream; - const std::string tmpFileName = mitk::IOUtil::CreateTemporaryFile(tmpStream); - store.Save(tmpFileName); - std::ifstream in(tmpFileName); - std::string s((std::istreambuf_iterator(in)), std::istreambuf_iterator()); - in.close(); - MITK_INFO << s; - tmpStream.close(); - - std::size_t found = s.find(":i0012"); - CPPUNIT_ASSERT(found!=std::string::npos); - } - - void TestImportStore() - { - std::ofstream tmpStream; - const std::string tmpFileName = mitk::IOUtil::CreateTemporaryFile(tmpStream); - const std::string strRDF = "@base . @prefix rdf: . @prefix : <> . @prefix dcterms: . @prefix mitk: . @prefix owl: . @prefix rdfs: . @prefix xsd: . :i0012 'TestImage' ."; - tmpStream << strRDF; - tmpStream.close(); - - store.Import("file:"+tmpFileName); - CPPUNIT_ASSERT(store.Contains(triple)); - } - - void ExecuteBooleanQuery_PatternHasSolution_ReturnsTrue(void) - { - store.Add(triple); - - const std::string query = "ASK { 'TestImage' }"; - - CPPUNIT_ASSERT_EQUAL(true, store.ExecuteBooleanQuery(query)); - } - - void ExecuteBooleanQuery_PatternDoesNotHaveSolution_ReturnsFalse(void) - { - const std::string query = "ASK { 'TestImage' }"; - - CPPUNIT_ASSERT_EQUAL(false, store.ExecuteBooleanQuery(query)); - } - - void ExecuteBooleanQuery_MalformedBooleanQuery_ThrowsException(void) - { - const std::string query = "ASK { TestImage }"; - - CPPUNIT_ASSERT_THROW(store.ExecuteBooleanQuery(query), mitk::Exception); - } - - void ExecuteBooleanQuery_NonBooleanQuery_ThrowsException(void) - { - const std::string query = "SELECT ?x ?y ?z WHERE { ?x ?y ?z }"; - - CPPUNIT_ASSERT_THROW(store.ExecuteBooleanQuery(query), mitk::Exception); - } - -}; - -MITK_TEST_SUITE_REGISTRATION(mitkRdfStore) diff --git a/Modules/RDF/Testing/mitkRdfTripleTest.cpp b/Modules/RDF/Testing/mitkRdfTripleTest.cpp deleted file mode 100644 index ee92ec3ec1..0000000000 --- a/Modules/RDF/Testing/mitkRdfTripleTest.cpp +++ /dev/null @@ -1,120 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#include "mitkTestingMacros.h" -#include -#include - -#include "mitkRdfTriple.h" - -class mitkRdfTripleTestSuite : public mitk::TestFixture -{ - CPPUNIT_TEST_SUITE(mitkRdfTripleTestSuite); - - // List of Tests - MITK_TEST(TestEmptyTriple); - MITK_TEST(TestObjectTriple); - MITK_TEST(TestDataTriple); - MITK_TEST(TestSubjectOfTriple); - MITK_TEST(TestPredicateOfTriple); - MITK_TEST(TestObjectOfTripleAsObject); - MITK_TEST(TestObjectOfTripleAsData); - - CPPUNIT_TEST_SUITE_END(); - -private: - - mitk::RdfTriple emptyTriple; - mitk::RdfUri seg; - mitk::RdfUri title; - -public: - - void setUp() override - { - emptyTriple = mitk::RdfTriple(); - title = mitk::RdfUri("dcterms:title"); - seg = mitk::RdfUri("http://mitk.org/wiki/MITK/data/instance.rdf#s0001"); - } - - void tearDown() override - { - } - - // Test functions - - void TestEmptyTriple() - { - mitk::RdfTriple anotherTriple = mitk::RdfTriple( - mitk::RdfNode(), mitk::RdfNode(), mitk::RdfNode()); - CPPUNIT_ASSERT(emptyTriple == anotherTriple); - } - - void TestObjectTriple() - { - mitk::RdfUri src = mitk::RdfUri("dcterms:source"); - mitk::RdfUri image = mitk::RdfUri("http://mitk.org/wiki/MITK/data/instance.rdf#i0012"); - mitk::RdfTriple objectTriple = mitk::RdfTriple( - mitk::RdfNode(seg), mitk::RdfNode(src), mitk::RdfNode(image)); - emptyTriple.SetTripleSubject(seg); - emptyTriple.SetTriplePredicate(src); - emptyTriple.SetTripleObject(mitk::RdfNode(image)); - CPPUNIT_ASSERT(emptyTriple == objectTriple); - } - - void TestDataTriple() - { - mitk::RdfTriple dataTriple = mitk::RdfTriple( - mitk::RdfNode(seg), mitk::RdfNode(title), "TestLiver"); - emptyTriple.SetTripleSubject(seg); - emptyTriple.SetTriplePredicate(title); - emptyTriple.SetTripleObject("TestLiver"); - CPPUNIT_ASSERT(emptyTriple == dataTriple); - } - - void TestSubjectOfTriple() - { - mitk::RdfTriple triple = mitk::RdfTriple( - mitk::RdfNode(seg), mitk::RdfNode(title), "KidneyLeft"); - - CPPUNIT_ASSERT(triple.GetTripleSubject() == mitk::RdfNode(seg)); - } - - void TestPredicateOfTriple() - { - mitk::RdfTriple triple = mitk::RdfTriple( - mitk::RdfNode(seg), mitk::RdfNode(title), "KidneyRight"); - CPPUNIT_ASSERT(triple.GetTriplePredicate() == mitk::RdfNode(title)); - } - - void TestObjectOfTripleAsObject() - { - mitk::RdfNode image = mitk::RdfNode( - mitk::RdfUri("http://mitk.org/wiki/MITK/data/instance.rdf#i0012")); - mitk::RdfTriple triple = mitk::RdfTriple( - mitk::RdfNode(seg), mitk::RdfNode(mitk::RdfUri("dcterms:source")), image); - CPPUNIT_ASSERT(triple.GetTripleObject() == image); - } - - void TestObjectOfTripleAsData() - { - mitk::RdfTriple triple = mitk::RdfTriple( - mitk::RdfNode(seg), mitk::RdfNode(mitk::RdfUri("mitk:volumeInMl")), "450"); - CPPUNIT_ASSERT(triple.GetTripleObject() == mitk::RdfNode("450")); - } -}; - -MITK_TEST_SUITE_REGISTRATION(mitkRdfTriple) diff --git a/Modules/RDF/Testing/mitkRdfUriTest.cpp b/Modules/RDF/Testing/mitkRdfUriTest.cpp deleted file mode 100644 index f6f5b80242..0000000000 --- a/Modules/RDF/Testing/mitkRdfUriTest.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#include "mitkTestingMacros.h" -#include -#include - -#include "mitkRdfUri.h" - -class mitkRdfUriTestSuite : public mitk::TestFixture -{ - CPPUNIT_TEST_SUITE(mitkRdfUriTestSuite); - - // List of Tests - MITK_TEST(TestEmptyUri); - MITK_TEST(TestValueOfUri); - MITK_TEST(TestSetUri); - - CPPUNIT_TEST_SUITE_END(); - -private: - - mitk::RdfUri m_EmptyUri; - std::string m_UriText; - mitk::RdfUri m_Uri; - -public: - - void setUp() override - { - // normal URI - m_UriText = "http://mitk.org/wiki/MITK/data/BaseOntology.rdf#"; - m_Uri = mitk::RdfUri(m_UriText); - } - - void tearDown() override - { - } - - // Test functions - - void TestEmptyUri() - { - mitk::RdfUri anotherEmptyUri(""); - CPPUNIT_ASSERT(m_EmptyUri == anotherEmptyUri); - } - - void TestValueOfUri() - { - CPPUNIT_ASSERT(m_Uri.ToString().compare(m_UriText) == 0); - } - - void TestSetUri() - { - mitk::RdfUri newUri; - newUri.SetUri(m_UriText); - CPPUNIT_ASSERT(newUri == m_Uri); - } -}; - -MITK_TEST_SUITE_REGISTRATION(mitkRdfUri) diff --git a/Modules/RDF/files.cmake b/Modules/RDF/files.cmake deleted file mode 100644 index e58ca81787..0000000000 --- a/Modules/RDF/files.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(CPP_FILES - mitkRdfNode.cpp - mitkRdfUri.cpp - mitkRdfTriple.cpp - mitkRdfStore.cpp -) - -SET(H_FILES - mitkRdfNode.h - mitkRdfUri.h - mitkRdfTriple.h - mitkRdfStore.h -) diff --git a/Modules/RDF/mitkRdfNode.cpp b/Modules/RDF/mitkRdfNode.cpp deleted file mode 100644 index a90209d20c..0000000000 --- a/Modules/RDF/mitkRdfNode.cpp +++ /dev/null @@ -1,119 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#include "mitkRdfNode.h" - -#include -#include -#include -#include - -#include - -namespace mitk { - - RdfNode::RdfNode() - : m_Type(NOTHING) - { - } - - RdfNode::RdfNode(RdfUri uri) - : m_Type(URI), m_Value(uri.ToString()) - { - } - - RdfNode::RdfNode(std::string text) - : m_Type(LITERAL), m_Value(text) - { - } - - RdfNode::RdfNode(std::string text, RdfUri dataType) - : m_Type(LITERAL), m_Value(text), m_Datatype(dataType) - { - } - - RdfNode::~RdfNode() - { - } - - void RdfNode::SetType(RdfNode::Type type) - { - m_Type = type; - } - - void RdfNode::SetDatatype(RdfUri dataType) - { - m_Datatype = dataType; - } - - void RdfNode::SetValue(std::string value) - { - m_Value = value; - } - - RdfNode::Type RdfNode::GetType() const - { - return m_Type; - } - - RdfUri RdfNode::GetDatatype() const - { - return m_Datatype; - } - - std::string RdfNode::GetValue() const - { - return m_Value; - } - - bool RdfNode::operator==(const RdfNode &u) const - { - if (this->m_Type != u.m_Type) return false; - if (this->m_Value.compare(u.m_Value) != 0) return false; - if (this->m_Datatype != u.m_Datatype) return false; - return true; - } - - bool RdfNode::operator!=(const RdfNode &u) const - { - return !operator==(u); - } - - // Define outstream of a Node - std::ostream & operator<<(std::ostream &out, const RdfNode &n) - { - switch (n.GetType()) { - case RdfNode::NOTHING: - out << "[]"; - break; - case RdfNode::URI: - if (n.GetValue() == "") { - out << "[empty-uri]"; - } else { - out << "<" << n.GetValue() << ">"; - } - break; - case RdfNode::LITERAL: - out << "\"" << n.GetValue() << "\""; - if (n.GetDatatype() != RdfUri()) out << "^^" << n.GetDatatype(); - break; - case RdfNode::BLANK: - out << "[blank " << n.GetValue() << "]"; - break; - } - return out; - } -} diff --git a/Modules/RDF/mitkRdfNode.h b/Modules/RDF/mitkRdfNode.h deleted file mode 100644 index 8aa6441c5b..0000000000 --- a/Modules/RDF/mitkRdfNode.h +++ /dev/null @@ -1,114 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#ifndef MITKRDFNODE_H -#define MITKRDFNODE_H - -#include - -#include "mitkRdfUri.h" - -#include -#include - -namespace mitk { - /** - * \ingroup MitkRDFModule - */ - class MITKRDF_EXPORT RdfNode - { - public: - - /** - * Enumeration for node types. - */ - enum Type { NOTHING, URI, LITERAL, BLANK }; - - /** - * Construct a empty invalid node. - */ - RdfNode(); - - /** - * Construct a node from type URI which represents a object of the real world. - * @param uri An RdfUri which represents a URI. - */ - RdfNode(RdfUri uri); - - /** - * Construct a node from type LITERAL. - * @param text A std::string which represents a literal. - */ - RdfNode(std::string text); - - /** - * Construct a node from type LITERAL with a specific data type. - * @param text A std::string which represents a literal. - * @param dataType An RdfUri which represents a specific data type. - */ - RdfNode(std::string text, RdfUri dataType); - - virtual ~RdfNode(); - - /** - * Set the type of a Node. - * @param type An RdfNode::Type which represents a type of a node. - */ - void SetType(Type type); - - /** - * Set the data type of a LITERAL Node. - * @param dataType An RdfUri which represents an URI of a specific data type. - */ - void SetDatatype(RdfUri dataType); - - /** - * Set the internal represantation of an URI or a text. - * @param value A std::string which represents an URI or a text. - */ - void SetValue(std::string value); - - /** - * Get the type of a node. - * @return The type of a node. - */ - Type GetType() const; - - /** - * Get the data type of the internal value of a node. - * @return The data type of the internal value of a node. - */ - RdfUri GetDatatype() const; - - /** - * Get the internal value of a node. - * @return The internal value of a node. - */ - std::string GetValue() const; - - bool operator==(const RdfNode &u) const; - bool operator!=(const RdfNode &u) const; - - private: - Type m_Type; - std::string m_Value; - RdfUri m_Datatype; - }; - - MITKRDF_EXPORT std::ostream & operator<<(std::ostream &out, const mitk::RdfNode &n); -} - -#endif diff --git a/Modules/RDF/mitkRdfStore.cpp b/Modules/RDF/mitkRdfStore.cpp deleted file mode 100644 index 9019a088a4..0000000000 --- a/Modules/RDF/mitkRdfStore.cpp +++ /dev/null @@ -1,614 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#include "mitkRdfStore.h" - -#include - -#include - -namespace mitk { - class RdfStorePrivate - { - public: - typedef std::map > ResultMap; - typedef std::map PrefixMap; - - RdfStorePrivate(); - ~RdfStorePrivate(); - - void SetBaseUri(RdfUri uri); - RdfUri GetBaseUri() const; - - void AddPrefix(std::string prefix, RdfUri uri); - PrefixMap GetPrefixes() const; - - void CleanUp(); - - bool Add(RdfTriple triple); - bool Remove(RdfTriple triple); - bool Contains(RdfTriple triple); - - ResultMap ExecuteTupleQuery(const std::string& query) const; - bool ExecuteBooleanQuery(const std::string& query) const; - - void Save(std::string filename, std::string format = ""); - void Import(std::string url, std::string format = ""); - - RdfUri m_BaseUri; - - PrefixMap m_Prefixes; - - librdf_world* m_World; - librdf_storage* m_Storage; - librdf_model* m_Model; - - librdf_statement* RdfTripleToStatement(RdfTriple triple) const; - librdf_node* RdfNodeToLibRdfNode(RdfNode node) const; - librdf_uri* RdfUriToLibRdfUri(RdfUri uri) const; - - RdfTriple StatementToRdfTriple(librdf_statement* statement) const; - RdfNode LibRdfNodeToRdfNode(librdf_node* node) const; - RdfUri LibRdfUriToRdfUri(librdf_uri* uri) const; - - bool CheckComplete(librdf_statement* statement); - - private: - - /** - * Prepends the prefixes to the specified query string. - * - * @param query The query string. - * @return The query string with leading prefixes. - */ - std::string PrependPrefixes(const std::string& query) const; - - }; - - /**************************************************************************** - **************************** mitkRdfStorePrivate **************************** - ****************************************************************************/ - - RdfStorePrivate::RdfStorePrivate() - : m_World(nullptr), m_Storage(nullptr), m_Model(nullptr) - { - // SetUp base prefixes - m_Prefixes["rdf"] = RdfUri("http://www.w3.org/1999/02/22-rdf-syntax-ns#"); - m_Prefixes["rdfs"] = RdfUri("http://www.w3.org/2000/01/rdf-schema#"); - m_Prefixes["xsd"] = RdfUri("http://www.w3.org/2001/XMLSchema#"); - m_Prefixes["owl"] = RdfUri("http://www.w3.org/2002/07/owl#"); - - // SetUp new store - CleanUp(); - } - - RdfStorePrivate::~RdfStorePrivate() - { - if(m_Model) - librdf_free_model(m_Model); - if(m_Storage) - librdf_free_storage(m_Storage); - if(m_World) - librdf_free_world(m_World); - } - - void RdfStorePrivate::SetBaseUri(RdfUri uri) - { - m_BaseUri = uri; - m_Prefixes[""] = RdfUri(m_BaseUri.ToString()); - } - - RdfUri RdfStorePrivate::GetBaseUri() const - { - return m_BaseUri; - } - - void RdfStorePrivate::AddPrefix(std::string prefix, RdfUri uri) - { - m_Prefixes[prefix] = uri; - } - - RdfStorePrivate::PrefixMap RdfStorePrivate::GetPrefixes() const - { - return m_Prefixes; - } - - void RdfStorePrivate::CleanUp() - { - // CleanUp old Store if there is one - if(m_Model) - librdf_free_model(m_Model); - if(m_Storage) - librdf_free_storage(m_Storage); - if(m_World) - librdf_free_world(m_World); - - // SetUp new Store - m_World = librdf_new_world(); - librdf_world_open(m_World); - - m_Storage = librdf_new_storage(m_World, "memory", nullptr, nullptr); - - if(!m_Storage) - { - mitkThrow() << "RDF Library Error"; - } - - m_Model = librdf_new_model(m_World, m_Storage, nullptr); - - if(!m_Model) - { - mitkThrow() << "RDF Library Error"; - } - } - - bool RdfStorePrivate::Add(RdfTriple triple) - { - librdf_statement* statement = RdfTripleToStatement(triple); - - if (!CheckComplete(statement)) - { - librdf_free_statement(statement); - return false; - } - - // Store already contains statement - if (Contains(triple)) return true; - - if (librdf_model_add_statement(m_Model, statement) != 0) { - librdf_free_statement(statement); - return false; - } - else - { - librdf_free_statement(statement); - return true; - } - } - - bool RdfStorePrivate::Remove(RdfTriple triple) - { - librdf_statement* statement = RdfTripleToStatement(triple); - - if (!CheckComplete(statement)) - { - librdf_free_statement(statement); - return false; - } - - // Store does not contain statement - if (!Contains(triple)) return true; - - if (librdf_model_remove_statement(m_Model, statement) != 0) { - librdf_free_statement(statement); - return false; - } - else - { - librdf_free_statement(statement); - return true; - } - return false; - } - - bool RdfStorePrivate::Contains(RdfTriple triple) - { - librdf_statement* statement = RdfTripleToStatement(triple); - - // if 0 there is no triple - if (librdf_model_contains_statement(m_Model, statement) == 0) { - librdf_free_statement(statement); - return false; - } - else - { - librdf_free_statement(statement); - return true; - } - return false; - } - - RdfStorePrivate::ResultMap RdfStorePrivate::ExecuteTupleQuery(const std::string& query) const - { - RdfStorePrivate::ResultMap resultMap; - - const std::string completeQuery = this->PrependPrefixes(query); - - librdf_query* rdfQuery = librdf_new_query(m_World, "sparql", nullptr, (const unsigned char*) completeQuery.c_str(), nullptr); - - if (!rdfQuery) return resultMap; - - librdf_query_results* results = librdf_query_execute(rdfQuery, m_Model); - - if (!results) - { - librdf_free_query(rdfQuery); - return resultMap; - } - - if (!librdf_query_results_is_bindings(results)) - { - librdf_free_query_results(results); - librdf_free_query(rdfQuery); - return resultMap; - } - - while (!librdf_query_results_finished(results)) - { - int count = librdf_query_results_get_bindings_count(results); - - for (int i = 0; i < count; ++i) - { - const char *name = librdf_query_results_get_binding_name(results, i); - - if (!name) continue; - - std::string key = name; - - std::list list; - - if(!resultMap[key].empty()) - { - list = resultMap[key]; - } - - librdf_node *node = librdf_query_results_get_binding_value(results, i); - - list.push_back(LibRdfNodeToRdfNode(node)); - - resultMap[key] = list; - } - - librdf_query_results_next(results); - } - - librdf_free_query_results(results); - librdf_free_query(rdfQuery); - - return resultMap; - } - - bool RdfStorePrivate::ExecuteBooleanQuery(const std::string& query) const - { - const std::string completeQuery = this->PrependPrefixes(query); - - librdf_query* rdfQuery = librdf_new_query(m_World, "sparql", nullptr, (const unsigned char*) completeQuery.c_str(), nullptr); - - if (!rdfQuery) - { - mitkThrow() << "failed to create query object"; - } - - librdf_query_results* results = librdf_query_execute(rdfQuery, m_Model); - - if (!results) - { - librdf_free_query(rdfQuery); - mitkThrow() << "SPARQL syntax error"; - } - - if (!librdf_query_results_is_boolean(results)) - { - librdf_free_query_results(results); - librdf_free_query(rdfQuery); - - mitkThrow() << "unexpected result type error: tried to request a boolean result with a non-boolean query"; - } - - int rawResult = librdf_query_results_get_boolean(results); - - bool booleanResult; - - if (rawResult > 0) - { - booleanResult = true; - } - else if (rawResult == 0) - { - booleanResult = false; - } - else - { - mitkThrow() << "error while retrieving result"; - } - - librdf_free_query_results(results); - librdf_free_query(rdfQuery); - - return booleanResult; - } - - void RdfStorePrivate::Save(std::string filename, std::string format) - { - if (format == "") format = "turtle"; - - librdf_uri* baseUri = RdfUriToLibRdfUri(m_BaseUri); - - librdf_serializer* s = librdf_new_serializer(m_World, format.c_str(), nullptr, nullptr); - - if(!s) - { - mitkThrow() << "RDF Library Error"; - } - - for (PrefixMap::const_iterator i = m_Prefixes.begin(); i != m_Prefixes.end(); i++) - { - librdf_serializer_set_namespace(s, RdfUriToLibRdfUri(i->second), i->first.c_str()); - } - - FILE* f = fopen(filename.c_str(), "w+"); - - librdf_serializer_serialize_model_to_file_handle(s, f, baseUri, m_Model); - - librdf_free_serializer(s); - librdf_free_uri(baseUri); - fclose(f); - } - - void RdfStorePrivate::Import(std::string url, std::string format) - { - std::string baseUri = m_BaseUri.ToString(); - - if (baseUri.empty()) - { - baseUri = url; - SetBaseUri(RdfUri(baseUri)); - } - - if (format == "") format= "turtle"; - - // Redland uses file paths like file:YOURPATH ( Example: file:D:/home/readme.txt ) - librdf_uri* uri = librdf_new_uri(m_World, (const unsigned char*) url.c_str()); - - librdf_uri* libRdfBaseUri = librdf_new_uri(m_World, (const unsigned char*) baseUri.c_str()); - - librdf_parser* p = librdf_new_parser(m_World, format.c_str(), nullptr, nullptr); - - if(!p) - { - mitkThrow() << "RDF Library Error"; - } - - if (librdf_parser_parse_into_model(p, uri, libRdfBaseUri, m_Model) != 0 ) - { - librdf_free_parser(p); - MITK_ERROR << "Parsing into Model failed."; - return; - } - - int namespaces = librdf_parser_get_namespaces_seen_count(p); - - for (int i = 0; i < namespaces; i++) { - const char* prefixChar = librdf_parser_get_namespaces_seen_prefix(p, i); - - if ( !prefixChar ) continue; - - std::string prefix = prefixChar; - RdfUri uri = LibRdfUriToRdfUri(librdf_parser_get_namespaces_seen_uri(p, i)); - - if (uri == RdfUri()) return; - - RdfStorePrivate::PrefixMap::iterator it = m_Prefixes.find(prefix); - - // map iterator is equal to iterator-end so it is not already added - if (it == m_Prefixes.end()) { - AddPrefix(prefix, uri); - } - } - librdf_free_parser(p); - } - - bool RdfStorePrivate::CheckComplete(librdf_statement* statement) - { - if (librdf_statement_is_complete(statement) != 0) return true; - else return false; - } - - librdf_statement* RdfStorePrivate::RdfTripleToStatement(RdfTriple triple) const - { - librdf_node* subject = RdfNodeToLibRdfNode(triple.GetTripleSubject()); - librdf_node* predicate = RdfNodeToLibRdfNode(triple.GetTriplePredicate()); - librdf_node* object = RdfNodeToLibRdfNode(triple.GetTripleObject()); - - librdf_statement* statement = librdf_new_statement_from_nodes(m_World, subject, predicate, object); - if(!statement) return nullptr; - return statement; - } - - librdf_node* RdfStorePrivate::RdfNodeToLibRdfNode(RdfNode node) const - { - librdf_node* newNode = nullptr; - - switch (node.GetType()) - { - case RdfNode::NOTHING: - break; - case RdfNode::BLANK: - newNode = librdf_new_node_from_blank_identifier(m_World, (const unsigned char*) node.GetValue().c_str()); - break; - case RdfNode::LITERAL: - { - if (node.GetDatatype() != RdfUri()) - { - librdf_uri* typeUri = RdfUriToLibRdfUri(node.GetDatatype()); - newNode = librdf_new_node_from_typed_literal(m_World, (const unsigned char*) node.GetValue().c_str(), nullptr, typeUri); - } - else - { - newNode = librdf_new_node_from_literal(m_World, (const unsigned char*) node.GetValue().c_str(), nullptr, 0); - } - } - break; - case RdfNode::URI: - newNode = librdf_new_node_from_uri( m_World, librdf_new_uri(m_World, (const unsigned char*) node.GetValue().c_str()) ); - break; - default: - break; - } - return newNode; - } - - librdf_uri* RdfStorePrivate::RdfUriToLibRdfUri(RdfUri uri) const - { - librdf_uri* libUri = librdf_new_uri(m_World, (const unsigned char*) uri.ToString().c_str()); - if (!libUri) return nullptr; - return libUri; - } - - RdfTriple RdfStorePrivate::StatementToRdfTriple(librdf_statement* statement) const - { - librdf_node *subject = librdf_statement_get_subject(statement); - librdf_node *predicate = librdf_statement_get_predicate(statement); - librdf_node *object = librdf_statement_get_object(statement); - - RdfTriple triple(LibRdfNodeToRdfNode(subject), - LibRdfNodeToRdfNode(predicate), - LibRdfNodeToRdfNode(object)); - - return triple; - } - - RdfNode RdfStorePrivate::LibRdfNodeToRdfNode(librdf_node* node) const - { - RdfNode mitkNode; - - if (!node) return mitkNode; - - if (librdf_node_is_resource(node)) - { - mitkNode.SetType(RdfNode::URI); - librdf_uri *uri = librdf_node_get_uri(node); - mitkNode.SetValue(LibRdfUriToRdfUri(uri).ToString()); - } - else if (librdf_node_is_literal(node)) - { - mitkNode.SetType(RdfNode::LITERAL); - std::string value = (const char*) librdf_node_get_literal_value(node); - if (!value.empty()) mitkNode.SetValue(value); - librdf_uri* typeUri = librdf_node_get_literal_value_datatype_uri(node); - if (typeUri) mitkNode.SetDatatype(LibRdfUriToRdfUri(typeUri)); - } - else if (librdf_node_is_blank(node)) - { - mitkNode.SetType(RdfNode::BLANK); - std::string str = (const char*) librdf_node_get_blank_identifier(node); - if (!str.empty()) mitkNode.SetValue(str); - } - return mitkNode; - } - - RdfUri RdfStorePrivate::LibRdfUriToRdfUri(librdf_uri* uri) const - { - std::string str = (const char*) librdf_uri_as_string(uri); - if (!str.empty()) return RdfUri(str); - - return RdfUri(); - } - - std::string RdfStorePrivate::PrependPrefixes(const std::string& query) const - { - std::string completeQuery; - - for (PrefixMap::const_iterator i = m_Prefixes.begin(); i != m_Prefixes.end(); i++) - { - completeQuery += "PREFIX " + i->first + ": " + "<" + i->second.ToString() + "> "; - } - - return completeQuery += query; - } - - /**************************************************************************** - ******************************* mitkRdfStore ******************************** - ****************************************************************************/ - - typedef std::map > ResultMap; - typedef std::map PrefixMap; - - RdfStore::RdfStore() - :d(new RdfStorePrivate) - { - } - - RdfStore::~RdfStore() - { - delete d; - } - - void RdfStore::SetBaseUri(RdfUri uri) - { - d->SetBaseUri(uri); - } - - RdfUri RdfStore::GetBaseUri() const - { - return d->GetBaseUri(); - } - - void RdfStore::AddPrefix(std::string prefix, RdfUri uri) - { - d->AddPrefix(prefix, uri); - } - - PrefixMap RdfStore::GetPrefixes() const - { - return d->GetPrefixes(); - } - - void RdfStore::CleanUp() - { - d->CleanUp(); - } - - bool RdfStore::Add(RdfTriple triple) - { - return d->Add(triple); - } - - bool RdfStore::Remove(RdfTriple triple) - { - return d->Remove(triple); - } - - bool RdfStore::Contains(RdfTriple triple) - { - return d->Contains(triple); - } - - ResultMap RdfStore::Query(const std::string& query) const - { - return d->ExecuteTupleQuery(query); - } - - ResultMap RdfStore::ExecuteTupleQuery(const std::string& query) const - { - return d->ExecuteTupleQuery(query); - } - - bool RdfStore::ExecuteBooleanQuery(const std::string& query) const - { - return d->ExecuteBooleanQuery(query); - } - - void RdfStore::Save(std::string filename, std::string format) - { - d->Save(filename, format); - } - - void RdfStore::Import(std::string url, std::string format) - { - d->Import(url, format); - } -} // end of namespace mitk diff --git a/Modules/RDF/mitkRdfStore.h b/Modules/RDF/mitkRdfStore.h deleted file mode 100644 index 5e383b651e..0000000000 --- a/Modules/RDF/mitkRdfStore.h +++ /dev/null @@ -1,146 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#ifndef MITKRDFSTORE_H -#define MITKRDFSTORE_H - -#include -#include -#include - -#include "mitkRdfTriple.h" -#include - -namespace mitk { - class RdfStorePrivate; - - /** - * \ingroup MitkRDFModule - */ - class MITKRDF_EXPORT RdfStore - { - public: - - typedef std::map > ResultMap; - typedef std::map PrefixMap; - - /** - * Construct a new triplestore. - */ - RdfStore(); - - /** - * Destruct a triplestore. - */ - ~RdfStore(); - - /** - * Set the base URI of the triplestore. - * @param uri An URI which is the base for the triplestore and for new nodes. - */ - void SetBaseUri(RdfUri uri); - - /** - * Get the base URI of the triplestore. - */ - RdfUri GetBaseUri() const; - - /** - * Add a new prefix which represents an URI as an abbreviation to the triplestore. - * @param prefix The short form of an URI. - * @param uri The full form of an URI. - */ - void AddPrefix(std::string prefix, RdfUri uri); - - /** - * Get a Map with all prefixes of the triplestore. - * @return A Map with all Prefixes of the RdfStore. - */ - PrefixMap GetPrefixes() const; - - /** - * Clean up the triplestore to the state of a new store. - */ - void CleanUp(); - - /** - * Add a new triple to the triplestore. - * Checks if the triplestore contains the triple. - * @param triple A triple. - * @return If the triple is successfully added or if the triplestore already contains the triple, true will be returned. If none of the previous options happen, false will be returned. - */ - bool Add(RdfTriple triple); - - /** - * Remove a triple from the triplestore. - * Checks if the triplestore contains the triple. - * @param triple A triple. - * @return If the triple is successfully removed or if the triplestore doesn't contain the triple, true will be returned. If none of the previous options happen, false will be returned. - */ - bool Remove(RdfTriple triple); - - /** - * Checks if the triplestore contains the triple. - * @param triple A triple. - * @return If the triplestore contains the triple, true will be returned. Otherwise, false will be returned. - */ - bool Contains(RdfTriple triple); - - /** - * Queries over the triplestore with the given SPARQL query. - * @param query A std:string which stands for a SPARQL query text. - * @return The result of the query will be returned as a map of keys with their values as lists of nodes. - * @deprecatedSince{2016_03} Use mitk::RdfStore::ExecuteTupleQuery() instead. - */ - DEPRECATED(ResultMap Query(const std::string& query) const); - - /** - * Queries over the triplestore with the given SPARQL query. - * @param query A std:string which stands for a SPARQL query text. - * @return The result of the query will be returned as a map of keys with their values as lists of nodes. - */ - ResultMap ExecuteTupleQuery(const std::string& query) const; - - /** - * Tests whether or not the specified query pattern has a solution. - * @param query The SPARQL query string in ASK form. - * @return True if query pattern has a solution, otherwise false. - * @throws mitk::Exception This exception is thrown if one of the following errors occur: - * (1) failure on query object creation, (2) SPARQL syntax error, - * (3) trying to execute a non-boolean query, (4) error while retrieving execution result - */ - bool ExecuteBooleanQuery(const std::string& query) const; - - /** - * Saves the current state of the triplestore in a file. The currently supported formats are: "ntriples", "turtle"(default), "nquads". - * @param filename A full filepath to the lokal storage. - * @param format One of the supported formats. Default: "turtle". - */ - void Save(std::string filename, std::string format = ""); - - /** - * Imports the state of the triplestore of an URL (URI). - * @param filename A full filepath to the lokal storage or http address as URL. A lokal file path has to look like "file:YOURPATH" ( Example: file:D:/home/readme.txt ). - * @param format The current supported formats are: "turtle" (default), "ntriples", "nquads". - */ - void Import(std::string url, std::string format = ""); - - private: - RdfStorePrivate* d; - }; -} - -#endif // MITKRDFSTORE_H diff --git a/Modules/RDF/mitkRdfTriple.cpp b/Modules/RDF/mitkRdfTriple.cpp deleted file mode 100644 index 81f7170e27..0000000000 --- a/Modules/RDF/mitkRdfTriple.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#include "mitkRdfTriple.h" - -#include - -namespace mitk { - RdfTriple::RdfTriple() - { - } - - RdfTriple::RdfTriple(RdfNode subject, RdfNode predicate, RdfNode object) - : m_Subject(subject), m_Predicate(predicate), m_Object(object) - { - } - - RdfTriple::RdfTriple(RdfNode subject, RdfNode property, std::string value) - : m_Subject(subject), m_Predicate(property), m_Object(RdfNode(value)) - { - } - - RdfTriple::~RdfTriple() - { - } - - void RdfTriple::SetTripleSubject(RdfNode subject) - { - m_Subject = subject; - } - - void RdfTriple::SetTriplePredicate(RdfNode predicate) - { - m_Predicate = predicate; - } - - void RdfTriple::SetTripleObject(RdfNode object) - { - m_Object = object; - } - - void RdfTriple::SetTripleObject(std::string text) - { - mitk::RdfNode object = mitk::RdfNode(text); - m_Object = object; - } - - RdfNode RdfTriple::GetTripleSubject() const - { - return m_Subject; - } - - RdfNode RdfTriple::GetTriplePredicate() const - { - return m_Predicate; - } - - RdfNode RdfTriple::GetTripleObject() const - { - return m_Object; - } - - bool RdfTriple::operator==(const RdfTriple &u) const - { - if (this->m_Subject != u.m_Subject) return false; - if (this->m_Predicate != m_Predicate) return false; - if (this->m_Object != u.m_Object) return false; - return true; - } - - bool RdfTriple::operator!=(const RdfTriple &u) const - { - return !operator==(u); - } - - // Define outstream of a Triple - std::ostream & operator<<(std::ostream &out, const RdfTriple &t) - { - return out << "( " << t.GetTripleSubject() << " " << t.GetTriplePredicate() << " " << t.GetTripleObject() << " )"; - } -} // end of namespace mitk diff --git a/Modules/RDF/mitkRdfTriple.h b/Modules/RDF/mitkRdfTriple.h deleted file mode 100644 index ba52e14125..0000000000 --- a/Modules/RDF/mitkRdfTriple.h +++ /dev/null @@ -1,109 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#ifndef MITKRDFTRIPLE_H -#define MITKRDFTRIPLE_H - -#include - -#include "mitkRdfNode.h" - -namespace mitk { - /** - * \ingroup MitkRDFModule - */ - class MITKRDF_EXPORT RdfTriple - { - public: - - /** - * Construct a empty invalid triple. - */ - RdfTriple(); - - /** - * Construct a normal triple with two nodes and an object property node between. - * @param subject A node. - * @param predicate A node which represents an object property. - * @param object A node. - */ - RdfTriple(RdfNode subject, RdfNode predicate, RdfNode object); - - /** - * Construct a normal triple with a node, a data property and a value. - * @param subject A node. - * @param predicate A node which represents a data property. - * @param value A text value. - */ - RdfTriple(RdfNode subject, RdfNode property, std::string value); - - virtual ~RdfTriple(); - - /** - * Set the subject of a triple. - * @param subject A node from type URI or BLANK. - */ - void SetTripleSubject(RdfNode subject); - - /** - * Set the predicate of a triple. - * @param predicate A node from type URI which can represent an object property or a data property. - */ - void SetTriplePredicate(RdfNode predicate); - - /** - * Set the object of a triple with an object property. - * @param object A node from type URI, BLANK or LITERAL. - */ - void SetTripleObject(RdfNode object); - - /** - * Set the object of a triple with a data property as text. - * @param text A literal value.. - */ - void SetTripleObject(std::string text); - - /** - * Get the subject of a triple. - * @return The subject of a triple. - */ - RdfNode GetTripleSubject() const; - - /** - * Get the predicate of a triple. - * @return The predicate of a triple. - */ - RdfNode GetTriplePredicate() const; - - /** - * Get the object of a triple. - * @return The object of a triple. - */ - RdfNode GetTripleObject() const; - - bool operator==(const RdfTriple &u) const; - bool operator!=(const RdfTriple &u) const; - - private: - RdfNode m_Subject; - RdfNode m_Predicate; - RdfNode m_Object; - }; - - MITKRDF_EXPORT std::ostream & operator<<(std::ostream &out, const RdfTriple &t); -} - -#endif // MITKRDFTRIPLE_H diff --git a/Modules/RDF/mitkRdfUri.cpp b/Modules/RDF/mitkRdfUri.cpp deleted file mode 100644 index 55aebc512f..0000000000 --- a/Modules/RDF/mitkRdfUri.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#include "mitkRdfUri.h" - -namespace mitk { - RdfUri::RdfUri() - { - } - - RdfUri::RdfUri(std::string uri) - : m_Uri(uri) - { - } - - RdfUri::~RdfUri() - { - } - - std::string RdfUri::ToString() const - { - return m_Uri; - } - - void RdfUri::SetUri(std::string uri) - { - m_Uri = uri; - } - - bool RdfUri::operator==(const RdfUri &u) const - { - if (this->m_Uri.compare(u.m_Uri) != 0) return false; - return true; - } - - bool RdfUri::operator!=(const RdfUri &u) const - { - return !operator==(u); - } -} // end of namespace mitk diff --git a/Modules/RDF/mitkRdfUri.h b/Modules/RDF/mitkRdfUri.h deleted file mode 100644 index 0c4ddcbf2d..0000000000 --- a/Modules/RDF/mitkRdfUri.h +++ /dev/null @@ -1,65 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#ifndef MITKRDFURI_H -#define MITKRDFURI_H - -#include - -#include - -namespace mitk { - /** - * \ingroup MitkRDFModule - */ - class MITKRDF_EXPORT RdfUri - { - public: - - /** - * Construct a empty RdfUri. - */ - RdfUri(); - - /** - * Construct a RdfUri with a value. - * @param uri A std:string which represents the transfer parameter from a URI. - */ - explicit RdfUri(std::string uri); - - virtual ~RdfUri(); - - /** - * Returns the string value of an RdfUri. - * @return Value of RdfUri as std:string. - */ - std::string ToString() const; - - /** - * Set the value of an RdfUri. - * @param uri New value of an RdfUri. - */ - void SetUri(std::string uri); - - bool operator==(const RdfUri &u) const; - bool operator!=(const RdfUri &u) const; - - private: - std::string m_Uri; - }; -} - -#endif // MITKRDFURI_H