block: prevent mount point confusion

[oweals/fstools.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6aa2de001d39557293defb497589aebccd31629..f86a4d5af4477903f3b1a595c67fb5f5ee785134 100644 (file)
--- 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 "")
 
@@ -24,8 +24,10 @@ 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/btrfs.c
@@ -50,18 +52,30 @@ INSTALL(FILES libubi/libubi-tiny.h libubi/libubi.h libubi/ubi-media.h
        DESTINATION include
 )
 
+IF(DEFINED CMAKE_OVL_MOUNT_COMPRESS_ZLIB)
+       ADD_DEFINITIONS(-DOVL_MOUNT_COMPRESS_ZLIB)
+ENDIF(DEFINED CMAKE_OVL_MOUNT_COMPRESS_ZLIB)
+
+IF(DEFINED CMAKE_OVL_MOUNT_FULL_ACCESS_TIME)
+       ADD_DEFINITIONS(-DOVL_MOUNT_FULL_ACCESS_TIME)
+ENDIF(DEFINED CMAKE_OVL_MOUNT_FULL_ACCESS_TIME)
+
 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)
+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 ${json})
+       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 ${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)