projects
/
oweals
/
fstools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Make blockd link against libjson-c
[oweals/fstools.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 9a5a583c46bf8c72b116f6c5ca102374d3af7702..a828244db1094c65663a1b2a29c92ca8db06855b 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-13,6
+13,7
@@
ADD_LIBRARY(fstools SHARED
libfstools/mtd.c
libfstools/mount.c
libfstools/ubi.c
libfstools/mtd.c
libfstools/mount.c
libfstools/ubi.c
+ libfstools/rootdisk.c
libfstools/find.c)
TARGET_LINK_LIBRARIES(fstools ubox)
INSTALL(TARGETS fstools LIBRARY DESTINATION lib)
libfstools/find.c)
TARGET_LINK_LIBRARIES(fstools ubox)
INSTALL(TARGETS fstools LIBRARY DESTINATION lib)
@@
-53,12
+54,18
@@
ADD_EXECUTABLE(mount_root mount_root.c)
TARGET_LINK_LIBRARIES(mount_root fstools)
INSTALL(TARGETS mount_root RUNTIME DESTINATION sbin)
TARGET_LINK_LIBRARIES(mount_root fstools)
INSTALL(TARGETS mount_root RUNTIME DESTINATION sbin)
-ADD_EXECUTABLE(block block.c)
+find_library(json NAMES json-c json)
+
+ADD_EXECUTABLE(blockd blockd.c)
+TARGET_LINK_LIBRARIES(blockd fstools ubus blobmsg_json ${json})
+INSTALL(TARGETS blockd RUNTIME DESTINATION sbin)
+
+ADD_EXECUTABLE(block block.c probe.c probe-libblkid.c)
IF(DEFINED CMAKE_UBIFS_EXTROOT)
ADD_DEFINITIONS(-DUBIFS_EXTROOT)
IF(DEFINED CMAKE_UBIFS_EXTROOT)
ADD_DEFINITIONS(-DUBIFS_EXTROOT)
- TARGET_LINK_LIBRARIES(block blkid-tiny
uci ubox blobmsg_json ubi-utils
)
+ TARGET_LINK_LIBRARIES(block blkid-tiny
dl uci ubox ubus blobmsg_json ubi-utils ${json}
)
ELSE(DEFINED CMAKE_UBIFS_EXTROOT)
ELSE(DEFINED CMAKE_UBIFS_EXTROOT)
- TARGET_LINK_LIBRARIES(block blkid-tiny
uci ubox blobmsg_json
)
+ TARGET_LINK_LIBRARIES(block blkid-tiny
dl uci ubox ubus blobmsg_json ${json}
)
ENDIF(DEFINED CMAKE_UBIFS_EXTROOT)
INSTALL(TARGETS block RUNTIME DESTINATION sbin)
ENDIF(DEFINED CMAKE_UBIFS_EXTROOT)
INSTALL(TARGETS block RUNTIME DESTINATION sbin)