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

Support more arbitrary sibling/subdir build directories for opm-parser.

Browse Source
This commit is contained in:
Markus Blatt 2014-02-06 13:17:43 +01:00 committed by Bård Skaflestad
parent 991e909af9
commit e99e947927
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,10 @@ 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 ()
# Detect the build dir suffix or subdirectory
string(REGEX REPLACE "${PROJECT_SOURCE_DIR}/?(.*)" "\\1" BUILD_DIR_SUFFIX "${PROJECT_BINARY_DIR}")
message("PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} PROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} BUILD_DIR_SUFFIX=${BUILD_DIR_SUFFIX}")
# 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 # or in relative directories to this one
if (OPM_PARSER_ROOT) if (OPM_PARSER_ROOT)
@ -43,9 +47,8 @@ else ()
"${PROJECT_SOURCE_DIR}/../opm-parser") "${PROJECT_SOURCE_DIR}/../opm-parser")
set (_opm_parser_build set (_opm_parser_build
"${PROJECT_BINARY_DIR}/../opm-parser" "${PROJECT_BINARY_DIR}/../opm-parser"
"${PROJECT_BINARY_DIR}/../opm-parser-build" "${PROJECT_BINARY_DIR}/../opm-parser${BUILD_DIR_SUFFIX}"
"${PROJECT_BINARY_DIR}/../../opm-parser/build" "${PROJECT_BINARY_DIR}/../../opm-parser/${BUILD_DIR_SUFFIX}")
"${PROJECT_BINARY_DIR}/../../opm-parser/cmake-build")
endif () endif ()
# use this header as signature # use this header as signature
@ -82,6 +85,7 @@ if (CMAKE_SIZEOF_VOID_P)
math (EXPR _BITS "8 * ${CMAKE_SIZEOF_VOID_P}") math (EXPR _BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
endif (CMAKE_SIZEOF_VOID_P) endif (CMAKE_SIZEOF_VOID_P)
message("_opm_parser_build=${_opm_parser_build}")
# these libraries constitute the parser core # these libraries constitute the parser core
find_library (OPM_PARSER_LIBRARY find_library (OPM_PARSER_LIBRARY
NAMES "Parser" NAMES "Parser"