Merge branch 'newCompil' into develop

Apps/Benches/CMakeLists.txt

 cmake_minimum_required(VERSION 2.8)
 
-project(examples)
+project(benches)
 
-SET(CMAKE_BUILD_TYPE Release)
+#SET(CMAKE_BUILD_TYPE Release)
 #SET(CMAKE_BUILD_TYPE Debug)
-
-
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
+#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
 
 
 # define includes path
@@ -17,18 +15,18 @@ include_directories(
 )
 
 # define libs path
-IF(WIN32)
-	link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) ${Boost_LIBRARY_DIRS} )
-ELSE(WIN32)
-	link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-ENDIF(WIN32)
+#IF(WIN32)
+#	link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) ${Boost_LIBRARY_DIRS} )
+#ELSE(WIN32)
+#	link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
+#ENDIF(WIN32)
 
 
 add_executable(bench_trav bench_trav.cpp )
-target_link_libraries( bench_trav ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
+target_link_libraries( bench_trav ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
 
 add_executable(bench_remesh bench_remesh.cpp )
-target_link_libraries( bench_remesh ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
+target_link_libraries( bench_remesh ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
 
 add_executable(bench_compact bench_compact.cpp )
-target_link_libraries( bench_compact ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
+target_link_libraries( bench_compact ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )

Apps/CMakeLists.txt

-SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin)
 
 IF (ONELIB)
-	SET(CGoGN_LIBS_R cgogn)
+	SET(CGoGN_LIBS cgogn)
 ELSE (ONELIB)
-	SET(CGoGN_LIBS_R topology algo container utils)
+	SET(CGoGN_LIBS topology algo container utils)
 ENDIF (ONELIB)
 
-IF(WIN32)
-	# libs have same name but in different place in Visual
-	IF (ONELIB)
-		SET(CGoGN_LIBS_D cgogn)
-	ELSE (ONELIB)
-		SET(CGoGN_LIBS_D topology algo container utils)
-	ENDIF (ONELIB)
-ELSE(WIN32)
-	IF (ONELIB)
-		SET(CGoGN_LIBS_D cgognD)
-	ELSE (ONELIB)
-		SET(CGoGN_LIBS_D topologyD algoD containerD utilsD)
-	ENDIF (ONELIB)
-
-	IF (WITH_QT)
-		add_subdirectory(Examples/Debug)
-	ENDIF (WITH_QT)
-ENDIF(WIN32)
-
-IF (WITH_QT)
+
+#IF(${CMAKE_BUILD_TYPE} MATCHES Release|release|RELEASE)
+#	SET(CGoGN_LIBS ${CGoGN_LIBS_R})
+#ELSE()
+#	SET(CGoGN_LIBS ${CGoGN_LIBS_D})
+#ENDIF()
+
+
+#IF(WIN32)
+#	link_directories(${CGoGN_ROOT_DIR}/lib/$(ConfigurationName)
+#	${Boost_LIBRARY_DIRS})
+#ELSE(WIN32)
+
+SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE}	)
+
+link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} )
+
+include_directories(
+	${CGoGN_ROOT_DIR}/include
+	${CGoGN_EXT_INCLUDES})
+
+
+
+IF (COMPILE_SANDBOX)
+	add_subdirectory(SandBox)
+ENDIF()
+
+IF (COMPILE_EXAMPLES AND WITH_QT)
+		add_subdirectory(Examples)
+ENDIF()
+
+IF (COMPILE_TUTOS)
 	add_subdirectory(Tuto)
-	add_subdirectory(Examples/Release)
-	IF (NOT DONOT_COMPILE_SANDBOX)
-		add_subdirectory(SandBox)
-	ENDIF (NOT DONOT_COMPILE_SANDBOX)
-ENDIF (WITH_QT)
+ENDIF()
+
+IF (COMPILE_BENCHES)
+	add_subdirectory(Benches)
+ENDIF()
+
+IF (COMPILE_TESTS)
+	add_subdirectory(Tests)
+ENDIF()
+
 
-add_subdirectory(Tests)
+#IF (WITH_QT)
+#	add_subdirectory(Tuto)
+#	add_subdirectory(Examples)
+#	IF (NOT DONOT_COMPILE_SANDBOX)
+#		add_subdirectory(SandBox)
+#	ENDIF (NOT DONOT_COMPILE_SANDBOX)
+#ENDIF (WITH_QT)
 
-add_subdirectory(Benches)
+#add_subdirectory(Tests)
+#add_subdirectory(Benches)
 
-add_subdirectory(Tuto/Traversals)
-add_subdirectory(Tuto/Attributes)
-add_subdirectory(Tuto/Markers)
-add_subdirectory(Tuto/Boundary)
-add_subdirectory(Tuto/Modelling)
+#add_subdirectory(Tuto/Traversals)
+#add_subdirectory(Tuto/Attributes)
+#add_subdirectory(Tuto/Markers)
+#add_subdirectory(Tuto/Boundary)
+#add_subdirectory(Tuto/Modelling)

Apps/Examples/CMakeLists.txt

+cmake_minimum_required(VERSION 2.8)
+
+project(examples)
+
+#SET(CMAKE_BUILD_TYPE Release)
+#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
+
+
+# define includes path
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+# define libs path
+#IF(WIN32)
+#	link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) ${Boost_LIBRARY_DIRS} )
+#ELSE(WIN32)
+#	link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
+#ENDIF(WIN32)
+
+
+#define exec to compile
+
+QT4_WRAP_CPP( frame_manip_moc frame_manip.h )
+add_executable( frame_manip frame_manip.cpp ${frame_manip_moc} )
+target_link_libraries( frame_manip ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
+		
+QT4_WRAP_CPP( texturesExample_moc texturesExample.h )
+add_executable( texturesExample texturesExample.cpp ${texturesExample_moc} )
+target_link_libraries( texturesExample ${CGoGN_LIBS} ${CGoGN_EXT_LIBS}  )
+
+QT4_WRAP_CPP(simpleMap3_moc simpleMap3.h)
+add_executable( simpleMap3 simpleMap3.cpp ${simpleMap3_moc} )
+target_link_libraries( simpleMap3 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
+
+QT4_WRAP_CPP( simpleGMap2_moc simpleGMap2.h )
+add_executable( simpleGMap2 simpleGMap2.cpp ${simpleGMap2_moc} )
+target_link_libraries( simpleGMap2 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
+
+QT4_WRAP_CPP( simpleGMap3_moc simpleGMap3.h )
+add_executable( simpleGMap3 simpleGMap3.cpp ${simpleGMap3_moc} )
+target_link_libraries( simpleGMap3 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
+                
+QT4_WRAP_CPP( extrusionView_moc extrusionView.h )
+add_executable( extrusionView extrusionView.cpp ${extrusionView_moc} )
+target_link_libraries( extrusionView ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
+
+QT4_WRAP_UI( viewer_ui viewer.ui )
+QT4_WRAP_CPP( viewer_moc viewer.h )
+add_executable( viewer viewer.cpp ${viewer_moc} ${viewer_ui} )
+target_link_libraries( viewer ${CGoGN_LIBS} ${NUMERICAL_LIBS} ${CGoGN_EXT_LIBS} )
+
+QT4_WRAP_UI( clipping_ui clipping.ui )
+QT4_WRAP_CPP( clipping_moc clipping.h )
+add_executable( clipping clipping.cpp ${clipping_ui} ${clipping_moc} )
+target_link_libraries( clipping	${CGoGN_LIBS}  ${CGoGN_EXT_LIBS} )
+
+QT4_WRAP_UI( volumeExplorer_ui volumeExplorer.ui )
+QT4_WRAP_CPP( volumeExplorer_moc volumeExplorer.h )
+add_executable( volumeExplorer volumeExplorer.cpp ${volumeExplorer_ui} ${volumeExplorer_moc} )
+target_link_libraries( volumeExplorer ${CGoGN_LIBS}  ${CGoGN_EXT_LIBS} )
+
+QT4_WRAP_UI( mcmesh_ui mcmesh.ui )
+QT4_WRAP_CPP( mcmesh_moc mcmesh.h )
+add_executable( mcmesh mcmesh.cpp ${mcmesh_moc} ${mcmesh_ui} )
+target_link_libraries( mcmesh ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
+
+QT4_WRAP_CPP( concave_rendering_moc concave_rendering.h )
+add_executable( concave_rendering concave_rendering.cpp ${concave_rendering_moc} ${concave_rendering_ui} )
+target_link_libraries( concave_rendering ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
+
+QT4_WRAP_CPP( viewerOBJ_moc viewerOBJ.h )
+add_executable( viewerOBJ viewerOBJ.cpp ${viewerOBJ_moc} )
+target_link_libraries( viewerOBJ ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )

Apps/Examples/Debug/CMakeLists.txt

-cmake_minimum_required(VERSION 2.8)
-
-project(examplesD)
-
-SET(CMAKE_BUILD_TYPE Debug)
-
-# define includes path
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-	${CGoGN_ROOT_DIR}/include
-	${CGoGN_EXT_INCLUDES}
-)
-
-# define libs path
-link_directories(
-	${CGoGN_ROOT_DIR}/lib/Debug
-	${CGoGN_ROOT_DIR}/lib/Release
-	${Boost_LIBRARY_DIRS}
-)
-IF(WIN32)
-	link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName)
-	${Boost_LIBRARY_DIRS})
-ELSE(WIN32)
-	link_directories( ${CGoGN_ROOT_DIR}/lib/Debug  ${CGoGN_ROOT_DIR}/lib/Release )
-ENDIF(WIN32)
-
-#define exec to compile
-
-QT4_WRAP_CPP(frame_manip_moc ../frame_manip.h)  
-add_executable( frame_manipD ../frame_manip.cpp ${frame_manip_moc})
-target_link_libraries( frame_manipD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS}  )
-
-QT4_WRAP_CPP(texturesExample_moc ../texturesExample.h)  
-add_executable( texturesExampleD ../texturesExample.cpp ${texturesExample_moc} )
-target_link_libraries( texturesExampleD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_CPP(simpleMap3_moc ../simpleMap3.h)  
-add_executable( simpleMap3D ../simpleMap3.cpp ${simpleMap3_moc} )
-target_link_libraries( simpleMap3D ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
-                
-QT4_WRAP_CPP(simpleGMap2_moc ../simpleGMap2.h)  
-add_executable( simpleGMap2D ../simpleGMap2.cpp ${simpleGMap2_moc} )
-target_link_libraries( simpleGMap2D ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_CPP(simpleGMap3_moc ../simpleGMap3.h)  
-add_executable( simpleGMap3D ../simpleGMap3.cpp ${simpleGMap3_moc} )
-target_link_libraries( simpleGMap3D ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_CPP(extrusionView_moc ../extrusionView.h)	
-add_executable( extrusionViewD ../extrusionView.cpp ${extrusionView_moc})
-target_link_libraries( extrusionViewD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_UI( viewer_ui ../viewer.ui )
-QT4_WRAP_CPP( viewer_moc ../viewer.h )
-add_executable( viewerD ../viewer.cpp ${viewer_moc} ${viewer_ui})
-target_link_libraries( viewerD ${CGoGN_LIBS_D} ${NUMERICAL_LIBS} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_UI( clipping_ui ../clipping.ui )
-QT4_WRAP_CPP( clipping_moc ../clipping.h )
-add_executable( clippingD ../clipping.cpp ${clipping_ui} ${clipping_moc})
-target_link_libraries( clippingD ${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS}  )
-
-QT4_WRAP_UI( volumeExplorer_ui ../volumeExplorer.ui )
-QT4_WRAP_CPP( volumeExplorer_moc ../volumeExplorer.h )
-add_executable( volumeExplorerD ../volumeExplorer.cpp ${volumeExplorer_ui} ${volumeExplorer_moc})
-target_link_libraries( volumeExplorerD ${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS} )
-	
-QT4_WRAP_UI( mcmesh_ui ../mcmesh.ui )
-QT4_WRAP_CPP( mcmesh_moc ../mcmesh.h )
-add_executable( mcmeshD ../mcmesh.cpp ${mcmesh_moc}	${mcmesh_ui} )
-target_link_libraries( mcmeshD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_CPP( concave_rendering_moc ../concave_rendering.h )
-add_executable( concave_renderingD ../concave_rendering.cpp ${concave_rendering_moc}	${concave_rendering_ui} )
-target_link_libraries( concave_renderingD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_CPP( viewerOBJ_moc ../viewerOBJ.h )
-add_executable( viewerOBJD ../viewerOBJ.cpp ${viewerOBJ_moc} )
-target_link_libraries( viewerOBJD ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )

Apps/Examples/Release/CMakeLists.txt

-cmake_minimum_required(VERSION 2.8)
-
-project(examples)
-
-SET(CMAKE_BUILD_TYPE Release)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
-
-
-# define includes path
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-	${CGoGN_ROOT_DIR}/include
-	${CGoGN_EXT_INCLUDES}
-)
-
-# define libs path
-IF(WIN32)
-	link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) ${Boost_LIBRARY_DIRS} )
-ELSE(WIN32)
-	link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
-ENDIF(WIN32)
-
-
-#define exec to compile
-
-QT4_WRAP_CPP( frame_manip_moc ../frame_manip.h )
-add_executable( frame_manip ../frame_manip.cpp ${frame_manip_moc} )
-target_link_libraries( frame_manip ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
-		
-QT4_WRAP_CPP( texturesExample_moc ../texturesExample.h )
-add_executable( texturesExample ../texturesExample.cpp ${texturesExample_moc} )
-target_link_libraries( texturesExample ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS}  )
-
-QT4_WRAP_CPP(simpleMap3_moc ../simpleMap3.h)
-add_executable( simpleMap3 ../simpleMap3.cpp ${simpleMap3_moc} )
-target_link_libraries( simpleMap3 ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_CPP( simpleGMap2_moc ../simpleGMap2.h )
-add_executable( simpleGMap2 ../simpleGMap2.cpp ${simpleGMap2_moc} )
-target_link_libraries( simpleGMap2 ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_CPP( simpleGMap3_moc ../simpleGMap3.h )
-add_executable( simpleGMap3 ../simpleGMap3.cpp ${simpleGMap3_moc} )
-target_link_libraries( simpleGMap3 ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
-                
-QT4_WRAP_CPP( extrusionView_moc ../extrusionView.h )
-add_executable( extrusionView ../extrusionView.cpp ${extrusionView_moc} )
-target_link_libraries( extrusionView ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_UI( viewer_ui ../viewer.ui )
-QT4_WRAP_CPP( viewer_moc ../viewer.h )
-add_executable( viewer ../viewer.cpp ${viewer_moc} ${viewer_ui} )
-target_link_libraries( viewer ${CGoGN_LIBS_R} ${NUMERICAL_LIBS} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_UI( clipping_ui ../clipping.ui )
-QT4_WRAP_CPP( clipping_moc ../clipping.h )
-add_executable( clipping ../clipping.cpp ${clipping_ui} ${clipping_moc} )
-target_link_libraries( clipping	${CGoGN_LIBS_R}  ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_UI( volumeExplorer_ui ../volumeExplorer.ui )
-QT4_WRAP_CPP( volumeExplorer_moc ../volumeExplorer.h )
-add_executable( volumeExplorer ../volumeExplorer.cpp ${volumeExplorer_ui} ${volumeExplorer_moc} )
-target_link_libraries( volumeExplorer ${CGoGN_LIBS_R}  ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_UI( mcmesh_ui ../mcmesh.ui )
-QT4_WRAP_CPP( mcmesh_moc ../mcmesh.h )
-add_executable( mcmesh ../mcmesh.cpp ${mcmesh_moc} ${mcmesh_ui} )
-target_link_libraries( mcmesh ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_CPP( concave_rendering_moc ../concave_rendering.h )
-add_executable( concave_rendering ../concave_rendering.cpp ${concave_rendering_moc} ${concave_rendering_ui} )
-target_link_libraries( concave_rendering ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_CPP( viewerOBJ_moc ../viewerOBJ.h )
-add_executable( viewerOBJ ../viewerOBJ.cpp ${viewerOBJ_moc} )
-target_link_libraries( viewerOBJ ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )

Apps/SandBox/CMakeLists.txt

@@ -3,53 +3,53 @@ cmake_minimum_required(VERSION 2.8)
 project(SandBox)
 
 
-SET (CMAKE_BUILD_TYPE Debug)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
+#SET (CMAKE_BUILD_TYPE Debug)
+#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
 
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-	${CGoGN_ROOT_DIR}/include
-	${CGoGN_EXT_INCLUDES}
-)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+#	${CGoGN_ROOT_DIR}/include
+#	${CGoGN_EXT_INCLUDES})
 
 # define libs path
-IF(WIN32)
-	link_directories(${CGoGN_ROOT_DIR}/lib/$(ConfigurationName)
-	${Boost_LIBRARY_DIRS})
-ELSE(WIN32)
-	link_directories(${CGoGN_ROOT_DIR}/lib/Release ${CGoGN_ROOT_DIR}/lib/Debug)
-ENDIF(WIN32)
+#IF(WIN32)
+#	link_directories(${CGoGN_ROOT_DIR}/lib/$(ConfigurationName)
+#	${Boost_LIBRARY_DIRS})
+#ELSE(WIN32)
+#	link_directories(${CGoGN_ROOT_DIR}/lib/Release ${CGoGN_ROOT_DIR}/lib/Debug)
+#ENDIF(WIN32)
 
 
 #define exec to compile
 
 add_executable(multi_att multi_att.cpp)
-target_link_libraries(multi_att ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
+target_link_libraries(multi_att ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
 
-QT4_WRAP_CPP(tilings_moc tilings.h)
-add_executable(tilings tilings.cpp  ${tilings_moc})
-target_link_libraries(tilings ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
+IF (WITH_QT)
+	QT4_WRAP_CPP(tilings_moc tilings.h)
+	add_executable(tilings tilings.cpp  ${tilings_moc})
+	target_link_libraries(tilings ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
 
-QT4_WRAP_UI( test_traversor2_ui test_traversor2.ui )
-QT4_WRAP_CPP(test_traversor2_moc test_traversor2.h)
-add_executable(test_traversor2 test_traversor2.cpp  ${test_traversor2_ui} ${test_traversor2_moc})
-target_link_libraries(test_traversor2 ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
+	QT4_WRAP_UI( test_traversor2_ui test_traversor2.ui )
+	QT4_WRAP_CPP(test_traversor2_moc test_traversor2.h)
+	add_executable(test_traversor2 test_traversor2.cpp  ${test_traversor2_ui} ${test_traversor2_moc})
+	target_link_libraries(test_traversor2 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
 
 
-QT4_WRAP_UI( testPlaneCutting_ui testPlaneCutting.ui )
-QT4_WRAP_CPP(testPlaneCutting_moc testPlaneCutting.h)
-add_executable(testPlaneCutting testPlaneCutting.cpp  ${testPlaneCutting_ui} ${testPlaneCutting_moc})
-target_link_libraries(testPlaneCutting ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
+	QT4_WRAP_UI( testPlaneCutting_ui testPlaneCutting.ui )
+	QT4_WRAP_CPP(testPlaneCutting_moc testPlaneCutting.h)
+	add_executable(testPlaneCutting testPlaneCutting.cpp  ${testPlaneCutting_ui} ${testPlaneCutting_moc})
+	target_link_libraries(testPlaneCutting ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
+ENDIF()
 
 # Example with Qt
 #
 #QT4_WRAP_CPP(tuto1_moc tuto1.h)
 #add_executable( tuto1 tuto1.cpp ${tuto1_moc})
-#target_link_libraries( tuto1 ${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS} )
+#target_link_libraries( tuto1 ${CGoGN_LIBS}  ${CGoGN_EXT_LIBS} )
 
 
 #QT4_WRAP_CPP(tuto_mt_moc tuto_mt.h)
 #add_executable( tuto_mt tuto_mt.cpp  ${tuto_mt_moc})
 #target_link_libraries( tuto_mt
-#	${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} ${Boost_THREAD_LIBRARY})
+#	${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ${Boost_THREAD_LIBRARY})
 

Apps/Tests/CMakeLists.txt

 cmake_minimum_required(VERSION 2.6)
 
-project(testing_debug)
+project(testing)
 
-SET(CMAKE_BUILD_TYPE Debug)
+#SET(CMAKE_BUILD_TYPE Debug)
 
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-	${CGoGN_ROOT_DIR}/include
-	${CGoGN_EXT_INCLUDES}
-)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+#	${CGoGN_ROOT_DIR}/include
+#	${CGoGN_EXT_INCLUDES}
+#)
 
 
-IF(WIN32)
-	link_directories( 
-		${CGoGN_ROOT_DIR}/lib/$(ConfigurationName)
-		${Boost_LIBRARY_DIRS} )
-ELSE(WIN32)
-	link_directories(
-		${CGoGN_ROOT_DIR}/lib/Debug
-		${CGoGN_ROOT_DIR}/lib/Release )
-ENDIF(WIN32)
+#IF(WIN32)
+#	link_directories( 
+#		${CGoGN_ROOT_DIR}/lib/$(ConfigurationName)
+#		${Boost_LIBRARY_DIRS} )
+#ELSE(WIN32)
+#	link_directories(
+#		${CGoGN_ROOT_DIR}/lib/Debug
+#		${CGoGN_ROOT_DIR}/lib/Release )
+#ENDIF(WIN32)
 
 #define exec to compile
 
-add_executable( Geom_orientationD ./Geom_orientation.cpp)
-target_link_libraries( Geom_orientationD
-	${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
+add_executable( Geom_orientation ./Geom_orientation.cpp)
+target_link_libraries( Geom_orientation
+	${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
 
-add_executable( Geom_inclusionD ./Geom_inclusion.cpp)
-target_link_libraries( Geom_inclusionD
-	${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
+add_executable( Geom_inclusion ./Geom_inclusion.cpp)
+target_link_libraries( Geom_inclusion
+	${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
 
-add_executable( Geom_intersectionD ./Geom_intersection.cpp)
-target_link_libraries( Geom_intersectionD
-	${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
+add_executable( Geom_intersection ./Geom_intersection.cpp)
+target_link_libraries( Geom_intersection
+	${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
 
 add_executable( loadSave ./loadSave.cpp)
 target_link_libraries( loadSave
-	${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
+	${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
 
 add_executable( copyfrom ./copyfrom.cpp)
 target_link_libraries( copyfrom
-	${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
+	${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
 
 add_executable( movefrom ./movefrom.cpp)
 target_link_libraries( movefrom
-	${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
+	${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
 
 add_executable( compact ./compact.cpp)
 target_link_libraries( compact
-	${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
+	${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
 
 add_executable( reusememory ./reusememory.cpp)
 target_link_libraries( reusememory
-	${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
+	${CGoGN_LIBS} ${CGoGN_EXT_LIBS})

Apps/Tuto/CMakeLists.txt

@@ -3,92 +3,92 @@ cmake_minimum_required(VERSION 2.8)
 project(Tutos)
 
 
-SET (CMAKE_BUILD_TYPE Debug)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
+#SET (CMAKE_BUILD_TYPE Debug)
+#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
 
 
 
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-	${CGoGN_ROOT_DIR}/include
-	${CGoGN_EXT_INCLUDES}
-)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+#	${CGoGN_ROOT_DIR}/include
+#	${CGoGN_EXT_INCLUDES})
 
 # define libs path
-IF(WIN32)
-	link_directories(${CGoGN_ROOT_DIR}/lib/$(ConfigurationName)
-	${Boost_LIBRARY_DIRS})
-ELSE(WIN32)
-	link_directories(${CGoGN_ROOT_DIR}/lib/Release ${CGoGN_ROOT_DIR}/lib/Debug)
-ENDIF(WIN32)
+#IF(WIN32)
+#	link_directories(${CGoGN_ROOT_DIR}/lib/$(ConfigurationName)
+#	${Boost_LIBRARY_DIRS})
+#ELSE(WIN32)
+#	link_directories(${CGoGN_ROOT_DIR}/lib/Release ${CGoGN_ROOT_DIR}/lib/Debug)
+#ENDIF(WIN32)
 
 
 #define exec to compile
-
-QT4_WRAP_CPP(tuto1_moc tuto1.h)
-add_executable( tuto1 tuto1.cpp ${tuto1_moc})
-target_link_libraries( tuto1
-	${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_UI( tuto2_ui tuto2.ui )
-QT4_WRAP_CPP(tuto2_moc tuto2.h)
-add_executable( tuto2 tuto2.cpp tuto2.h ${tuto2_ui}  ${tuto2_moc})
-target_link_libraries( tuto2
-	${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_CPP(tuto3_moc tuto3.h)
-add_executable( tuto3 tuto3.cpp ${tuto3_moc})
-target_link_libraries( tuto3
-	${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
-
-QT4_WRAP_UI( tuto4_ui tuto4.ui )
-QT4_WRAP_CPP(tuto4_moc tuto4.h)
-add_executable( tuto4 tuto4.cpp ${tuto4_ui} ${tuto4_moc})
-target_link_libraries( tuto4
-	${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS}  )
-
-QT4_WRAP_UI( tuto5_ui tuto5.ui )
-QT4_WRAP_CPP(tuto5_moc tuto5.h)
-add_executable( tuto5 tuto5.cpp ${tuto5_ui} ${tuto5_moc})
-target_link_libraries( tuto5
-	${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS}  )
-
+IF (WITH_QT)
+
+	QT4_WRAP_CPP(tuto1_moc tuto1.h)
+	add_executable( tuto1 tuto1.cpp ${tuto1_moc})
+	target_link_libraries( tuto1
+		${CGoGN_LIBS}  ${CGoGN_EXT_LIBS} )
+
+	QT4_WRAP_UI( tuto2_ui tuto2.ui )
+	QT4_WRAP_CPP(tuto2_moc tuto2.h)
+	add_executable( tuto2 tuto2.cpp tuto2.h ${tuto2_ui}  ${tuto2_moc})
+	target_link_libraries( tuto2
+		${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
+
+	QT4_WRAP_CPP(tuto3_moc tuto3.h)
+	add_executable( tuto3 tuto3.cpp ${tuto3_moc})
+	target_link_libraries( tuto3
+		${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
+
+	QT4_WRAP_UI( tuto4_ui tuto4.ui )
+	QT4_WRAP_CPP(tuto4_moc tuto4.h)
+	add_executable( tuto4 tuto4.cpp ${tuto4_ui} ${tuto4_moc})
+	target_link_libraries( tuto4
+		${CGoGN_LIBS}  ${CGoGN_EXT_LIBS}  )
+
+	QT4_WRAP_UI( tuto5_ui tuto5.ui )
+	QT4_WRAP_CPP(tuto5_moc tuto5.h)
+	add_executable( tuto5 tuto5.cpp ${tuto5_ui} ${tuto5_moc})
+	target_link_libraries( tuto5
+		${CGoGN_LIBS}  ${CGoGN_EXT_LIBS}  )
 	
+	QT4_WRAP_UI( tuto_orbits_ui tuto_orbits.ui )
+	QT4_WRAP_CPP(tuto_orbits_moc tuto_orbits.h)
+	add_executable( tuto_orbits tuto_orbits.cpp ${tuto_orbits_ui} ${tuto_orbits_moc})
+	target_link_libraries( tuto_orbits
+		${CGoGN_LIBS}  ${CGoGN_EXT_LIBS}  )
 
-	
-QT4_WRAP_UI( tuto_orbits_ui tuto_orbits.ui )
-QT4_WRAP_CPP(tuto_orbits_moc tuto_orbits.h)
-add_executable( tuto_orbits tuto_orbits.cpp ${tuto_orbits_ui} ${tuto_orbits_moc})
-target_link_libraries( tuto_orbits
-	${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS}  )
+	QT4_WRAP_CPP(tuto_histo_moc tuto_histo.h)
+	add_executable( tuto_histo tuto_histo.cpp tuto_histo.h ${tuto_histo_ui}  ${tuto_histo_moc})
+	target_link_libraries( tuto_histo
+		${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
+
+ENDIF()
 
 #QT4_WRAP_UI( show_traversors_ui show_traversors.ui )
 #QT4_WRAP_CPP(show_traversors_moc show_traversors.h)
 #add_executable( show_traversors show_traversors.cpp ${show_traversors_ui} ${show_traversors_moc})
 #target_link_libraries( show_traversors
-#	${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS}  )
+#	${CGoGN_LIBS}  ${CGoGN_EXT_LIBS}  )
 
 add_executable( tuto_subdivision tuto_subdivision.cpp)
 target_link_libraries( tuto_subdivision
-	${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS} )
+	${CGoGN_LIBS}  ${CGoGN_EXT_LIBS} )
 	
 add_executable( tuto_dual2 tuto_dual2.cpp)
 target_link_libraries( tuto_dual2
-	${CGoGN_LIBS_D}  ${CGoGN_EXT_LIBS} )