Correct build on windows without apps
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@429 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
@@ -40,17 +40,20 @@ else ()
|
|||||||
|
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
# Add core as dependency before fixbundle
|
||||||
if ( ${PROJECT_NAME} MATCHES "OpenMesh")
|
if ( ${PROJECT_NAME} MATCHES "OpenMesh")
|
||||||
# Add core as dependency before fixbundle
|
# 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
|
# let bundle generation depend on targets
|
||||||
add_dependencies (fixbundle OpenMeshCore)
|
add_dependencies (fixbundle OpenMeshCore)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if ( APPLE)
|
|
||||||
# let bundle generation depend on target
|
|
||||||
add_dependencies (fixbundle OpenMeshToolsStatic)
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -48,8 +48,15 @@ IF( NOT WIN32 )
|
|||||||
ENDIF(NOT WIN32)
|
ENDIF(NOT WIN32)
|
||||||
|
|
||||||
if ( ${PROJECT_NAME} MATCHES "OpenMesh")
|
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
|
# Add tools as dependency before fixbundle
|
||||||
if ( WIN32 OR APPLE)
|
if (APPLE)
|
||||||
# let bundle generation depend on target
|
# let bundle generation depend on target
|
||||||
add_dependencies (fixbundle OpenMeshTools)
|
add_dependencies (fixbundle OpenMeshTools)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user