From 31818555cf5e6b5b3ead43cc0c84aa5ca9419f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 9 Mar 2011 12:46:49 +0000 Subject: [PATCH] Fixbundle only in standalone mode git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@386 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/CMakeLists.txt | 18 ++++++++++-------- src/OpenMesh/Tools/CMakeLists.txt | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt index aa24a962..90901fcb 100644 --- a/src/OpenMesh/Core/CMakeLists.txt +++ b/src/OpenMesh/Core/CMakeLists.txt @@ -40,15 +40,17 @@ else () endif () -# Add core as dependency before fixbundle -if ( WIN32 OR APPLE) - # let bundle generation depend on targets - add_dependencies (fixbundle OpenMeshCore) -endif () +if ( ${PROJECT_NAME} MATCHES "OpenMesh") + # Add core as dependency before fixbundle + if ( WIN32 OR APPLE) + # let bundle generation depend on targets + add_dependencies (fixbundle OpenMeshCore) + endif () -if ( APPLE) - # let bundle generation depend on target - add_dependencies (fixbundle OpenMeshToolsStatic) + if ( APPLE) + # let bundle generation depend on target + add_dependencies (fixbundle OpenMeshToolsStatic) + endif() endif() diff --git a/src/OpenMesh/Tools/CMakeLists.txt b/src/OpenMesh/Tools/CMakeLists.txt index 55d23815..9cf9cc74 100644 --- a/src/OpenMesh/Tools/CMakeLists.txt +++ b/src/OpenMesh/Tools/CMakeLists.txt @@ -47,15 +47,17 @@ IF( NOT WIN32 ) target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic) ENDIF(NOT WIN32) -# Add tools as dependency before fixbundle -if ( WIN32 OR APPLE) - # let bundle generation depend on target - add_dependencies (fixbundle OpenMeshTools) -endif() +if ( ${PROJECT_NAME} MATCHES "OpenMesh") + # Add tools as dependency before fixbundle + if ( WIN32 OR APPLE) + # let bundle generation depend on target + add_dependencies (fixbundle OpenMeshTools) + endif() -if ( APPLE) - # let bundle generation depend on target - add_dependencies (fixbundle OpenMeshToolsStatic) + if ( APPLE) + # let bundle generation depend on target + add_dependencies (fixbundle OpenMeshToolsStatic) + endif() endif()