Removed duplicate cmake code
Prefer GLVND OpenGL
This commit is contained in:
@@ -37,6 +37,8 @@ if ( BUILD_APPS )
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
set( OpenGL_GL_PREFERENCE GLVND)
|
||||||
|
|
||||||
# find needed packages for gui applications
|
# find needed packages for gui applications
|
||||||
find_package (OpenGL)
|
find_package (OpenGL)
|
||||||
|
|
||||||
@@ -70,13 +72,8 @@ if ( BUILD_APPS )
|
|||||||
|
|
||||||
|
|
||||||
# Add ui apps as dependency before fixbundle
|
# Add ui apps as dependency before fixbundle
|
||||||
if ( WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles")
|
# Required on Windows (NOTMINGW) and APPLE
|
||||||
# let bundle generation depend on all targets
|
if ( APPLE OR (WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") )
|
||||||
add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui Synthesizer)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Add ui apps as dependency before fixbundle
|
|
||||||
if ( APPLE)
|
|
||||||
# let bundle generation depend on all targets
|
# let bundle generation depend on all targets
|
||||||
add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui Synthesizer)
|
add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui Synthesizer)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user