Removed some duplicate code
This commit is contained in:
@@ -23,19 +23,10 @@ if ( BUILD_APPS )
|
|||||||
add_subdirectory (VDProgMesh/Analyzer)
|
add_subdirectory (VDProgMesh/Analyzer)
|
||||||
|
|
||||||
# Add non ui apps as dependency before fixbundle
|
# Add non ui apps as dependency before fixbundle
|
||||||
if ( WIN32 )
|
if ( APPLE OR (WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) )
|
||||||
if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
|
|
||||||
# let bundle generation depend on all targets
|
# let bundle generation depend on all targets
|
||||||
add_dependencies (fixbundle commandlineDecimater Dualizer mconvert Smoothing commandlineAdaptiveSubdivider commandlineSubdivider mkbalancedpm Analyzer )
|
add_dependencies (fixbundle commandlineDecimater Dualizer mconvert Smoothing commandlineAdaptiveSubdivider commandlineSubdivider mkbalancedpm Analyzer )
|
||||||
endif()
|
endif()
|
||||||
endif()
|
|
||||||
|
|
||||||
# Add non ui apps as dependency before fixbundle
|
|
||||||
if ( APPLE)
|
|
||||||
# let bundle generation depend on all targets
|
|
||||||
add_dependencies (fixbundle commandlineDecimater Dualizer mconvert Smoothing commandlineAdaptiveSubdivider commandlineSubdivider mkbalancedpm Analyzer )
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
set( OpenGL_GL_PREFERENCE GLVND)
|
set( OpenGL_GL_PREFERENCE GLVND)
|
||||||
|
|
||||||
|
|||||||
@@ -172,15 +172,7 @@ endif ()
|
|||||||
# Add core as dependency before fixbundle
|
# Add core as dependency before fixbundle
|
||||||
if ( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
|
if ( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
|
||||||
|
|
||||||
if ( WIN32 )
|
if ( APPLE OR (WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) )
|
||||||
if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
|
|
||||||
add_dependencies (fixbundle OpenMeshCore)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Add core as dependency before fixbundle
|
|
||||||
if ( APPLE )
|
|
||||||
# let bundle generation depend on targets
|
|
||||||
add_dependencies (fixbundle OpenMeshCore)
|
add_dependencies (fixbundle OpenMeshCore)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user