OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 02:00:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix opm-parser find rule

Browse Source 
deals with the fallout of opm-parser #365 and #366
This commit is contained in:
Arne Morten Kvarving 2014-11-18 13:21:08 +01:00 committed by Bård Skaflestad
parent 5dca993b69
commit a9deb4b367
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,21 +109,15 @@ if (NOT ERT_FOUND)
find_package(ERT ${OPM_PARSER_QUIET})
endif ()
# get the prerequisite CJSON library
if (NOT CJSON_FOUND)
find_package(cjson ${OPM_PARSER_QUIET})
endif ()
# get the prerequisite Boost libraries
find_package(Boost 1.44.0 COMPONENTS filesystem date_time system unit_test_framework regex ${OPM_PARSER_QUIET})
if (CJSON_FOUND AND ERT_FOUND AND Boost_FOUND AND
if (ERT_FOUND AND Boost_FOUND AND
OPM_PARSER_LIBRARY AND OPM_JSON_LIBRARY AND OPM_PARSER_INCLUDE_DIR)
# 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
set (opm-parser_INCLUDE_DIRS
${OPM_PARSER_INCLUDE_DIR}
${CJSON_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${ERT_INCLUDE_DIRS})