Merge pull request #50 from jstienen/jst

Fixing unrecognized multi-curve object and improving CMake config @jstienen Thanks for your contribution
jklimke · Apr 18, 2018 · bba4772 · bba4772
2 parents ee5ee47 + e3c565c
commit bba4772
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(META_VERSION_PATCH       "8")
 
 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

diff --git 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 )

diff --git 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 )

diff --git 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;
 
             }

diff --git 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 )