Added missing includes
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@144 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
@@ -1,48 +1,50 @@
|
|||||||
include (ACGCommon)
|
include (ACGCommon)
|
||||||
|
|
||||||
include_directories (
|
include_directories (
|
||||||
../../../..
|
../../../..
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
)
|
${GLEW_INCLUDE_DIR}
|
||||||
|
${GLUT_INCLUDE_DIR}
|
||||||
set (targetName DecimaterGui)
|
)
|
||||||
|
|
||||||
# source code directories
|
set (targetName DecimaterGui)
|
||||||
set (directories
|
|
||||||
../../QtViewer
|
# source code directories
|
||||||
../
|
set (directories
|
||||||
)
|
../../QtViewer
|
||||||
|
../
|
||||||
# collect all header and source files
|
)
|
||||||
acg_append_files (headers "*.hh" ${directories})
|
|
||||||
|
# collect all header and source files
|
||||||
set (sources
|
acg_append_files (headers "*.hh" ${directories})
|
||||||
../../QtViewer/QGLViewerWidget.cc
|
|
||||||
../../QtViewer/MeshViewerWidgetT.cc
|
set (sources
|
||||||
../DecimaterViewerWidget.cc
|
../../QtViewer/QGLViewerWidget.cc
|
||||||
../decimaterviewer.cc
|
../../QtViewer/MeshViewerWidgetT.cc
|
||||||
)
|
../DecimaterViewerWidget.cc
|
||||||
|
../decimaterviewer.cc
|
||||||
# remove template cc files from source file list
|
)
|
||||||
acg_drop_templates (sources)
|
|
||||||
|
# remove template cc files from source file list
|
||||||
# genereate uic and moc targets
|
acg_drop_templates (sources)
|
||||||
acg_qt4_automoc (moc_targets ${headers})
|
|
||||||
|
# genereate uic and moc targets
|
||||||
if (WIN32)
|
acg_qt4_automoc (moc_targets ${headers})
|
||||||
acg_add_executable (${targetName} WIN32 ${sources} ${headers} ${moc_targets})
|
|
||||||
# link to qtmain library to get WinMain function for a non terminal app
|
if (WIN32)
|
||||||
target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
|
acg_add_executable (${targetName} WIN32 ${sources} ${headers} ${moc_targets})
|
||||||
else ()
|
# link to qtmain library to get WinMain function for a non terminal app
|
||||||
acg_add_executable (${targetName} ${sources} ${headers} ${moc_targets})
|
target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
|
||||||
endif ()
|
else ()
|
||||||
|
acg_add_executable (${targetName} ${sources} ${headers} ${moc_targets})
|
||||||
target_link_libraries (${targetName}
|
endif ()
|
||||||
OpenMeshCore
|
|
||||||
OpenMeshTools
|
target_link_libraries (${targetName}
|
||||||
${QT_LIBRARIES}
|
OpenMeshCore
|
||||||
${OPENGL_LIBRARIES}
|
OpenMeshTools
|
||||||
${GLEW_LIBRARY}
|
${QT_LIBRARIES}
|
||||||
${GLUT_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
)
|
${GLEW_LIBRARY}
|
||||||
|
${GLUT_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,44 +1,46 @@
|
|||||||
include (ACGCommon)
|
include (ACGCommon)
|
||||||
|
|
||||||
include_directories (
|
include_directories (
|
||||||
../../..
|
../../..
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
)
|
${GLEW_INCLUDE_DIR}
|
||||||
|
${GLUT_INCLUDE_DIR}
|
||||||
set (targetName QtViewer)
|
)
|
||||||
|
|
||||||
# source code directories
|
set (targetName QtViewer)
|
||||||
set (directories
|
|
||||||
.
|
# source code directories
|
||||||
)
|
set (directories
|
||||||
|
.
|
||||||
# collect all header and source files
|
)
|
||||||
acg_append_files (headers "*.hh" ${directories})
|
|
||||||
acg_append_files (sources "*.cc" ${directories})
|
# collect all header and source files
|
||||||
acg_append_files (ui "*.ui" ${directories})
|
acg_append_files (headers "*.hh" ${directories})
|
||||||
|
acg_append_files (sources "*.cc" ${directories})
|
||||||
# remove template cc files from source file list
|
acg_append_files (ui "*.ui" ${directories})
|
||||||
acg_drop_templates (sources)
|
|
||||||
|
# remove template cc files from source file list
|
||||||
# genereate uic and moc targets
|
acg_drop_templates (sources)
|
||||||
acg_qt4_autouic (uic_targets ${ui})
|
|
||||||
acg_qt4_automoc (moc_targets ${headers})
|
# genereate uic and moc targets
|
||||||
|
acg_qt4_autouic (uic_targets ${ui})
|
||||||
|
acg_qt4_automoc (moc_targets ${headers})
|
||||||
if (WIN32)
|
|
||||||
acg_add_executable (${targetName} WIN32 ${uic_targets} ${sources} ${headers} ${moc_targets})
|
|
||||||
# link to qtmain library to get WinMain function for a non terminal app
|
if (WIN32)
|
||||||
target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
|
acg_add_executable (${targetName} WIN32 ${uic_targets} ${sources} ${headers} ${moc_targets})
|
||||||
else ()
|
# link to qtmain library to get WinMain function for a non terminal app
|
||||||
acg_add_executable (${targetName} ${uic_targets} ${sources} ${headers} ${moc_targets})
|
target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
|
||||||
endif ()
|
else ()
|
||||||
|
acg_add_executable (${targetName} ${uic_targets} ${sources} ${headers} ${moc_targets})
|
||||||
target_link_libraries (${targetName}
|
endif ()
|
||||||
OpenMeshCore
|
|
||||||
OpenMeshTools
|
target_link_libraries (${targetName}
|
||||||
${QT_LIBRARIES}
|
OpenMeshCore
|
||||||
${OPENGL_LIBRARIES}
|
OpenMeshTools
|
||||||
${GLEW_LIBRARY}
|
${QT_LIBRARIES}
|
||||||
${GLUT_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
)
|
${GLEW_LIBRARY}
|
||||||
|
${GLUT_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,48 +1,50 @@
|
|||||||
include (ACGCommon)
|
include (ACGCommon)
|
||||||
|
|
||||||
include_directories (
|
include_directories (
|
||||||
../../../..
|
../../../..
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
)
|
${GLEW_INCLUDE_DIR}
|
||||||
|
${GLUT_INCLUDE_DIR}
|
||||||
set (targetName SubdividerGui)
|
)
|
||||||
|
|
||||||
# source code directories
|
set (targetName SubdividerGui)
|
||||||
set (directories
|
|
||||||
../../QtViewer
|
# source code directories
|
||||||
../
|
set (directories
|
||||||
)
|
../../QtViewer
|
||||||
|
../
|
||||||
# collect all header and source files
|
)
|
||||||
acg_append_files (headers "*.hh" ${directories})
|
|
||||||
|
# collect all header and source files
|
||||||
set (sources
|
acg_append_files (headers "*.hh" ${directories})
|
||||||
../../QtViewer/QGLViewerWidget.cc
|
|
||||||
../../QtViewer/MeshViewerWidgetT.cc
|
set (sources
|
||||||
../SubdivideWidget.cc
|
../../QtViewer/QGLViewerWidget.cc
|
||||||
../qtsubdivider.cc
|
../../QtViewer/MeshViewerWidgetT.cc
|
||||||
)
|
../SubdivideWidget.cc
|
||||||
|
../qtsubdivider.cc
|
||||||
# remove template cc files from source file list
|
)
|
||||||
acg_drop_templates (sources)
|
|
||||||
|
# remove template cc files from source file list
|
||||||
# genereate uic and moc targets
|
acg_drop_templates (sources)
|
||||||
acg_qt4_automoc (moc_targets ${headers})
|
|
||||||
|
# genereate uic and moc targets
|
||||||
if (WIN32)
|
acg_qt4_automoc (moc_targets ${headers})
|
||||||
acg_add_executable (${targetName} WIN32 ${sources} ${headers} ${moc_targets})
|
|
||||||
# link to qtmain library to get WinMain function for a non terminal app
|
if (WIN32)
|
||||||
target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
|
acg_add_executable (${targetName} WIN32 ${sources} ${headers} ${moc_targets})
|
||||||
else ()
|
# link to qtmain library to get WinMain function for a non terminal app
|
||||||
acg_add_executable (${targetName} ${sources} ${headers} ${moc_targets})
|
target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
|
||||||
endif ()
|
else ()
|
||||||
|
acg_add_executable (${targetName} ${sources} ${headers} ${moc_targets})
|
||||||
target_link_libraries (${targetName}
|
endif ()
|
||||||
OpenMeshCore
|
|
||||||
OpenMeshTools
|
target_link_libraries (${targetName}
|
||||||
${QT_LIBRARIES}
|
OpenMeshCore
|
||||||
${OPENGL_LIBRARIES}
|
OpenMeshTools
|
||||||
${GLEW_LIBRARY}
|
${QT_LIBRARIES}
|
||||||
${GLUT_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
)
|
${GLEW_LIBRARY}
|
||||||
|
${GLUT_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user