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

Recover external cjson library support.

Browse Source 
This was somehow deactivated when merging opm-parser to opm-common.
This commit is contained in:
Markus Blatt 2021-03-11 16:13:05 +01:00
parent 654a78a541
commit 2e0bc4f17a
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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)
@ -18,10 +14,9 @@ endif (CJSON_ROOT)
find_path (CJSON_INCLUDE_DIR find_path (CJSON_INCLUDE_DIR
NAMES "cjson/cJSON.h" NAMES "cJSON.h"
HINTS "${CJSON_ROOT}" HINTS "${CJSON_ROOT}"
PATHS "${PROJECT_SOURCE_DIR}" PATH_SUFFIXES "cjson"
PATH_SUFFIXES "include" "external"
DOC "Path to cjson library header files" DOC "Path to cjson library header files"
${_no_default_path} ) ${_no_default_path} )
@ -36,11 +31,7 @@ string(REGEX REPLACE "${PROJECT_SOURCE_DIR}/?(.*)" "\\1" BUILD_DIR_SUFFIX "${PR
find_library (CJSON_LIBRARY find_library (CJSON_LIBRARY
NAMES "cjson" NAMES "cjson"
HINTS "${CJSON_ROOT}" HINTS "${CJSON_ROOT}"
PATHS "${PROJECT_BINARY_DIR}/../opm-parser"
"${PROJECT_BINARY_DIR}/../opm-parser${BUILD_DIR_SUFFIX}"
"${PROJECT_BINARY_DIR}/../../opm-parser/${BUILD_DIR_SUFFIX}"
PATH_SUFFIXES "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}" PATH_SUFFIXES "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
"opm/json"
DOC "Path to cjson library archive/shared object files" DOC "Path to cjson library archive/shared object files"
${_no_default_path} ) ${_no_default_path} )

1
opm-common-prereqs.cmake
View File

@ -16,6 +16,7 @@ list(APPEND opm-common_DEPS
# various runtime library enhancements # various runtime library enhancements
"Boost 1.44.0 COMPONENTS system unit_test_framework REQUIRED" "Boost 1.44.0 COMPONENTS system unit_test_framework REQUIRED"
"OpenMP QUIET" "OpenMP QUIET"
"cjson"
) )
find_package_deps(opm-common) find_package_deps(opm-common)