From eac3cdc7f68d1a8ac3996896cb1d54b93251d69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 18 Jan 2012 10:38:54 +0000 Subject: [PATCH] More fixbundle git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@508 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Apps/CMakeLists.txt | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/OpenMesh/Apps/CMakeLists.txt b/src/OpenMesh/Apps/CMakeLists.txt index b19af427..0f10ae65 100644 --- a/src/OpenMesh/Apps/CMakeLists.txt +++ b/src/OpenMesh/Apps/CMakeLists.txt @@ -58,21 +58,22 @@ if (QT4_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND NOT "${CMAKE_GENERATOR}" MATCH 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") - # let bundle generation depend on all targets - add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui Synthesizer) - endif() - - # Add ui apps as dependency before fixbundle - if ( APPLE) - # let bundle generation depend on all targets - add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui Synthesizer) - endif() - + # Make sure that we install all dlls into install directory on windows - if ( ${PROJECT_NAME} MATCHES "OpenMesh") + if ( ${PROJECT_NAME} MATCHES "OpenMesh") + + # Add ui apps as dependency before fixbundle + if ( WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") + # let bundle generation depend on all targets + add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui Synthesizer) + endif() + + # Add ui apps as dependency before fixbundle + if ( APPLE) + # let bundle generation depend on all targets + add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui Synthesizer) + endif() + if ( WIN32 ) FILE(GLOB files_install_app_dlls "${CMAKE_BINARY_DIR}/Build/*.dll" ) INSTALL(FILES ${files_install_app_dlls} DESTINATION . )