Allow packages to be installed directly in suite dir

Let us specify e.g. --with-dune=/usr, so that the _ROOT variable is
set to e.g. /usr/dune-common, but then backtrack to the parent directory
again if we don't find anything there and search directly in suite dir.
This commit is contained in:
Roland Kaufmann
2013-03-28 23:01:39 +01:00
parent 1754474df1
commit 0054c55019

View File

@@ -123,6 +123,13 @@ macro (find_opm_package module deps header lib defs prog conf)
${${module}_ROOT}
${${MODULE}_ROOT}
)
# if every package is installed directly in the "suite" directory
# (e.g. /usr) then allow us to back-track one directory from the
# module sub-dir that was added by OpmFind (this happens incidently
# already for the source do to the out-of-source support)
if ("${${MODULE}_ROOT}" MATCHES "/${module}$")
list (APPEND _guess_bin ${${MODULE}_ROOT}/..)
endif ("${${MODULE}_ROOT}" MATCHES "/${module}$")
# when we look for the source, it may be that we have been specified
# a build directory which is a sub-dir of the source, so we look in
# the parent also