X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffstools.git;a=blobdiff_plain;f=CMakeLists.txt;h=826a8523ddfe3b387244a5c9e6d9abfb1728620f;hp=7db28c0ab2ad10e40c527d8d098063a577dcf75c;hb=8ab4fda66a136f5b0f1e5dff9d3649961ffc9158;hpb=35aa20c51995e80257244790d4f058e15f29569f diff --git a/CMakeLists.txt b/CMakeLists.txt index 7db28c0..826a852 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) @@ -55,12 +56,16 @@ 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)