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

Findopm-parser.cmake: Fix it up, next try

Browse Source 
thanks to Arne Morten Kvarving, Bård Skaflestad and Roland Kaufmann
for the discussion.
This commit is contained in:
Andreas Lauser 2014-06-13 13:36:11 +02:00
parent f5823d2ea2
commit 1ef41b2733
1 changed files with 33 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
cmake/Modules/Findopm-parser.cmake
View File

@ -78,6 +78,11 @@ if ((NOT OPM_PARSER_INCLUDE_DIR) AND
endif () endif ()
endif () endif ()
# find out the size of a pointer. this is required to only search for
# libraries in the directories relevant for the architecture
if (CMAKE_SIZEOF_VOID_P)
math (EXPR _BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
endif ()
# these libraries constitute the parser core # these libraries constitute the parser core
find_library (OPM_PARSER_LIBRARY find_library (OPM_PARSER_LIBRARY
@ -101,30 +106,28 @@ find_library (OPM_JSON_LIBRARY
# get the prerequisite ERT libraries # get the prerequisite ERT libraries
if (NOT ERT_FOUND) if (NOT ERT_FOUND)
find_package(ERT ${opm-parser_FIND_REQUIRED} ${OPM_PARSER_QUIET}) find_package(ERT ${OPM_PARSER_QUIET})
endif () endif ()
# get the prerequisite CJSON library # get the prerequisite CJSON library
if (NOT CJSON_FOUND) if (NOT CJSON_FOUND)
find_package(cjson ${opm-parser_FIND_REQUIRED} ${OPM_PARSER_QUIET}) find_package(cjson ${OPM_PARSER_QUIET})
endif () endif ()
# # get the prerequisite Boost libraries # get the prerequisite Boost libraries
# find_package(Boost 1.44.0 find_package(Boost 1.44.0 COMPONENTS filesystem date_time system unit_test_framework ${OPM_PARSER_QUIET})
# COMPONENTS filesystem date_time system unit_test_framework
# ${opm-parser_FIND_REQUIRED} ${OPM_PARSER_QUIET})
if (NOT CJSON_FOUND OR NOT ERT_FOUND OR NOT Boost_FOUND) if (CJSON_FOUND AND ERT_FOUND AND Boost_FOUND AND
set(opm-parser_FOUND "0") OPM_PARSER_LIBRARY AND OPM_JSON_LIBRARY AND OPM_PARSER_INCLUDE_DIR)
else()
# setup list of all required libraries to link with opm-parser. notice that # setup list of all required libraries to link with opm-parser. notice that
# we use the plural form to get *all* the libraries needed by cjson # we use the plural form to get *all* the libraries needed by cjson
set (OPM_PARSER_INCLUDE_DIRS set (opm-parser_INCLUDE_DIRS
${OPM_PARSER_INCLUDE_DIR} ${OPM_PARSER_INCLUDE_DIR}
${CJSON_INCLUDE_DIRS} ${CJSON_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}) ${Boost_INCLUDE_DIRS}
${ERT_INCLUDE_DIRS})
set (OPM_PARSER_LIBRARIES set (opm-parser_LIBRARIES
${OPM_PARSER_LIBRARY} ${OPM_PARSER_LIBRARY}
${OPM_JSON_LIBRARY} ${OPM_JSON_LIBRARY}
${CJSON_LIBRARIES} ${CJSON_LIBRARIES}
@ -133,13 +136,11 @@ else()
# see if we can compile a minimum example # see if we can compile a minimum example
# CMake logical test doesn't handle lists (sic) # CMake logical test doesn't handle lists (sic)
if (NOT (OPM_PARSER_INCLUDE_DIR MATCHES "-NOTFOUND"
OR OPM_PARSER_LIBRARIES MATCHES "-NOTFOUND"))
include (CMakePushCheckState) include (CMakePushCheckState)
include (CheckCSourceCompiles) include (CheckCSourceCompiles)
cmake_push_check_state () cmake_push_check_state ()
set (CMAKE_REQUIRED_INCLUDES ${OPM_PARSER_INCLUDE_DIRS}) set (CMAKE_REQUIRED_INCLUDES ${opm-parser_INCLUDE_DIRS})
set (CMAKE_REQUIRED_LIBRARIES ${OPM_PARSER_LIBRARIES}) set (CMAKE_REQUIRED_LIBRARIES ${opm-parser_LIBRARIES})
check_cxx_source_compiles ( check_cxx_source_compiles (
"#include <cstdlib> "#include <cstdlib>
@ -149,28 +150,17 @@ int main (void) {
return EXIT_SUCCESS; return EXIT_SUCCESS;
}" HAVE_OPM_PARSER) }" HAVE_OPM_PARSER)
cmake_pop_check_state () cmake_pop_check_state ()
else ()
# clear the cache so the find probe is attempted again if files become
# available (only upon a unsuccessful *compile* should we disable further
# probing)
set (HAVE_OPM_PARSER)
unset (HAVE_OPM_PARSER CACHE)
endif() endif()
# 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
set (OPM_PARSER_FIND_REQUIRED ${opm-parser_FIND_REQUIRED}) set (OPM_PARSER_FIND_REQUIRED ${opm-parser_FIND_REQUIRED})
set (OPM_PARSER_FIND_QUIETLY ${opm-parser_FIND_QUIETLY}) find_package_handle_standard_args (opm-parser
find_package_handle_standard_args (OPM_PARSER
DEFAULT_MSG DEFAULT_MSG
OPM_PARSER_INCLUDE_DIRS OPM_PARSER_LIBRARIES HAVE_OPM_PARSER opm-parser_INCLUDE_DIRS opm-parser_LIBRARIES HAVE_OPM_PARSER
) )
endif()
set (opm-parser_FOUND ${OPM_PARSER_FOUND})
if(OPM_PARSER_FOUND)
set (HAVE_OPM_PARSER "1")
else()
set (HAVE_OPM_PARSER "0")
endif()
set (opm-parser_CONFIG_VARS "HAVE_OPM_PARSER") set (opm-parser_CONFIG_VARS "HAVE_OPM_PARSER")
set (opm-parser_FOUND ${OPM-PARSER_FOUND})
mark_as_advanced(opm-parser_LIBRARIES opm-parser_INCLUDE_DIRS OPM-PARSER_FOUND)