This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libkml.

commit 20a6432982cb3c81529d3b04e24bcd483636fced
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sun Aug 2 17:40:52 2015 +0200

    Imported Upstream version 1.3.0~rc0
---
 CMakeLists.txt                  |  9 ++++++---
 cmake/External_boost.cmake      |  2 +-
 cmake/External_minizip.cmake    | 17 +----------------
 cmake/External_uriparser.cmake  |  4 ++--
 cmake/FindMiniZip.cmake         | 17 ++++++++---------
 cmake/UriParser_cmake_lists_txt | 36 ++++++++++++++++++------------------
 cmake/libkml.pc.in              | 15 +++++++++++++++
 src/kml/dom/element.h           | 14 +++++++-------
 src/kml/dom/parser_observer.h   |  6 +++---
 src/swig/CMakeLists.txt         | 20 ++++++++++++--------
 10 files changed, 73 insertions(+), 67 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index acd50fd..ebe5825 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,9 +49,6 @@ endif(NOT DEFINED RESOURCE_INSTALL_DIR)
 if(NOT DEFINED LOCALE_INSTALL_DIR)
   set(LOCALE_INSTALL_DIR "${DATA_INSTALL_DIR}/locale/")
 endif(NOT DEFINED LOCALE_INSTALL_DIR)
-if(NOT DEFINED PYTHON_INSTALL_DIR)
-  set(PYTHON_INSTALL_DIR "${LIB_INSTALL_DIR}/python")
-endif(NOT DEFINED PYTHON_INSTALL_DIR)
 if(NOT DEFINED JAVA_INSTALL_DIR)
   set(JAVA_INSTALL_DIR "${DATA_INSTALL_DIR}/java")
 endif(NOT DEFINED JAVA_INSTALL_DIR)
@@ -130,6 +127,12 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
 
 add_subdirectory(src)
 
+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})
+
 if(BUILD_TESTING)
   enable_testing()
   find_package(GoogleTest REQUIRED)
diff --git a/cmake/External_boost.cmake b/cmake/External_boost.cmake
index 183b0c9..6ba1413 100644
--- a/cmake/External_boost.cmake
+++ b/cmake/External_boost.cmake
@@ -1,6 +1,6 @@
 ExternalProject_Add(BOOST
   PREFIX BOOST
-  URL 
http://sourceforge.net/projects/boost/files/boost-binaries/1.50.0/boost_1_50_headers.zip/download
+  URL 
"http://sourceforge.net/projects/boost/files/boost-binaries/1.50.0/boost_1_50_headers.zip/download";
   URL_MD5 1605dc6085cb2dc778ef5ab6c0e59083
   SOURCE_DIR ${INSTALL_DIR}/include/boost
   CONFIGURE_COMMAND ""
diff --git a/cmake/External_minizip.cmake b/cmake/External_minizip.cmake
index 659c4eb..a894176 100644
--- a/cmake/External_minizip.cmake
+++ b/cmake/External_minizip.cmake
@@ -1,9 +1,8 @@
 ExternalProject_Add(MINIZIP
   PREFIX MINIZIP
-  URL 
"https://docs.google.com/uc?export=download&id=0BzqbMPUw_a8uVHF3S2sxX21vNWM";
+  URL 
"http://sourceforge.net/projects/libkml-files/files/1.3.0/minizip.tar.gz/download";
   URL_MD5 d5f74eff74e03e497ea60b2c43623416
   BINARY_DIR ${CMAKE_BINARY_DIR}/MINIZIP/build
-  DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P 
${CMAKE_BINARY_DIR}/download-minizip.cmake
   DEPENDS ${MINIZIP_DEPENDS}
   CMAKE_CACHE_ARGS
   -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR}
@@ -12,18 +11,4 @@ ExternalProject_Add(MINIZIP
   -DZLIB_LIBRARY:FILEPATH=${ZLIB_LIBRARY}
   -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} )
 
-file(WRITE ${CMAKE_BINARY_DIR}/download-minizip.cmake
-  "
- file(DOWNLOAD
-  
\"https://docs.google.com/uc?export=download&id=0BzqbMPUw_a8uVHF3S2sxX21vNWM\";
-  \"${CMAKE_BINARY_DIR}/MINIZIP/src/kml-minizip.tar.gz\"
-  SHOW_PROGRESS
-  EXPECTED_HASH;MD5=d5f74eff74e03e497ea60b2c43623416
-  # no TIMEOUT
-  STATUS status
-  LOG log)
- execute_process(COMMAND \"${CMAKE_COMMAND}\" -E tar xfz 
\"${CMAKE_BINARY_DIR}/MINIZIP/src/kml-minizip.tar.gz\" -C 
\"${CMAKE_BINARY_DIR}/MINIZIP/src\")
- file(RENAME \"${CMAKE_BINARY_DIR}/MINIZIP/src/minizip\" 
\"${CMAKE_BINARY_DIR}/MINIZIP/src/MINIZIP\")
-")
-
 include_project_vars(MINIZIP "libminizip")
diff --git a/cmake/External_uriparser.cmake b/cmake/External_uriparser.cmake
index 950886a..ac21e53 100644
--- a/cmake/External_uriparser.cmake
+++ b/cmake/External_uriparser.cmake
@@ -1,7 +1,7 @@
 ExternalProject_Add(URIPARSER
   PREFIX URIPARSER
-  URL 
"http://sourceforge.net/projects/uriparser/files/Sources/0.8.2/uriparser-0.8.2.tar.bz2/download";
-  URL_MD5 c5cf6b3941d887deb7defc2a86c40f1d
+  URL 
"http://sourceforge.net/projects/uriparser/files/Sources/0.7.5/uriparser-0.7.5.tar.bz2/download";
+  URL_MD5 4f4349085fe5de33bcae8d0f26649593
   BINARY_DIR ${CMAKE_BINARY_DIR}/URIPARSER/build
   DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
   PATCH_COMMAND ${CMAKE_COMMAND} -E copy 
${CMAKE_SOURCE_DIR}/cmake/UriParser_cmake_lists_txt 
${CMAKE_BINARY_DIR}/URIPARSER/src/URIPARSER/CMakeLists.txt
diff --git a/cmake/FindMiniZip.cmake b/cmake/FindMiniZip.cmake
index 12b1a75..47ea46b 100644
--- a/cmake/FindMiniZip.cmake
+++ b/cmake/FindMiniZip.cmake
@@ -6,22 +6,21 @@
 #  MINIZIP_FOUND       - TRUE if minizip is found
 
 
-if (MINIZIP_INCLUDE_DIR)
+if(MINIZIP_INCLUDE_DIR)
   #check cache
   set(MINIZIP_FIND_QUIETLY TRUE)
-endif ()
-
+endif()
 
-if (NOT MINIZIP_INCLUDE_DIR)
-    find_path(MINIZIP_INCLUDE_DIR NAMES unzip.h zip.h PATH_SUFFIXES minizip)
-endif ()
+if(NOT MINIZIP_INCLUDE_DIR)
+  find_path(MINIZIP_INCLUDE_DIR NAMES minizip/unzip.h minizip/zip.h)
+endif()
 
 find_library(MINIZIP_LIBRARY NAMES minizip)
 
-include( FindPackageHandleStandardArgs )
-find_package_handle_standard_args( MINIZIP DEFAULT_MSG MINIZIP_LIBRARY 
MINIZIP_INCLUDE_DIR )
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MINIZIP DEFAULT_MSG MINIZIP_LIBRARY 
MINIZIP_INCLUDE_DIR )
 
-mark_as_advanced( MINIZIP_INCLUDE_DIR MINIZIP_LIBRARY )
+mark_as_advanced(MINIZIP_INCLUDE_DIR MINIZIP_LIBRARY)
 
 if(MINIZIP_FOUND)
   set(MINIZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIR})
diff --git a/cmake/UriParser_cmake_lists_txt b/cmake/UriParser_cmake_lists_txt
index 02fd982..a1987ed 100644
--- a/cmake/UriParser_cmake_lists_txt
+++ b/cmake/UriParser_cmake_lists_txt
@@ -1,24 +1,24 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(SRCS
-  src/UriCommon.c
-  src/UriCommon.h
-  src/UriCompare.c
-  src/UriEscape.c
-  src/UriFile.c
-  src/UriIp4.c
-  src/UriIp4Base.c
-  src/UriIp4Base.h
-  src/UriNormalize.c
-  src/UriNormalizeBase.c
-  src/UriNormalizeBase.h
-  src/UriParse.c
-  src/UriParseBase.c
-  src/UriParseBase.h
-  src/UriQuery.c
-  src/UriRecompose.c
-  src/UriResolve.c
-  src/UriShorten.c)
+  lib/UriCommon.c
+  lib/UriCommon.h
+  lib/UriCompare.c
+  lib/UriEscape.c
+  lib/UriFile.c
+  lib/UriIp4.c
+  lib/UriIp4Base.c
+  lib/UriIp4Base.h
+  lib/UriNormalize.c
+  lib/UriNormalizeBase.c
+  lib/UriNormalizeBase.h
+  lib/UriParse.c
+  lib/UriParseBase.c
+  lib/UriParseBase.h
+  lib/UriQuery.c
+  lib/UriRecompose.c
+  lib/UriResolve.c
+  lib/UriShorten.c)
 
 set(INCS
   include/uriparser/Uri.h
diff --git a/cmake/libkml.pc.in b/cmake/libkml.pc.in
new file mode 100644
index 0000000..377529d
--- /dev/null
+++ b/cmake/libkml.pc.in
@@ -0,0 +1,15 @@
+# pkg-config source file
+
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: LibKML
+Description: Reference implementation of OGC KML 2.2
+Version: @VERSION_STRING@
+##Requires: expat zlib boost
+##minizip 
+Conflicts:
+Libs: -L${libdir} -lkmlbase -lkmldom -lkmlengine -lkmlxsd -lkmlregionator
+Cflags: -I${includedir}
diff --git a/src/kml/dom/element.h b/src/kml/dom/element.h
index 9dc771a..684b2c6 100644
--- a/src/kml/dom/element.h
+++ b/src/kml/dom/element.h
@@ -98,7 +98,7 @@ class Element : public kmlbase::XmlElement {
 
   // A derived class implements this to use with serialization.  See
   // class Serializer for more information.
-  virtual void Serialize(Serializer& serialize) const {}
+  virtual void Serialize(Serializer& /*serialize*/ ) const {}
 
   // A derived class uses this to use with serialization.  The derived
   // class adds its attributes to the given set and passes attributes
@@ -157,11 +157,11 @@ class Element : public kmlbase::XmlElement {
   void MergeXmlns(const kmlbase::Attributes& xmlns);
 
   // Permits polymorphic use of Field methods.
-  virtual bool SetBool(bool* val) { return false; }
-  virtual bool SetDouble(double* val) { return false; }
-  virtual bool SetInt(int* val) { return false; }
-  virtual bool SetEnum(int* val) { return false; }
-  virtual bool SetString(string* val) { return false; }
+  virtual bool SetBool(bool* /*val*/) { return false; }
+  virtual bool SetDouble(double* /*val*/) { return false; }
+  virtual bool SetInt(int* /*val*/) { return false; }
+  virtual bool SetEnum(int* /*val*/) { return false; }
+  virtual bool SetString(string* /*val*/) { return false; }
 
   // Accepts the visitor for this element (this must be overridden for each
   // element type).
@@ -171,7 +171,7 @@ class Element : public kmlbase::XmlElement {
   // This needs to be implemented by subclasses with child elements and must
   // call its parent's implementation first. The default implementation does
   // nothing.
-  virtual void AcceptChildren(VisitorDriver* driver) {
+  virtual void AcceptChildren(VisitorDriver* /*driver*/) {
     /* Inlinable for efficiency */
   }
 
diff --git a/src/kml/dom/parser_observer.h b/src/kml/dom/parser_observer.h
index 08f42c1..fb419b9 100644
--- a/src/kml/dom/parser_observer.h
+++ b/src/kml/dom/parser_observer.h
@@ -44,19 +44,19 @@ class ParserObserver {
   }
 
   // Called after this element is created by the parser.
-  virtual bool NewElement(const ElementPtr& element) {
+  virtual bool NewElement(const ElementPtr& /*element*/ ) {
     return true;  // Default implementation is a NOP: parse continues.
   }
 
   // Called after child is fully constructed before it is added to the parent.
   // A derived class can return false to inhibit adding the child to the 
parent.
   // Returning true permits the parser to add this child to the parent.
-  virtual bool EndElement(const ElementPtr& parent, const ElementPtr& child) {
+  virtual bool EndElement(const ElementPtr& /*parent*/, const ElementPtr& 
/*child*/) {
     return true;
   }
 
   // Called after the given child has been set to the given parent.
-  virtual bool AddChild(const ElementPtr& parent, const ElementPtr& child) {
+  virtual bool AddChild(const ElementPtr& /*parent*/, const ElementPtr& 
/*child*/) {
     return true;  // Default implementation is a NOP: parse continues.
   }
 };
diff --git a/src/swig/CMakeLists.txt b/src/swig/CMakeLists.txt
index 2d5d327..ca554f6 100644
--- a/src/swig/CMakeLists.txt
+++ b/src/swig/CMakeLists.txt
@@ -11,10 +11,12 @@ if(WITH_PYTHON)
 
   include_directories(${PYTHON_INCLUDE_PATH})
 
-  # execute_process(COMMAND
-  #   python -c "from distutils.sysconfig import get_python_lib; print 
get_python_lib(True)"
-  #   OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
-  #   OUTPUT_STRIP_TRAILING_WHITESPACE )
+  if(NOT DEFINED PYTHON_INSTALL_DIR)
+    execute_process(COMMAND
+      ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; 
print get_python_lib(True)"
+      OUTPUT_VARIABLE PYTHON_INSTALL_DIR
+      OUTPUT_STRIP_TRAILING_WHITESPACE )
+  endif(NOT DEFINED PYTHON_INSTALL_DIR)
 
   file(GLOB IFILES "kml*.i")
   foreach(INTERFACE_FILE ${IFILES})
@@ -54,7 +56,7 @@ if(WITH_JAVA)
   include_directories ( ${JAVA_INCLUDE_PATH} ${JNI_INCLUDE_DIRS} )
 
   # Make sure the nested directory structure exists
-  set(JAVA_SOURCE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/com/google/libkml)
+  set(JAVA_SOURCE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/com/googlecode/libkml)
   set(JAVA_BINARY_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build)
   if(NOT EXISTS "${JAVA_SOURCE_DIRECTORY}")
     file(MAKE_DIRECTORY ${JAVA_SOURCE_DIRECTORY})
@@ -73,8 +75,10 @@ if(WITH_JAVA)
     set_source_files_properties(${INTERFACE_FILE} PROPERTIES CPLUSPLUS ON)
     set_source_files_properties(${INTERFACE_FILE} PROPERTIES CMAKE_SWIG_FLAGS 
"-includeall  -DSWIGJAVA")
     set_source_files_properties( 
${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}JAVA_wrap.cxx COMPILE_FLAGS "-w")
-    swig_add_module(${MODULE_NAME}_java java ${INTERFACE_FILE})
-    swig_link_libraries(${MODULE_NAME}_java kmlbase kmlengine kmldom)
+    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})
+
   endforeach()
 
   add_custom_target(LibKML_jar ALL DEPENDS LibKML.jar)
@@ -84,7 +88,7 @@ if(WITH_JAVA)
     COMMENT "Creating jar file..."
     COMMAND ${Java_JAVAC_EXECUTABLE} -d ${JAVA_BINARY_DIRECTORY} 
${JAVA_SOURCE_DIRECTORY}/*.java
     COMMAND ${Java_JAR_EXECUTABLE} cf ${CMAKE_CURRENT_BINARY_DIR}/LibKML.jar 
-C ${JAVA_BINARY_DIRECTORY} com
-    DEPENDS LibKML_jar kmlbase_java kmldom_java kmlengine_java kmlengine 
kmlbase kmldom)
+    DEPENDS LibKML_jar kmlbase_swig_java kmldom_swig_java kmlengine_swig_java)
 
    # Get the location of the extension directory
    string(REGEX REPLACE "include"  "jre/lib/ext" JAVA_EXTENSION_DIR 
${JAVA_INCLUDE_PATH})

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/libkml.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to