diff options
author | bapt <bapt@FreeBSD.org> | 2014-11-29 00:45:09 +0000 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2014-11-29 00:45:09 +0000 |
commit | 7d08b91413fa16522ce2fe9052df826886fe42e4 (patch) | |
tree | da7419ce979eaeb23133fbdfa13129abcde1cfc9 /contrib/libucl/cmake | |
parent | 2aa5fef0aaa6b189fbabb79e67c84c76a4a40d3b (diff) | |
parent | 040f7be2fc3d89695611d460fd55d9b018fd7aa2 (diff) | |
download | FreeBSD-src-7d08b91413fa16522ce2fe9052df826886fe42e4.zip FreeBSD-src-7d08b91413fa16522ce2fe9052df826886fe42e4.tar.gz |
Update libucl to latest version
While here correctly link libucl to libm and register the dependency on libm
for static building
Diffstat (limited to 'contrib/libucl/cmake')
-rw-r--r-- | contrib/libucl/cmake/CMakeLists.txt | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/contrib/libucl/cmake/CMakeLists.txt b/contrib/libucl/cmake/CMakeLists.txt index 4551966..3c57db5 100644 --- a/contrib/libucl/cmake/CMakeLists.txt +++ b/contrib/libucl/cmake/CMakeLists.txt @@ -1,8 +1,8 @@ PROJECT(libucl C) SET(LIBUCL_VERSION_MAJOR 0) -SET(LIBUCL_VERSION_MINOR 2) -SET(LIBUCL_VERSION_PATCH 9) +SET(LIBUCL_VERSION_MINOR 5) +SET(LIBUCL_VERSION_PATCH 0) SET(LIBUCL_VERSION "${LIBUCL_VERSION_MAJOR}.${LIBUCL_VERSION_MINOR}.${LIBUCL_VERSION_PATCH}") @@ -86,6 +86,8 @@ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../uthash") SET(UCLSRC ../src/ucl_util.c ../src/ucl_parser.c ../src/ucl_emitter.c + ../src/ucl_emitter_streamline.c + ../src/ucl_emitter_utils.c ../src/ucl_hash.c ../src/ucl_schema.c ../src/xxhash.c) @@ -98,6 +100,18 @@ ENDIF (BUILD_SHARED_LIBS) ADD_LIBRARY(ucl ${LIB_TYPE} ${UCLSRC}) SET_TARGET_PROPERTIES(ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR}) +IF(WITH_LUA) + SET(UCL_LUA_SRC ../lua/lua_ucl.c) + ADD_LIBRARY(lua-ucl ${LIB_TYPE} ${UCL_LUA_SRC}) + IF(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl "${LUAJIT_LIBRARY}") + ELSE(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl "${LUA_LIBRARY}") + ENDIF(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl ucl) + SET_TARGET_PROPERTIES(lua-ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR}) +ENDIF(WITH_LUA) + IF(HAVE_FETCH_H) TARGET_LINK_LIBRARIES(ucl fetch) ELSE(HAVE_FETCH_H) |