Commit d101dc29 authored by Martin Heistermann's avatar Martin Heistermann

ovm update / no ovm finder

parent a44fc750
Pipeline #12054 passed with stages
in 47 minutes and 36 seconds
......@@ -217,6 +217,11 @@ if(NO_DECREMENT_DEPRECATED_WARNINGS)
add_definitions( -DNO_DECREMENT_DEPRECATED_WARNINGS )
endif()
# do not show "opengl is deprecated" warnings
if (APPLE)
add_definitions( -DGL_SILENCE_DEPRECATION )
endif()
find_package(ACG)
# OpenMesh is a dependent project (in libs_required) so no finder is needed.
......@@ -262,9 +267,24 @@ file (
set( REMAINING_LOCAL_LIBS "" )
# move the following libraries to the front of the list
# to have add_subdirectory() order match the dependency graph.
set( _local_libs_ordered "" )
foreach(_pattern CoMISo OpenVolumeMesh libHexEx)
foreach (_localLib ${_local_libs_in})
if ( "${_localLib}" MATCHES ".*${_pattern}.*" )
LIST(APPEND _local_libs_ordered ${_localLib})
endif()
endforeach()
endforeach()
LIST(APPEND _local_libs_ordered ${_local_libs_in})
LIST(REMOVE_DUPLICATES _local_libs_ordered)
# Special Comiso case:
# The library has to be configured first
foreach (_localLib ${_local_libs_in})
foreach (_localLib ${_local_libs_ordered})
if ( "${_localLib}" MATCHES .*CoMISo.* )
get_filename_component (_local_lib_dir ${_localLib} PATH)
if ( NOT DEFINED LIB_COMISO_BUILD )
......@@ -281,7 +301,6 @@ foreach (_localLib ${_local_libs_in})
endif()
endforeach ()
# add all found libs to the build
foreach (_localLib ${REMAINING_LOCAL_LIBS})
......
Subproject commit bd0221f62575a80e9c4232d0c44f6bc915c157ad
Subproject commit 87f8b97293f560a7213fe761a042a7938d560d7b
Subproject commit 7b3af15a7effab9cd56bbd7c5ce971da03a222c0
Subproject commit 2adfb82a04f18710a32a315c5db5f6bd825d0885
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