OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated modules for Findcjson and Findopm-parser

Browse Source
This commit is contained in:
Joakim Hove 2013-10-24 15:46:22 +02:00 committed by Bård Skaflestad
parent eab166feea
commit a99277efdf
2 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/Modules/Findcjson.cmake
View File

@ -6,10 +6,6 @@
include (FindPackageHandleStandardArgs) include (FindPackageHandleStandardArgs)
if ((NOT CJSON_ROOT) AND OPM_PARSER_ROOT)
set( CJSON_ROOT ${OPM_PARSER_ROOT})
endif()
if (CJSON_ROOT) if (CJSON_ROOT)
set (_no_default_path "NO_DEFAULT_PATH") set (_no_default_path "NO_DEFAULT_PATH")
else (CJSON_ROOT) else (CJSON_ROOT)
@ -20,7 +16,7 @@ endif (CJSON_ROOT)
find_path (CJSON_INCLUDE_DIR find_path (CJSON_INCLUDE_DIR
NAMES "cjson/cJSON.h" NAMES "cjson/cJSON.h"
HINTS "${CJSON_ROOT}" HINTS "${CJSON_ROOT}"
PATHS "../opm-parser" PATHS "${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/../opm-parser"
PATH_SUFFIXES "include" "opm/json" PATH_SUFFIXES "include" "opm/json"
DOC "Path to cjson library header files" DOC "Path to cjson library header files"
${_no_default_path} ) ${_no_default_path} )
@ -80,6 +76,8 @@ 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 (CJSON_FIND_REQUIRED ${cjson_FIND_REQUIRED})
set (CJSON_FIND_QUIETLY ${cjson_FIND_QUIETLY})
find_package_handle_standard_args (CJSON find_package_handle_standard_args (CJSON
DEFAULT_MSG DEFAULT_MSG
CJSON_INCLUDE_DIRS CJSON_LIBRARIES HAVE_CJSON CJSON_INCLUDE_DIRS CJSON_LIBRARIES HAVE_CJSON

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

@ -18,23 +18,41 @@ else ()
set (OPM_PARSER_QUIET "") set (OPM_PARSER_QUIET "")
endif () endif ()
# use lowercase versions of the variables if those are set
if (opm-parser_ROOT)
set (OPM_PARSER_ROOT ${opm-parser_ROOT})
endif ()
if (opm_ROOT)
set (OPM_ROOT ${opm_ROOT})
endif ()
# inherit "suite" root if not specifically set for this library # inherit "suite" root if not specifically set for this library
if ((NOT OPM_PARSER_ROOT) AND OPM_ROOT) if ((NOT OPM_PARSER_ROOT) AND OPM_ROOT)
set (OPM_PARSER_ROOT "${OPM_ROOT}/opm-parser") set (OPM_PARSER_ROOT "${OPM_ROOT}/opm-parser")
endif () endif ()
# if a root is specified, then don't search in system directories # if a root is specified, then don't search in system directories
# or in relative directories to this one
if (OPM_PARSER_ROOT) if (OPM_PARSER_ROOT)
set (_no_default_path "NO_DEFAULT_PATH") set (_no_default_path "NO_DEFAULT_PATH")
set (_opm_parser_source "")
set (_opm_parser_build "")
else () else ()
set (_no_default_path "") set (_no_default_path "")
set (_opm_parser_source
"${PROJECT_SOURCE_DIR}/../opm-parser")
set (_opm_parser_build
"${PROJECT_BINARY_DIR}/../opm-parser"
"${PROJECT_BINARY_DIR}/../opm-parser-build"
"${PROJECT_BINARY_DIR}/../../opm-parser/build"
"${PROJECT_BINARY_DIR}/../../opm-parser/cmake-build")
endif () endif ()
# use this header as signature # use this header as signature
find_path (OPM_PARSER_INCLUDE_DIR find_path (OPM_PARSER_INCLUDE_DIR
NAMES "opm/parser/eclipse/Parser/Parser.hpp" NAMES "opm/parser/eclipse/Parser/Parser.hpp"
HINTS "${OPM_PARSER_ROOT}" HINTS "${OPM_PARSER_ROOT}"
PATHS "../opm-parser" PATHS ${_opm_parser_source}
PATH_SUFFIXES "include" PATH_SUFFIXES "include"
DOC "Path to OPM parser header files" DOC "Path to OPM parser header files"
${_no_default_path} ) ${_no_default_path} )
@ -49,10 +67,7 @@ endif (CMAKE_SIZEOF_VOID_P)
find_library (OPM_PARSER_LIBRARY find_library (OPM_PARSER_LIBRARY
NAMES "Parser" NAMES "Parser"
HINTS "${OPM_PARSER_ROOT}" HINTS "${OPM_PARSER_ROOT}"
PATHS "${PROJECT_BINARY_DIR}/../opm-parser" PATHS ${_opm_parser_build}
"${PROJECT_BINARY_DIR}/../opm-parser-build"
"${PROJECT_BINARY_DIR}/../../opm-parser/build"
"${PROJECT_BINARY_DIR}/../../opm-parser/cmake-build"
PATH_SUFFIXES "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}" PATH_SUFFIXES "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
"opm/parser/eclipse" "opm/parser/eclipse"
DOC "Path to OPM parser library archive/shared object files" DOC "Path to OPM parser library archive/shared object files"
@ -61,10 +76,7 @@ find_library (OPM_PARSER_LIBRARY
find_library (OPM_JSON_LIBRARY find_library (OPM_JSON_LIBRARY
NAMES "opm-json" NAMES "opm-json"
HINTS "${OPM_PARSER_ROOT}" HINTS "${OPM_PARSER_ROOT}"
PATHS "${PROJECT_BINARY_DIR}/../opm-parser" PATHS ${_opm_parser_build}
"${PROJECT_BINARY_DIR}/../opm-parser-build"
"${PROJECT_BINARY_DIR}/../../opm-parser/build"
"${PROJECT_BINARY_DIR}/../../opm-parser/cmake-build"
PATH_SUFFIXES "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}" PATH_SUFFIXES "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
"opm/json" "opm/json"
DOC "Path to OPM JSON library archive/shared object files" DOC "Path to OPM JSON library archive/shared object files"
@ -120,8 +132,10 @@ 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_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_DIR OPM_PARSER_LIBRARIES HAVE_OPM_PARSER OPM_PARSER_INCLUDE_DIRS OPM_PARSER_LIBRARIES HAVE_OPM_PARSER
) )
set (opm-parser_FOUND ${OPM_PARSER_FOUND}) set (opm-parser_FOUND ${OPM_PARSER_FOUND})