[Git][debian-gis-team/libcitygml][upstream] New upstream version 2.0.9

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / libcitygml


Commits:
5c06b056 by Bas Couwenberg at 2018-04-19T16:43:03+02:00
New upstream version 2.0.9
- - - - -


6 changed files:

- CMakeLists.txt
- CMakeModules/FindXerces.cmake
- osgplugin/CMakeLists.txt
- sources/CMakeLists.txt
- sources/src/parser/geometryelementparser.cpp
- test/CMakeLists.txt


Changes:

=====================================
CMakeLists.txt
=====================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,11 +4,11 @@ PROJECT ( libcitygml )
 
 set(META_VERSION_MAJOR       "2")
 set(META_VERSION_MINOR       "0")
-set(META_VERSION_PATCH       "8")
+set(META_VERSION_PATCH       "9")
 
 set(META_VERSION             "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
 
-SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules" )
+SET( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
 
 IF(WIN32)
 
@@ -197,7 +197,7 @@ IF(UNIX AND NOT APPLE)
       set(CPACK_PACKAGE_VERSION_MAJOR         "${META_VERSION_MAJOR}")
       set(CPACK_PACKAGE_VERSION_MINOR         "${META_VERSION_MINOR}")
       set(CPACK_PACKAGE_VERSION_PATCH         "${META_VERSION_PATCH}")
-      set(CPACK_RESOURCE_FILE_LICENSE         "${CMAKE_SOURCE_DIR}/LICENSE")
+      set(CPACK_RESOURCE_FILE_LICENSE         "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
       set(CPACK_PACKAGE_RELOCATABLE           OFF)
 
       # Debian package information


=====================================
CMakeModules/FindXerces.cmake
=====================================
--- a/CMakeModules/FindXerces.cmake
+++ b/CMakeModules/FindXerces.cmake
@@ -29,14 +29,14 @@ ${XERCESC_INCLUDE_DIR}
 )
 
 IF (XERCESC_STATIC)
-FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 xerces-c-3.2 xerces-c-3.1 xerces-c
+FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 xerces-c-3.2 xerces-c-3.1 xerces-c xerces-c_3
  PATHS
  $ENV{XERCESC_LIBRARY_DIR}
  ${XERCESC_LIBRARY_DIR}
  /usr/lib
  /usr/local/lib
 )
-FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_static_3D xerces-c-3.2D xerces-c-3.1D
+FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_static_3D xerces-c-3.2D xerces-c-3.1D xerces-c_3D
  PATHS
  $ENV{XERCESC_LIBRARY_DIR}
  ${XERCESC_LIBRARY_DIR}
@@ -65,13 +65,13 @@ ENDIF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
 
 IF(XERCESC_FOUND)
 
- IF(${XERCESC_LIBRARY_DEBUG})
+ IF(XERCESC_LIBRARY_DEBUG)
    SET(XERCESC_LIBRARIES
           optimized ${XERCESC_LIBRARY}
           debug ${XERCESC_LIBRARY_DEBUG})
-  ELSE(${XERCESC_LIBRARY_DEBUG})
+  ELSE(XERCESC_LIBRARY_DEBUG)
     SET(XERCESC_LIBRARIES	${XERCESC_LIBRARY})
-  ENDIF(${XERCESC_LIBRARY_DEBUG})
+  ENDIF(XERCESC_LIBRARY_DEBUG)
 
 FIND_PATH(XERCESC_XVERHPPPATH NAMES XercesVersion.hpp PATHS
  ${XERCESC_INCLUDE}


=====================================
osgplugin/CMakeLists.txt
=====================================
--- a/osgplugin/CMakeLists.txt
+++ b/osgplugin/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package( OpenSceneGraph REQUIRED osgDB osgViewer osgGA osgUtil osgText)
 
 include_directories(
   ${OPENSCENEGRAPH_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}/sources/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/../sources/include
 )
 
 set( sources ReaderWriterCityGML.cpp )


=====================================
sources/CMakeLists.txt
=====================================
--- a/sources/CMakeLists.txt
+++ b/sources/CMakeLists.txt
@@ -1,7 +1,7 @@
 include(GenerateExportHeader)
 
 IF (NOT DEFINED CMAKE_MODULE_PATH)
-  GET_FILENAME_COMPONENT(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../CMakeModules" ABSOLUTE)
+  GET_FILENAME_COMPONENT(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../CMakeModules" ABSOLUTE)
 ENDIF (NOT DEFINED CMAKE_MODULE_PATH)
 
 SET( target citygml )


=====================================
sources/src/parser/geometryelementparser.cpp
=====================================
--- a/sources/src/parser/geometryelementparser.cpp
+++ b/sources/src/parser/geometryelementparser.cpp
@@ -59,7 +59,7 @@ namespace citygml {
                 geometryTypeIDSet.insert(NodeType::GML_ShellNode.typeID());
                 geometryTypeIDSet.insert(NodeType::GML_PolyhedralSurfaceNode.typeID());
                 geometryTypeIDSet.insert(NodeType::GML_SurfaceNode.typeID());
-                geometryTypeIDSet.insert(NodeType::GML_ShellNode.typeID());
+				geometryTypeIDSet.insert(NodeType::GML_MultiCurveNode.typeID());
                 geometryTypeIDSetInitialized = true;
 
             }


=====================================
test/CMakeLists.txt
=====================================
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,7 +12,7 @@ ELSE( LIBCITYGML_DYNAMIC )
 ENDIF( LIBCITYGML_DYNAMIC )
 
 # INCLUDE_DIRECTORIES( ${CITYGML_INCLUDE_DIR} )
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/sources/include ${CMAKE_BINARY_DIR}/sources/include)
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../sources/include ${CMAKE_BINARY_DIR}/sources/include)
 
 SET( PRG_SRCS citygmltest.cpp )
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/libcitygml/commit/5c06b056050e198a74f3e8db34322f83dbc54325

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/libcitygml/commit/5c06b056050e198a74f3e8db34322f83dbc54325
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180419/724274d1/attachment-0001.html>