block: print mountpoint if already mounted

[project/fstools.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5117e8e..7db28c0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,6 @@ ADD_LIBRARY(fstools SHARED
                libfstools/overlay.c
                libfstools/volume.c
                libfstools/mtd.c
-               libfstools/ext4.c
                libfstools/mount.c
                libfstools/ubi.c
                libfstools/find.c)
@@ -39,6 +38,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")
 
@@ -51,12 +53,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)