Commit b740879e authored by Sylvain Thery's avatar Sylvain Thery

Qt5 Linux OK

parent 80fef77f
project(Apps)
IF (CGoGN_ONELIB) IF (CGoGN_ONELIB)
SET(CGoGN_LIBS cgogn) SET(CGoGN_LIBS cgogn)
ELSE () ELSE ()
......
...@@ -9,54 +9,59 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ...@@ -9,54 +9,59 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
#define exec to compile #define exec to compile
QT4_WRAP_CPP( frame_manip_moc frame_manip.h ) qt_wrap_cpp( frame_manip_moc frame_manip.h )
add_executable( frame_manip frame_manip.cpp ${frame_manip_moc} ) add_executable( frame_manip frame_manip.cpp ${frame_manip_moc} )
target_link_libraries( frame_manip ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( frame_manip ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
qt_use_modules(frame_manip Gui OpenGL Xml Svg)
#IF(${CGoGN_DESIRED_QT_VERSION} STREQUAL "5")
# qt_use_modules(frame_manip Widgets)
#ENDIF()
QT4_WRAP_CPP( texturesExample_moc texturesExample.h ) qt_wrap_cpp( texturesExample_moc texturesExample.h )
add_executable( texturesExample texturesExample.cpp ${texturesExample_moc} ) add_executable( texturesExample texturesExample.cpp ${texturesExample_moc} )
target_link_libraries( texturesExample ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( texturesExample ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(simpleMap3_moc simpleMap3.h) qt_wrap_cpp(simpleMap3_moc simpleMap3.h)
add_executable( simpleMap3 simpleMap3.cpp ${simpleMap3_moc} ) add_executable( simpleMap3 simpleMap3.cpp ${simpleMap3_moc} )
target_link_libraries( simpleMap3 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( simpleMap3 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP( simpleGMap2_moc simpleGMap2.h ) qt_wrap_cpp( simpleGMap2_moc simpleGMap2.h )
add_executable( simpleGMap2 simpleGMap2.cpp ${simpleGMap2_moc} ) add_executable( simpleGMap2 simpleGMap2.cpp ${simpleGMap2_moc} )
target_link_libraries( simpleGMap2 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( simpleGMap2 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP( simpleGMap3_moc simpleGMap3.h ) qt_wrap_cpp( simpleGMap3_moc simpleGMap3.h )
add_executable( simpleGMap3 simpleGMap3.cpp ${simpleGMap3_moc} ) add_executable( simpleGMap3 simpleGMap3.cpp ${simpleGMap3_moc} )
target_link_libraries( simpleGMap3 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( simpleGMap3 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP( extrusionView_moc extrusionView.h ) qt_wrap_cpp( extrusionView_moc extrusionView.h )
add_executable( extrusionView extrusionView.cpp ${extrusionView_moc} ) add_executable( extrusionView extrusionView.cpp ${extrusionView_moc} )
target_link_libraries( extrusionView ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( extrusionView ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( viewer_ui viewer.ui ) qt_wrap_ui( viewer_ui viewer.ui )
QT4_WRAP_CPP( viewer_moc viewer.h ) qt_wrap_cpp( viewer_moc viewer.h )
add_executable( viewer viewer.cpp ${viewer_moc} ${viewer_ui} ) add_executable( viewer viewer.cpp ${viewer_moc} ${viewer_ui} )
target_link_libraries( viewer ${CGoGN_LIBS} ${NUMERICAL_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( viewer ${CGoGN_LIBS} ${NUMERICAL_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( clipping_ui clipping.ui ) qt_wrap_ui( clipping_ui clipping.ui )
QT4_WRAP_CPP( clipping_moc clipping.h ) qt_wrap_cpp( clipping_moc clipping.h )
add_executable( clipping clipping.cpp ${clipping_ui} ${clipping_moc} ) add_executable( clipping clipping.cpp ${clipping_ui} ${clipping_moc} )
target_link_libraries( clipping ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( clipping ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( volumeExplorer_ui volumeExplorer.ui ) qt_wrap_ui( volumeExplorer_ui volumeExplorer.ui )
QT4_WRAP_CPP( volumeExplorer_moc volumeExplorer.h ) qt_wrap_cpp( volumeExplorer_moc volumeExplorer.h )
add_executable( volumeExplorer volumeExplorer.cpp ${volumeExplorer_ui} ${volumeExplorer_moc} ) add_executable( volumeExplorer volumeExplorer.cpp ${volumeExplorer_ui} ${volumeExplorer_moc} )
target_link_libraries( volumeExplorer ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( volumeExplorer ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( mcmesh_ui mcmesh.ui ) qt_wrap_ui( mcmesh_ui mcmesh.ui )
QT4_WRAP_CPP( mcmesh_moc mcmesh.h ) qt_wrap_cpp( mcmesh_moc mcmesh.h )
add_executable( mcmesh mcmesh.cpp ${mcmesh_moc} ${mcmesh_ui} ) add_executable( mcmesh mcmesh.cpp ${mcmesh_moc} ${mcmesh_ui} )
target_link_libraries( mcmesh ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( mcmesh ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP( concave_rendering_moc concave_rendering.h ) qt_wrap_cpp( concave_rendering_moc concave_rendering.h )
add_executable( concave_rendering concave_rendering.cpp ${concave_rendering_moc} ${concave_rendering_ui} ) add_executable( concave_rendering concave_rendering.cpp ${concave_rendering_moc} ${concave_rendering_ui} )
target_link_libraries( concave_rendering ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( concave_rendering ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP( viewerOBJ_moc viewerOBJ.h ) qt_wrap_cpp( viewerOBJ_moc viewerOBJ.h )
add_executable( viewerOBJ viewerOBJ.cpp ${viewerOBJ_moc} ) add_executable( viewerOBJ viewerOBJ.cpp ${viewerOBJ_moc} )
target_link_libraries( viewerOBJ ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( viewerOBJ ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
#include "Utils/vbo.h" #include "Utils/vbo.h"
#include "Utils/static_assert.h" #include "Utils/static_assert.h"
#include <QColorDialog>
#include <QTimer>
/******************************************************************************* /*******************************************************************************
* MISCELLANOUS * MISCELLANOUS
*******************************************************************************/ *******************************************************************************/
......
...@@ -14,22 +14,23 @@ IF (CGoGN_WITH_QT) ...@@ -14,22 +14,23 @@ IF (CGoGN_WITH_QT)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
QT4_WRAP_CPP(tilings_moc tilings.h) qt_wrap_cpp(tilings_moc tilings.h)
add_executable(tilings tilings.cpp ${tilings_moc}) add_executable(tilings tilings.cpp ${tilings_moc})
target_link_libraries(tilings ${CGoGN_LIBS} ${CGoGN_EXT_LIBS}) target_link_libraries(tilings ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
qt_use_modules(tilings Gui OpenGL Xml Svg)
QT4_WRAP_UI( test_traversor2_ui test_traversor2.ui ) qt_wrap_ui( test_traversor2_ui test_traversor2.ui )
QT4_WRAP_CPP(test_traversor2_moc test_traversor2.h) qt_wrap_cpp(test_traversor2_moc test_traversor2.h)
add_executable(test_traversor2 test_traversor2.cpp ${test_traversor2_ui} ${test_traversor2_moc}) add_executable(test_traversor2 test_traversor2.cpp ${test_traversor2_ui} ${test_traversor2_moc})
target_link_libraries(test_traversor2 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS}) target_link_libraries(test_traversor2 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
QT4_WRAP_UI( testPlaneCutting_ui testPlaneCutting.ui ) qt_wrap_ui( testPlaneCutting_ui testPlaneCutting.ui )
QT4_WRAP_CPP(testPlaneCutting_moc testPlaneCutting.h) qt_wrap_cpp(testPlaneCutting_moc testPlaneCutting.h)
add_executable(testPlaneCutting testPlaneCutting.cpp ${testPlaneCutting_ui} ${testPlaneCutting_moc}) add_executable(testPlaneCutting testPlaneCutting.cpp ${testPlaneCutting_ui} ${testPlaneCutting_moc})
target_link_libraries(testPlaneCutting ${CGoGN_LIBS} ${CGoGN_EXT_LIBS}) target_link_libraries(testPlaneCutting ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
QT4_WRAP_CPP(wallPaper_moc wallPaper.h) qt_wrap_cpp(wallPaper_moc wallPaper.h)
add_executable(wallPaper wallPaper.cpp ${wallPaper_moc}) add_executable(wallPaper wallPaper.cpp ${wallPaper_moc})
target_link_libraries(wallPaper ${CGoGN_LIBS} ${CGoGN_EXT_LIBS}) target_link_libraries(wallPaper ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
...@@ -37,13 +38,7 @@ ENDIF() ...@@ -37,13 +38,7 @@ ENDIF()
# Example with Qt # Example with Qt
# #
#QT4_WRAP_CPP(tuto1_moc tuto1.h) #qt_wrap_cpp(tuto1_moc tuto1.h)
#add_executable( tuto1 tuto1.cpp ${tuto1_moc}) #add_executable( tuto1 tuto1.cpp ${tuto1_moc})
#target_link_libraries( tuto1 ${CGoGN_LIBS} ${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} ${CGoGN_EXT_LIBS} ${Boost_THREAD_LIBRARY})
...@@ -9,6 +9,7 @@ project(testing) ...@@ -9,6 +9,7 @@ project(testing)
add_executable( Geom_orientation ./Geom_orientation.cpp) add_executable( Geom_orientation ./Geom_orientation.cpp)
target_link_libraries( Geom_orientation target_link_libraries( Geom_orientation
${CGoGN_LIBS} ${CGoGN_EXT_LIBS}) ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
qt_use_modules(Geom_orientation Gui OpenGL Xml Svg)
add_executable( Geom_inclusion ./Geom_inclusion.cpp) add_executable( Geom_inclusion ./Geom_inclusion.cpp)
target_link_libraries( Geom_inclusion target_link_libraries( Geom_inclusion
......
...@@ -15,8 +15,8 @@ IF(CGoGN_WITH_QT) ...@@ -15,8 +15,8 @@ IF(CGoGN_WITH_QT)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
QT4_WRAP_UI(vbo_attribs_ui vbo_attribs.ui) qt_wrap_ui(vbo_attribs_ui vbo_attribs.ui)
QT4_WRAP_CPP(vbo_attribs_moc vbo_attribs.h) qt_wrap_cpp(vbo_attribs_moc vbo_attribs.h)
add_executable( vbo_attribs vbo_attribs.cpp ${vbo_attribs_ui} ${vbo_attribs_moc}) add_executable( vbo_attribs vbo_attribs.cpp ${vbo_attribs_ui} ${vbo_attribs_moc})
target_link_libraries( vbo_attribs ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( vbo_attribs ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
......
...@@ -7,58 +7,54 @@ if(APPLE) ...@@ -7,58 +7,54 @@ if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-overloaded-virtual") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-overloaded-virtual")
endif() endif()
add_subdirectory(Boundary)
add_subdirectory(Modelling)
add_subdirectory(Markers)
add_subdirectory(Traversals)
add_subdirectory(Attributes)
#define exec to compile #define exec to compile
IF (CGoGN_WITH_QT) IF (CGoGN_WITH_QT)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
QT4_WRAP_CPP(tuto1_moc tuto1.h) qt_wrap_cpp(tuto1_moc tuto1.h)
add_executable( tuto1 tuto1.cpp ${tuto1_moc}) add_executable( tuto1 tuto1.cpp ${tuto1_moc})
target_link_libraries( tuto1 target_link_libraries( tuto1
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
qt_use_modules(tuto1 Gui OpenGL Xml Svg)
QT4_WRAP_UI( tuto2_ui tuto2.ui ) qt_wrap_ui( tuto2_ui tuto2.ui )
QT4_WRAP_CPP(tuto2_moc tuto2.h) qt_wrap_cpp(tuto2_moc tuto2.h)
add_executable( tuto2 tuto2.cpp tuto2.h ${tuto2_ui} ${tuto2_moc}) add_executable( tuto2 tuto2.cpp tuto2.h ${tuto2_ui} ${tuto2_moc})
target_link_libraries( tuto2 target_link_libraries( tuto2
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(tuto3_moc tuto3.h) qt_wrap_cpp(tuto3_moc tuto3.h)
add_executable( tuto3 tuto3.cpp ${tuto3_moc}) add_executable( tuto3 tuto3.cpp ${tuto3_moc})
target_link_libraries( tuto3 target_link_libraries( tuto3
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( tuto4_ui tuto4.ui ) qt_wrap_ui( tuto4_ui tuto4.ui )
QT4_WRAP_CPP(tuto4_moc tuto4.h) qt_wrap_cpp(tuto4_moc tuto4.h)
add_executable( tuto4 tuto4.cpp ${tuto4_ui} ${tuto4_moc}) add_executable( tuto4 tuto4.cpp ${tuto4_ui} ${tuto4_moc})
target_link_libraries( tuto4 target_link_libraries( tuto4
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( tuto5_ui tuto5.ui ) qt_wrap_ui( tuto5_ui tuto5.ui )
QT4_WRAP_CPP(tuto5_moc tuto5.h) qt_wrap_cpp(tuto5_moc tuto5.h)
add_executable( tuto5 tuto5.cpp ${tuto5_ui} ${tuto5_moc}) add_executable( tuto5 tuto5.cpp ${tuto5_ui} ${tuto5_moc})
target_link_libraries( tuto5 target_link_libraries( tuto5
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( tuto_orbits_ui tuto_orbits.ui ) qt_wrap_ui( tuto_orbits_ui tuto_orbits.ui )
QT4_WRAP_CPP(tuto_orbits_moc tuto_orbits.h) qt_wrap_cpp(tuto_orbits_moc tuto_orbits.h)
add_executable( tuto_orbits tuto_orbits.cpp ${tuto_orbits_ui} ${tuto_orbits_moc}) add_executable( tuto_orbits tuto_orbits.cpp ${tuto_orbits_ui} ${tuto_orbits_moc})
target_link_libraries( tuto_orbits target_link_libraries( tuto_orbits
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
# QT4_WRAP_CPP(tuto_histo_moc tuto_histo.h) # qt_wrap_cpp(tuto_histo_moc tuto_histo.h)
# add_executable( tuto_histo tuto_histo.cpp tuto_histo.h ${tuto_histo_ui} ${tuto_histo_moc}) # add_executable( tuto_histo tuto_histo.cpp tuto_histo.h ${tuto_histo_ui} ${tuto_histo_moc})
# target_link_libraries( tuto_histo # target_link_libraries( tuto_histo
# ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) # ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
# QT4_WRAP_CPP(tp_master_moc tp_master.h) # qt_wrap_cpp(tp_master_moc tp_master.h)
# add_executable( tp_master tp_master.cpp ${tp_master_moc}) # add_executable( tp_master tp_master.cpp ${tp_master_moc})
# target_link_libraries( tp_master ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) # target_link_libraries( tp_master ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )