Skip to content
Snippets Groups Projects
Commit 83dc7596 authored by Markus Blatt's avatar Markus Blatt
Browse files

[bugfix,cmake] Correctly remove dune-common_MODULE_PATH from CMAKE_MODULE_PATH

This has to be done as each module puts dune-common_MODULE_PATH into
CMAKE_MODULE_PATH to find the DUNE's cmake macros. This should be removed
when building the complete CMAKE_MODULE_PATH module path (in reverse order
of the dependency). Unfortunately, the conditional to check whether
the variable dune-common_MODULE_PATH is set was incorrect. This commit fixes
this.

I hope that this fixes FS 1686
https://dune-project.org/flyspray/index.php?do=details&task_id=1686

Please merge to the release
parent 7330cbcd
No related branches found
No related tags found
No related merge requests found
......@@ -417,9 +417,9 @@ macro(dune_create_dependency_leafs depends depends_versions suggests suggests_ve
endmacro(dune_create_dependency_leafs)
macro(dune_create_dependency_tree)
if(${dune-common_MODULE_PATH})
list(REMOVE_ITEM CMAKE_MODULE_PATH ${dune-common_MODULE_PATH})
endif(${dune-common_MODULE_PATH})
if(dune-common_MODULE_PATH)
list(REMOVE_ITEM CMAKE_MODULE_PATH "${dune-common_MODULE_PATH}")
endif(dune-common_MODULE_PATH)
list(FIND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules start)
set(ALL_DEPENDENCIES "")
if(${ProjectName}_DEPENDS_MODULE OR ${ProjectName}_SUGGESTS_MODULE)
......
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