From 94a973a181c312fc2e261d1a0f5bc1bc198be4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 18 Jan 2012 14:35:25 +0000 Subject: [PATCH] Disable apps completly if not standalone git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@510 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Apps/CMakeLists.txt | 127 +++++++++++++++---------------- 1 file changed, 60 insertions(+), 67 deletions(-) diff --git a/src/OpenMesh/Apps/CMakeLists.txt b/src/OpenMesh/Apps/CMakeLists.txt index 40322a31..0768b87a 100644 --- a/src/OpenMesh/Apps/CMakeLists.txt +++ b/src/OpenMesh/Apps/CMakeLists.txt @@ -6,64 +6,58 @@ endif() if ( BUILD_APPS ) -# Only call fixbundle, when we are building OpenMesh standalone -if(${PROJECT_NAME} MATCHES "OpenMesh") + # Only build and fixbundle apps, when we are building OpenMesh standalone + if(${PROJECT_NAME} MATCHES "OpenMesh") + add_subdirectory (Dualizer) + add_subdirectory (Decimating/commandlineDecimater) + add_subdirectory (Smoothing) + add_subdirectory (Subdivider/commandlineSubdivider) + add_subdirectory (Subdivider/commandlineAdaptiveSubdivider) + add_subdirectory (mconvert) + add_subdirectory (VDProgMesh/mkbalancedpm) + add_subdirectory (VDProgMesh/Analyzer) - add_subdirectory (Dualizer) - add_subdirectory (Decimating/commandlineDecimater) - add_subdirectory (Smoothing) - add_subdirectory (Subdivider/commandlineSubdivider) - add_subdirectory (Subdivider/commandlineAdaptiveSubdivider) - add_subdirectory (mconvert) - add_subdirectory (VDProgMesh/mkbalancedpm) - add_subdirectory (VDProgMesh/Analyzer) + # Add non ui apps as dependency before fixbundle + if ( WIN32 ) + if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) + # let bundle generation depend on all targets + add_dependencies (fixbundle commandlineDecimater Dualizer mconvert Smoothing commandlineAdaptiveSubdivider commandlineSubdivider mkbalancedpm Analyzer ) + endif() + endif() - - - - # Add non ui apps as dependency before fixbundle - if ( WIN32 ) - if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) + # Add non ui apps as dependency before fixbundle + if ( 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 () + + if ("${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") + message(WARNING "GUI Apps are not build with mingw. (TODO)") endif() - # Add non ui apps as dependency before fixbundle - if ( 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 () - -if ("${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") - message(WARNING "GUI Apps are not build with mingw. (TODO)") -endif() - -# 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" ) - add_subdirectory (Decimating/DecimaterGui) - add_subdirectory (QtViewer) - add_subdirectory (Subdivider/SubdividerGui) - add_subdirectory (ProgViewer) - add_subdirectory (VDProgMesh/Synthesizer) - - # Make sure that we install all dlls into install directory on windows - if ( ${PROJECT_NAME} MATCHES "OpenMesh") + # 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" ) + 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 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") @@ -81,28 +75,27 @@ 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" ) INSTALL(FILES ${files_install_app_dlls} DESTINATION . ) endif() - endif() -else () - - - + else () + + + - if (NOT QT4_FOUND) - message ("QT 4 not found! Skipping some apps.") + if (NOT QT4_FOUND) + message ("QT 4 not found! Skipping some apps.") + endif () + + if (NOT OPENGL_FOUND) + message ("OpengGL not found! Skipping some apps.") + endif () + + if (NOT GLUT_FOUND) + message ("GLUT not found! Skipping some apps.") + endif () endif () - if (NOT OPENGL_FOUND) - message ("OpengGL not found! Skipping some apps.") - endif () - - if (NOT GLUT_FOUND) - message ("GLUT not found! Skipping some apps.") - endif () -endif () - -endif() # Project is OpenMesh standalone + endif() # Project is OpenMesh standalone else (BUILD_APPS)