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

Removed CJSON check to top level CMakeLists.txt file

Browse Source
This commit is contained in:
Joakim Hove 2013-10-21 17:12:01 +02:00
parent f934254f90
commit 7bbeffc017
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/json/CMakeLists.txt
View File

@ -1,12 +1,9 @@
add_subdirectory( tests )
enable_language( C ) enable_language( C )
find_package(cjson) if (NOT HAVE_CJSON)
if (HAVE_CJSON)
include_directories( ${CJSON_INCLUDE_DIR} )
else()
add_library( cjson cjson/cJSON.c ) add_library( cjson cjson/cJSON.c )
set( CJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} )
install( TARGETS cjson DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install( TARGETS cjson DESTINATION ${CMAKE_INSTALL_LIBDIR} )
install( FILES cjson/cJSON.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/cjson ) install( FILES cjson/cJSON.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/cjson )
@ -25,3 +22,4 @@ foreach ( header ${json_headers} )
install( FILES ${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/opm/json RENAME ${header}) install( FILES ${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/opm/json RENAME ${header})
endforeach() endforeach()
add_subdirectory( tests )