projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uloop: fix build using C++ compilers
[project/libubox.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index dcd455c02dfb36df7a52ab035e654af2452ee6d8..1a6ff584a337f115cc31b04c3e77af6a8eb35d92 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-21,7
+21,7
@@
IF(JSONC_FOUND)
INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS})
ENDIF()
INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS})
ENDIF()
-SET(SOURCES avl.c avl-cmp.c blob.c blobmsg.c uloop.c usock.c ustream.c ustream-fd.c vlist.c utils.c safe_list.c runqueue.c md5.c kvlist.c ulog.c base64.c)
+SET(SOURCES avl.c avl-cmp.c blob.c blobmsg.c uloop.c usock.c ustream.c ustream-fd.c vlist.c utils.c safe_list.c runqueue.c md5.c kvlist.c ulog.c base64.c
udebug.c udebug-remote.c
)
ADD_LIBRARY(ubox SHARED ${SOURCES})
ADD_LIBRARY(ubox-static STATIC ${SOURCES})
ADD_LIBRARY(ubox SHARED ${SOURCES})
ADD_LIBRARY(ubox-static STATIC ${SOURCES})
@@
-37,6
+37,7
@@
IF(NOT HAVE_GETTIME)
ENDIF()
FILE(GLOB headers *.h)
ENDIF()
FILE(GLOB headers *.h)
+LIST(FILTER headers EXCLUDE REGEX "-priv.h$" )
INSTALL(FILES ${headers}
DESTINATION include/libubox
)
INSTALL(FILES ${headers}
DESTINATION include/libubox
)
@@
-92,3
+93,9
@@
IF(EXISTS ${json})
)
ENDIF()
)
ENDIF()
+
+IF(ABIVERSION)
+ SET_TARGET_PROPERTIES(ubox PROPERTIES VERSION ${ABIVERSION})
+ SET_TARGET_PROPERTIES(json_script PROPERTIES VERSION ${ABIVERSION})
+ SET_TARGET_PROPERTIES(blobmsg_json PROPERTIES VERSION ${ABIVERSION})
+ENDIF()