From c5eed88e17a728937cbec3fad69219a345ab0aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 11 Oct 2011 06:50:57 +0000 Subject: [PATCH] Correct build on windows without apps git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@429 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/CMakeLists.txt | 13 ++++++++----- src/OpenMesh/Tools/CMakeLists.txt | 9 ++++++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt index 90901fcb..af0375fe 100644 --- a/src/OpenMesh/Core/CMakeLists.txt +++ b/src/OpenMesh/Core/CMakeLists.txt @@ -40,17 +40,20 @@ else () endif () +# Add core as dependency before fixbundle if ( ${PROJECT_NAME} MATCHES "OpenMesh") # Add core as dependency before fixbundle - if ( WIN32 OR APPLE) + + if ( WIN32 AND BUILD_APPS ) + # let bundle generation depend on targets + add_dependencies (fixbundle OpenMeshCore) + endif() + + if ( APPLE) # let bundle generation depend on targets add_dependencies (fixbundle OpenMeshCore) endif () - 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 9cf9cc74..7db17c56 100644 --- a/src/OpenMesh/Tools/CMakeLists.txt +++ b/src/OpenMesh/Tools/CMakeLists.txt @@ -48,8 +48,15 @@ IF( NOT WIN32 ) ENDIF(NOT WIN32) if ( ${PROJECT_NAME} MATCHES "OpenMesh") + + if ( WIN32 AND BUILD_APPS ) + # let bundle generation depend on target + add_dependencies (fixbundle OpenMeshTools) + endif() + + # Add tools as dependency before fixbundle - if ( WIN32 OR APPLE) + if (APPLE) # let bundle generation depend on target add_dependencies (fixbundle OpenMeshTools) endif()