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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba375f2..b6aa2de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
@@ -26,7 +27,10 @@ ADD_LIBRARY(blkid-tiny SHARED
 		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
@@ -35,6 +39,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 +54,14 @@ ADD_EXECUTABLE(mount_root mount_root.c)
 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)
-	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)
-	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)
 
@@ -65,5 +74,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)