Also look in corresponding build-dir as ourself

If we are building in a sub-dir to the source tree, guess that a
dependent module is also that, and that the directory that is given
is for the suite, not for the project alone.
This commit is contained in:
Roland Kaufmann
2013-04-02 13:05:02 +02:00
parent 0054c55019
commit 760739bf2d

View File

@@ -128,7 +128,12 @@ macro (find_opm_package module deps header lib defs prog conf)
# 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}/..)
get_filename_component (_suite_parent ${${MODULE}_ROOT} PATH)
list (APPEND _guess_bin
${_suite_parent}
${_suite_parent}/${module}
${_suite_parent}/${module}/${_build_dir}
)
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