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

Determine that ERT is not found, faster

Browse Source 
Instead of checking every pre-requisite and then determine if the
library is functional, quickly check if the library directories are
present, and if not bail out. The most common reason that ERT is
not usuable, is that it is installed, not that something else is
missing!
This commit is contained in:
Roland Kaufmann 2013-03-06 22:18:21 +01:00
parent fd383d7b50
commit 8946c17330
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/Modules/FindERT.cmake
View File

@ -84,6 +84,20 @@ list (APPEND ERT_LIBRARY
list (APPEND ERT_LIBRARIES ${ERT_LIBRARY}) list (APPEND ERT_LIBRARIES ${ERT_LIBRARY})
list (APPEND ERT_INCLUDE_DIRS ${ERT_INCLUDE_DIR}) list (APPEND ERT_INCLUDE_DIRS ${ERT_INCLUDE_DIR})
# if we didn't find any files, then don't proceed through the entire dependency list
include (FindPackageHandleStandardArgs)
if (ERT_INCLUDE_DIR MATCHES "-NOTFOUND" OR ERT_LIBRARIES MATCHES "-NOTFOUND")
find_package_handle_standard_args (ERT
DEFAULT_MSG
ERT_INCLUDE_DIR ERT_LIBRARY
)
# write unsuccessful result to the cache, as the check_c_source_compiles
# would do if it failed
set (HAVE_ERT)
set (HAVE_ERT "${HAVE_ERT}" CACHE INTERNAL "Did an ERT sample program compile?")
return ()
endif (ERT_INCLUDE_DIR MATCHES "-NOTFOUND" OR ERT_LIBRARIES MATCHES "-NOTFOUND")
# these system variables are probed for, and used in HEADER files (sic) # these system variables are probed for, and used in HEADER files (sic)
list (APPEND ERT_CONFIG_VARS list (APPEND ERT_CONFIG_VARS
HAVE_ISFINITE HAVE_ISFINITE
@ -181,7 +195,6 @@ endif (NOT (ERT_INCLUDE_DIR MATCHES "-NOTFOUND" OR ERT_LIBRARIES MATCHES "-NOTFO
# if the test program didn't compile, but was required to do so, bail # if the test program didn't compile, but was required to do so, bail
# out now and display an error; otherwise limp on # out now and display an error; otherwise limp on
include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (ERT find_package_handle_standard_args (ERT
DEFAULT_MSG DEFAULT_MSG
ERT_INCLUDE_DIR ERT_LIBRARY HAVE_ERT ERT_INCLUDE_DIR ERT_LIBRARY HAVE_ERT