OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use heuristics when finding rather than adjusting path

Browse Source 
Commit b6cdc06b introduced heuristics to look in the parent directory
for header files alone, while leaving the path for binary files. This
is much better than adjusting the path because one does not potentially
confuse two build directories this way.
This commit is contained in:
Roland Kaufmann
2013-03-20 11:30:44 +01:00
parent b709645181
commit 2b59d556f0
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/Modules/OpmFind.cmake
View File

@@ -93,13 +93,7 @@ macro (find_and_append_package_to prefix name)
# something which is done in our find module
list (FIND _opm_proj_exemptions "${name}" _${name}_exempted)
if ((NOT (_${name}_exempted EQUAL -1)) AND (DEFINED ${name}_DIR))
# most often we are given the name to the build directory and this
# is a sub-directory of the source tree
if (${name}_DIR MATCHES "build")
get_filename_component (${name}_ROOT "${${name}_DIR}" PATH)
else (${name}_DIR MATCHES "build")
set (${name}_ROOT "${${name}_DIR}")
endif (${name}_DIR MATCHES "build")
set (${name}_ROOT "${${name}_DIR}")
# store this for later, in case we reconfigure
set (${name}_ROOT "${${name}_ROOT}" CACHE LOCATION "Path to ${name}")
# clear this to not use config mode