Fix example compilation

Oslandia · Nov 29, 2013 · 1f20b40 · 1f20b40
1 parent a12b78c
commit 1f20b40
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -5,7 +5,7 @@ add_subdirectory( CGAL-triangulation2 )
 add_subdirectory( CGAL-polygon_triangulation2 )
 add_subdirectory( SFCGAL-offset )
 
-if ( SFCGAL_BUILD_OSG )
+if ( SFCGAL_WITH_OSG )
 	add_subdirectory( SFCGAL-export-osg )
 	add_subdirectory( SFCGAL-asc2osg )
 	add_subdirectory( SFCGAL-building )

diff --git a/example/SFCGAL-building/main.cpp b/example/SFCGAL-building/main.cpp
@@ -17,14 +17,13 @@
  *   You should have received a copy of the GNU Library General Public
  *   License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include <SFCGAL/all.h>
-
 #include <iostream>
 #include <fstream>
 #include <sstream>
 
 #include <boost/lexical_cast.hpp>
 
+#include <SFCGAL/GeometryCollection.h>
 #include <SFCGAL/Exception.h>
 #include <SFCGAL/io/wkt.h>
 #include <SFCGAL/detail/generator/building.h>
@@ -52,7 +51,9 @@ class InputData {
 };
 
 
+/**
  * @brief read input file
+ */
 std::vector< InputData > readInputFile( const std::string & filename ){
 	std::vector< InputData > result ;
 

diff --git a/example/SFCGAL-export-osg/main.cpp b/example/SFCGAL-export-osg/main.cpp
@@ -19,9 +19,9 @@
  */
 #include <iostream>
 
-#include <SFCGAL/all.h>
 #include <SFCGAL/io/wkt.h>
 
+#include <SFCGAL/MultiPolygon.h>
 #include <SFCGAL/algorithm/translate.h>
 #include <SFCGAL/algorithm/offset.h>
 #include <SFCGAL/algorithm/extrude.h>
@@ -56,7 +56,7 @@ int main(){
 	//buffer & extrude
 	{
 		double radius = 0.7 ;
-		std::auto_ptr< Geometry > buffer( algorithm::offset( *g, radius ) );
+		std::auto_ptr< MultiPolygon > buffer( algorithm::offset( *g, radius ) );
 		algorithm::translate( *buffer, Kernel::Vector_3( 0.0, 0.0, radius ) );
 
 		std::auto_ptr< Geometry > extruded( algorithm::extrude(*buffer,3.0,3.0,3.0) );