Commit f0c20b44 authored by Jan Möbius's avatar Jan Möbius

Removed fixbundle calls if not building apps.

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1314 fdac6126-5c0c-442c-9429-916003d36597
parent fad45b7f
......@@ -63,7 +63,7 @@ if ( NOT DEFINED BUILD_APPS )
endif()
# Only call fixbundle, when we are building OpenMesh standalone
if(${PROJECT_NAME} MATCHES "OpenMesh")
if( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
if (WIN32)
if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" AND BUILD_APPS )
......
......@@ -53,16 +53,16 @@ else ()
endif ()
# Add core as dependency before fixbundle
if ( ${PROJECT_NAME} MATCHES "OpenMesh")
if ( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
if ( WIN32 AND BUILD_APPS)
if ( WIN32 )
if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
add_dependencies (fixbundle OpenMeshCore)
endif()
endif()
# Add core as dependency before fixbundle
if ( APPLE)
if ( APPLE )
# let bundle generation depend on targets
add_dependencies (fixbundle OpenMeshCore)
endif ()
......
......@@ -57,16 +57,15 @@ IF( NOT WIN32 )
target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic)
ENDIF(NOT WIN32)
if ( ${PROJECT_NAME} MATCHES "OpenMesh")
if ( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
if ( WIN32 AND BUILD_APPS)
if ( WIN32 )
if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
# let bundle generation depend on target
add_dependencies (fixbundle OpenMeshTools)
endif()
endif()
# Add tools as dependency before fixbundle
if (APPLE)
# let bundle generation depend on target
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment