This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libkml.
commit e55124005a1ec4ad855d45cc3a76f389b3eaaff1 Author: Bas Couwenberg <[email protected]> Date: Wed Nov 25 01:23:58 2015 +0100 Imported Upstream version 1.3.0~rc1 --- CMakeLists.txt | 24 +++++++++++++++++---- src/kml/base/CMakeLists.txt | 31 +++++++++++++++++++++++---- src/kml/dom/CMakeLists.txt | 50 ++++++++++++++++++++++++++++++++++++++++++- src/kml/engine/CMakeLists.txt | 35 +++++++++++++++++++++++++++++- src/swig/CMakeLists.txt | 5 +---- 5 files changed, 131 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebe5825..eac589b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,12 @@ endif(NOT DEFINED LOCALE_INSTALL_DIR) if(NOT DEFINED JAVA_INSTALL_DIR) set(JAVA_INSTALL_DIR "${DATA_INSTALL_DIR}/java") endif(NOT DEFINED JAVA_INSTALL_DIR) +if(NOT DEFINED JNI_INSTALL_DIR) + set(JNI_INSTALL_DIR "${LIB_INSTALL_DIR}/jni") +endif(NOT DEFINED JNI_INSTALL_DIR) +if(NOT DEFINED PKGCONFIG_INSTALL_DIR) + set(PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig") +endif(NOT DEFINED PKGCONFIG_INSTALL_DIR) # Path to additional CMake modules set(CMAKE_MODULE_PATH @@ -66,9 +72,7 @@ endif() include(ExternalProject) -if(NOT INSTALL_DIR) - set(INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE "install directory " PATH) -endif() +set(INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE "install directory " PATH) set(KMLBASE_LINK_LIBS "" CACHE INTERNAL "KMLBASE_LINK_LIBS") set(KMLBASE_DEPENDS "" CACHE INTERNAL "KMLBASE_DEPENDS") @@ -118,6 +122,18 @@ endif() include_directories(${Boost_INCLUDE_DIRS}) +if(WITH_SWIG) + find_package(SWIG) + if(SWIG_EXECUTABLE) + include(${SWIG_USE_FILE}) + else() + set(WITH_SWIG OFF) + set(WITH_PYTHON OFF) + set(WITH_JAVA OFF) + message(WARNING "Swig not found. Hence bindings will not be built") + endif() +endif() + list(APPEND KMLBASE_LINK_LIBS ${EXPAT_LIBRARY}) list(APPEND KMLBASE_LINK_LIBS ${ZLIB_LIBRARY}) list(APPEND KMLBASE_LINK_LIBS ${MINIZIP_LIBRARY}) @@ -131,7 +147,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/libkml.pc.in" "${CMAKE_BINARY_DIR}/libkml.pc" @ONLY) install(FILES ${CMAKE_BINARY_DIR}/libkml.pc - DESTINATION ${DATA_INSTALL_DIR}) + DESTINATION ${PKGCONFIG_INSTALL_DIR}) if(BUILD_TESTING) enable_testing() diff --git a/src/kml/base/CMakeLists.txt b/src/kml/base/CMakeLists.txt index 3788b20..dc3e9c4 100644 --- a/src/kml/base/CMakeLists.txt +++ b/src/kml/base/CMakeLists.txt @@ -13,12 +13,35 @@ if(WIN32) list(REMOVE_ITEM SRCS "${CMAKE_CURRENT_SOURCE_DIR}/file_posix.cc") else() list(REMOVE_ITEM SRCS "${CMAKE_CURRENT_SOURCE_DIR}/file_win32.cc") + #supress long-long warning for linux + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/zip_file.cc COMPILE_FLAGS "-Wno-long-long") endif() -#supress W-long-long -set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/zip_file.cc COMPILE_FLAGS "-Wno-long-long") - -file(GLOB INCS "${CMAKE_CURRENT_SOURCE_DIR}/*.h") +set(INCS + attributes.h + csv_splitter.h + date_time.h + color32.h + expat_handler.h + expat_handler_ns.h + expat_parser.h + file.h + math_util.h + memory_file.h + mimetypes.h + net_cache.h + referent.h + string_util.h + tempfile.h + time_util.h + util.h + vec3.h + version.h + xml_element.h + xml_file.h + xml_namespaces.h + xmlns.h + zip_file.h) build_target( NAME kmlbase diff --git a/src/kml/dom/CMakeLists.txt b/src/kml/dom/CMakeLists.txt index 345a196..8290dbb 100644 --- a/src/kml/dom/CMakeLists.txt +++ b/src/kml/dom/CMakeLists.txt @@ -1,5 +1,53 @@ file(GLOB SRCS "*.cc" ) -file(GLOB INCS "${CMAKE_CURRENT_SOURCE_DIR}/*.h") +set(INCS + abstractlatlonbox.h + abstractview.h + atom.h + balloonstyle.h + colorstyle.h + container.h + document.h + element.h + extendeddata.h + feature.h + folder.h + geometry.h + hotspot.h + iconstyle.h + kml.h + kml22.h + kml_cast.h + kml_factory.h + kml_funcs.h + kml_ptr.h + kmldom.h + labelstyle.h + linestyle.h + link.h + liststyle.h + model.h + networklink.h + networklinkcontrol.h + object.h + overlay.h + parser.h + parser_observer.h + placemark.h + polystyle.h + region.h + schema.h + snippet.h + style.h + stylemap.h + styleselector.h + substyle.h + timeprimitive.h + gx_timeprimitive.h + gx_tour.h + vec2.h + xal.h + visitor.h + visitor_driver.h) build_target( NAME kmldom diff --git a/src/kml/engine/CMakeLists.txt b/src/kml/engine/CMakeLists.txt index b58bd26..765c6cb 100644 --- a/src/kml/engine/CMakeLists.txt +++ b/src/kml/engine/CMakeLists.txt @@ -1,5 +1,38 @@ file(GLOB SRCS "*.cc" ) -file(GLOB INCS "${CMAKE_CURRENT_SOURCE_DIR}/*.h") + +set(INCS + bbox.h + clone.h + engine_types.h + entity_mapper.h + feature_balloon.h + feature_view.h + feature_visitor.h + find.h + find_xml_namespaces.h + get_link_parents.h + get_links.h + href.h + id_mapper.h + kml_cache.h + kml_file.h + kml_stream.h + kml_uri.h + kmz_cache.h + kmz_file.h + link_util.h + location_util.h + merge.h + object_id_parser_observer.h + old_schema_parser_observer.h + parse_old_schema.h + schema_parser_observer.h + shared_style_parser_observer.h + style_inliner.h + style_merger.h + style_resolver.h + style_splitter.h + update.h) build_target( NAME kmlengine diff --git a/src/swig/CMakeLists.txt b/src/swig/CMakeLists.txt index ca554f6..29c2d05 100644 --- a/src/swig/CMakeLists.txt +++ b/src/swig/CMakeLists.txt @@ -1,6 +1,3 @@ -find_package(SWIG REQUIRED) -include(${SWIG_USE_FILE}) - if(WITH_PYTHON) find_package(PythonLibs REQUIRED) if(NOT PYTHONLIBS_FOUND) @@ -77,7 +74,7 @@ if(WITH_JAVA) set_source_files_properties( ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}JAVA_wrap.cxx COMPILE_FLAGS "-w") swig_add_module(${MODULE_NAME}_swig_java java ${INTERFACE_FILE}) swig_link_libraries(${MODULE_NAME}_swig_java ${MODULE_NAME}) - install(TARGETS ${MODULE_NAME}_swig_java DESTINATION ${JAVA_INSTALL_DIR}) + install(TARGETS ${MODULE_NAME}_swig_java DESTINATION ${JNI_INSTALL_DIR}) endforeach() -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
