X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=CMakeLists.txt;h=9e855bda27699f26e0831565a3813daa55636132;hb=HEAD;hp=ba375f2cc62ffe6477fdc825624a0751882cf973;hpb=83cf8896a598fb9fc58da0a9bb4f137695f78853;p=project%2Ffstools.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba375f2..9e855bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 
 PROJECT(fs-tools C)
-ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations)
+ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations -Wno-format-truncation)
 
 SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
 
@@ -13,6 +13,7 @@ ADD_LIBRARY(fstools SHARED
 		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)
@@ -23,10 +24,15 @@ ADD_LIBRARY(blkid-tiny SHARED
 		libblkid-tiny/ext.c
 		libblkid-tiny/jffs2.c
 		libblkid-tiny/vfat.c
+		libblkid-tiny/ntfs.c
 		libblkid-tiny/hfs.c
 		libblkid-tiny/swap.c
+		libblkid-tiny/ubi.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
@@ -35,6 +41,9 @@ ADD_LIBRARY(ubi-utils STATIC
 		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")
 
@@ -47,12 +56,18 @@ ADD_EXECUTABLE(mount_root mount_root.c)
 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)
-	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)
-	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)
 
@@ -65,5 +80,5 @@ TARGET_LINK_LIBRARIES(snapshot_tool fstools)
 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)