Skip to content
Snippets Groups Projects
Commit 601c6f8e authored by Andreas Dedner's avatar Andreas Dedner
Browse files

Merge branch 'feature/make-version-check-of-suggested-module-non-fatal' into 'master'

Make version check of suggested modules non-fatal.

See merge request core/dune-common!433
parents b94c5ae2 735dc88a
No related branches found
No related tags found
No related merge requests found
......@@ -153,8 +153,10 @@ macro(find_dune_package module)
if(DUNE_FIND_REQUIRED)
set(required REQUIRED)
set_package_properties(${module} PROPERTIES TYPE REQUIRED)
set(_warning_level "FATAL_ERROR")
else()
unset(required)
set(_warning_level "WARNING")
set_package_properties(${module} PROPERTIES TYPE OPTIONAL)
endif()
if(DUNE_FIND_VERSION MATCHES "(>=|=|<=).*")
......@@ -253,13 +255,15 @@ macro(find_dune_package module)
endif()
endforeach()
if(NOT ${module}_dune_module)
message(FATAL_ERROR "Could not find dune.module file for module ${module} "
message(${warning_level} "Could not find dune.module file for module ${module} "
"in ${${module}_PREFIX}, ${${module}_PREFIX}/lib/dunecontrol/${module}/, "
"${${module}_PREFIX}/lib64/dunecontrol/${module}/dune.module")
set(${module}_FOUND OFF)
endif()
if(module_version_wrong)
message(FATAL_ERROR "Could not find requested version of module ${module}. "
message(${warning_level} "Could not find requested version of module ${module}. "
"Requested version was ${DUNE_FIND_VERSION}, found version is ${DUNE_FIND_MOD_VERSION_STRING}")
set(${module}_FOUND OFF)
endif()
else(${module}_FOUND)
if(required)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment