Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed fixbundle calls if not building apps.

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1314 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2015-07-24 10:09:33 +00:00
parent fad45b7fd6
commit f0c20b4493
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -63,7 +63,7 @@ if ( NOT DEFINED BUILD_APPS )
endif() endif()
# Only call fixbundle, when we are building OpenMesh standalone # 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 (WIN32)
if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" AND BUILD_APPS ) if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" AND BUILD_APPS )

6
src/OpenMesh/Core/CMakeLists.txt
View File

@@ -53,16 +53,16 @@ else ()
endif () endif ()
# Add core as dependency before fixbundle # 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" ) if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
add_dependencies (fixbundle OpenMeshCore) add_dependencies (fixbundle OpenMeshCore)
endif() endif()
endif() endif()
# Add core as dependency before fixbundle # Add core as dependency before fixbundle
if ( APPLE) if ( APPLE )
# let bundle generation depend on targets # let bundle generation depend on targets
add_dependencies (fixbundle OpenMeshCore) add_dependencies (fixbundle OpenMeshCore)
endif () endif ()

5
src/OpenMesh/Tools/CMakeLists.txt
View File

@@ -57,16 +57,15 @@ IF( NOT WIN32 )
target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic) target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic)
ENDIF(NOT WIN32) 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" ) if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
# let bundle generation depend on target # let bundle generation depend on target
add_dependencies (fixbundle OpenMeshTools) add_dependencies (fixbundle OpenMeshTools)
endif() endif()
endif() endif()
# Add tools as dependency before fixbundle # Add tools as dependency before fixbundle
if (APPLE) if (APPLE)
# let bundle generation depend on target # let bundle generation depend on target