projects
/
project
/
fstools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: allow block info /dev/ubi?_?
[project/fstools.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
ba375f2
..
7db28c0
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-26,7
+26,10
@@
ADD_LIBRARY(blkid-tiny SHARED
libblkid-tiny/hfs.c
libblkid-tiny/swap.c
libblkid-tiny/ubifs.c
libblkid-tiny/hfs.c
libblkid-tiny/swap.c
libblkid-tiny/ubifs.c
- libblkid-tiny/squashfs.c)
+ libblkid-tiny/squashfs.c
+ libblkid-tiny/btrfs.c
+ libblkid-tiny/f2fs.c
+ )
INSTALL(TARGETS blkid-tiny LIBRARY DESTINATION lib)
ADD_LIBRARY(ubi-utils STATIC
INSTALL(TARGETS blkid-tiny LIBRARY DESTINATION lib)
ADD_LIBRARY(ubi-utils STATIC
@@
-35,6
+38,9
@@
ADD_LIBRARY(ubi-utils STATIC
libubi/ubiutils-common.c)
INSTALL(TARGETS ubi-utils ARCHIVE DESTINATION lib)
libubi/ubiutils-common.c)
INSTALL(TARGETS ubi-utils ARCHIVE DESTINATION lib)
+FIND_PATH(ubox_include_dir libubox/ulog.h)
+INCLUDE_DIRECTORIES(${ubox_include_dir})
+
SET_TARGET_PROPERTIES(ubi-utils PROPERTIES COMPILE_FLAGS
"-ffunction-sections -fdata-sections")
SET_TARGET_PROPERTIES(ubi-utils PROPERTIES COMPILE_FLAGS
"-ffunction-sections -fdata-sections")
@@
-47,12
+53,14
@@
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)
+find_library(json NAMES json-c json)
+
ADD_EXECUTABLE(block block.c)
IF(DEFINED CMAKE_UBIFS_EXTROOT)
ADD_DEFINITIONS(-DUBIFS_EXTROOT)
ADD_EXECUTABLE(block block.c)
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 uci ubox 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 uci ubox 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)
@@
-65,5
+73,5
@@
TARGET_LINK_LIBRARIES(snapshot_tool fstools)
INSTALL(TARGETS snapshot_tool RUNTIME DESTINATION sbin)
ADD_EXECUTABLE(ubi ubi.c)
INSTALL(TARGETS snapshot_tool RUNTIME DESTINATION sbin)
ADD_EXECUTABLE(ubi ubi.c)
-TARGET_LINK_LIBRARIES(ubi ubi-utils)
+TARGET_LINK_LIBRARIES(ubi ubi-utils
ubox
)
INSTALL(TARGETS ubi RUNTIME DESTINATION sbin)
INSTALL(TARGETS ubi RUNTIME DESTINATION sbin)