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

fixed: compile cjson object into libopm-json

Browse Source 
i see no reason to keep the separate library and this circumvents
shared vs static linking issues.

an alternative fix is to fix the opm buildsystems to prioritize config
mode. that would be more involved.
This commit is contained in:
Arne Morten Kvarving 2014-11-18 13:17:34 +01:00
parent 870cf4514b
commit 51de1faa85
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opm/json/CMakeLists.txt
View File

@ -1,13 +1,10 @@
if (NOT HAVE_CJSON)
add_library( cjson STATIC cjson/cJSON.c )
set_target_properties(cjson PROPERTIES COMPILE_FLAGS -fPIC)
set( CJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} )
set( CJSON_LIBRARY cjson )
endif()
set( json_source JsonObject.cpp )
set( json_headers JsonObject.hpp )
if (NOT HAVE_CJSON)
list(APPEND json_source cjson/cJSON.c)
set( CJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} )
set(CJSON_LIBRARY "")
endif()
add_library(opm-json ${json_source})
target_link_libraries( opm-json ${CJSON_LIBRARY} ${Boost_LIBRARIES} )