Disable apps completly if not standalone

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@510 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2012-01-18 14:35:25 +00:00
parent 426e96b5cb
commit 94a973a181

View File

@@ -6,9 +6,8 @@ endif()
if ( BUILD_APPS ) if ( BUILD_APPS )
# Only call fixbundle, when we are building OpenMesh standalone # Only build and fixbundle apps, when we are building OpenMesh standalone
if(${PROJECT_NAME} MATCHES "OpenMesh") if(${PROJECT_NAME} MATCHES "OpenMesh")
add_subdirectory (Dualizer) add_subdirectory (Dualizer)
add_subdirectory (Decimating/commandlineDecimater) add_subdirectory (Decimating/commandlineDecimater)
@@ -19,9 +18,6 @@ if(${PROJECT_NAME} MATCHES "OpenMesh")
add_subdirectory (VDProgMesh/mkbalancedpm) add_subdirectory (VDProgMesh/mkbalancedpm)
add_subdirectory (VDProgMesh/Analyzer) add_subdirectory (VDProgMesh/Analyzer)
# Add non ui apps as dependency before fixbundle # Add non ui apps as dependency before fixbundle
if ( WIN32 ) if ( WIN32 )
if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
@@ -37,33 +33,31 @@ if(${PROJECT_NAME} MATCHES "OpenMesh")
endif() endif()
# find needed packages for gui applications # find needed packages for gui applications
find_package (OpenGL) find_package (OpenGL)
find_package (GLUT) find_package (GLUT)
# For the apps, we need qt and opengl to build them # For the apps, we need qt and opengl to build them
if (NOT QT4_FOUND) if (NOT QT4_FOUND)
find_package (Qt4 COMPONENTS QtCore QtGui ) find_package (Qt4 COMPONENTS QtCore QtGui )
set (QT_USE_QTOPENGL 1) set (QT_USE_QTOPENGL 1)
include (${QT_USE_FILE}) include (${QT_USE_FILE})
endif () endif ()
if ("${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") if ("${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles")
message(WARNING "GUI Apps are not build with mingw. (TODO)") message(WARNING "GUI Apps are not build with mingw. (TODO)")
endif() endif()
# check for OpenGL and GLUT as our required dependencies # check for OpenGL and GLUT as our required dependencies
if (QT4_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) if (QT4_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
add_subdirectory (Decimating/DecimaterGui) add_subdirectory (Decimating/DecimaterGui)
add_subdirectory (QtViewer) add_subdirectory (QtViewer)
add_subdirectory (Subdivider/SubdividerGui) add_subdirectory (Subdivider/SubdividerGui)
add_subdirectory (ProgViewer) add_subdirectory (ProgViewer)
add_subdirectory (VDProgMesh/Synthesizer) add_subdirectory (VDProgMesh/Synthesizer)
# Make sure that we install all dlls into install directory on windows
if ( ${PROJECT_NAME} MATCHES "OpenMesh")
# Add ui apps as dependency before fixbundle # Add ui apps as dependency before fixbundle
if ( WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") if ( WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles")
@@ -81,10 +75,9 @@ if (QT4_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND NOT "${CMAKE_GENERATOR}" MATCH
FILE(GLOB files_install_app_dlls "${CMAKE_BINARY_DIR}/Build/*.dll" ) FILE(GLOB files_install_app_dlls "${CMAKE_BINARY_DIR}/Build/*.dll" )
INSTALL(FILES ${files_install_app_dlls} DESTINATION . ) INSTALL(FILES ${files_install_app_dlls} DESTINATION . )
endif() endif()
endif()
else () else ()
@@ -100,9 +93,9 @@ else ()
if (NOT GLUT_FOUND) if (NOT GLUT_FOUND)
message ("GLUT not found! Skipping some apps.") message ("GLUT not found! Skipping some apps.")
endif () endif ()
endif () endif ()
endif() # Project is OpenMesh standalone endif() # Project is OpenMesh standalone
else (BUILD_APPS) else (BUILD_APPS)