Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of glew dependencies

Browse Source 
Remove a lot of unused qt libraries which were linked before
Don't link libXi and Xmu as we don't need it



git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@378 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2011-03-09 09:52:57 +00:00
parent e4549aa386
commit 38cd3513fd
10 changed files with 74 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/OpenMesh/Apps/CMakeLists.txt
View File

@@ -1,11 +1,5 @@
include (ACGCommon)
# find needed packages
find_package (OpenGL)
find_package (GLUT)
find_package (GLEW)
acg_qt4 ()
add_subdirectory (Dualizer)
add_subdirectory (Decimating/commandlineDecimater)
@@ -16,13 +10,40 @@ add_subdirectory (mconvert)
add_subdirectory (VDProgMesh/mkbalancedpm)
add_subdirectory (VDProgMesh/Analyzer)
# check for OpenGL, GLEW and GLUT as our required dependencies
if (QT4_FOUND AND OPENGL_FOUND AND GLEW_FOUND AND GLUT_FOUND AND NOT BUILD_APPS STREQUAL OFF )
# Add non ui apps as dependency before fixbundle
if ( WIN32 OR APPLE)
# let bundle generation depend on all targets
add_dependencies (fixbundle commandlineDecimater Dualizer mconvert Smoothing commandlineAdaptiveSubdivider commandlineSubdivider mkbalancedpm Analyzer )
endif()
# find needed packages for gui applications
find_package (OpenGL)
find_package (GLUT)
# For the apps, we need qt and opengl to build them
if (NOT QT4_FOUND)
find_package (Qt4 COMPONENTS QtCore QtGui )
set (QT_USE_QTOPENGL 1)
include (${QT_USE_FILE})
endif ()
# check for OpenGL and GLUT as our required dependencies
if (QT4_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND NOT BUILD_APPS STREQUAL OFF )
add_subdirectory (Decimating/DecimaterGui)
add_subdirectory (QtViewer)
add_subdirectory (Subdivider/SubdividerGui)
add_subdirectory (ProgViewer)
add_subdirectory (VDProgMesh/Synthesizer)
# Add ui apps as dependency before fixbundle
if ( WIN32 OR APPLE)
# let bundle generation depend on all targets
add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui Synthesizer)
endif()
else ()
if ( BUILD_APPS STREQUAL OFF )
message ("Building Apps disabled by user.")
@@ -36,10 +57,6 @@ else ()
message ("OpengGL not found! Skipping some apps.")
endif ()
if (NOT GLEW_FOUND)
message ("GLEW not found! Skipping some apps.")
endif ()
if (NOT GLUT_FOUND)
message ("GLUT not found! Skipping some apps.")
endif ()