projects
/
project
/
fstools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: disable the format-truncation warning error to fix gcc 7 build errors
[project/fstools.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
d3762af
..
04d9470
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,7
+1,7
@@
cmake_minimum_required(VERSION 2.6)
PROJECT(fs-tools C)
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-error=format-truncation
)
SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
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/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)
libfstools/find.c)
TARGET_LINK_LIBRARIES(fstools ubox)
INSTALL(TARGETS fstools LIBRARY DESTINATION lib)
@@
-28,6
+29,7
@@
ADD_LIBRARY(blkid-tiny SHARED
libblkid-tiny/ubifs.c
libblkid-tiny/squashfs.c
libblkid-tiny/btrfs.c
libblkid-tiny/ubifs.c
libblkid-tiny/squashfs.c
libblkid-tiny/btrfs.c
+ libblkid-tiny/f2fs.c
)
INSTALL(TARGETS blkid-tiny LIBRARY DESTINATION lib)
)
INSTALL(TARGETS blkid-tiny LIBRARY DESTINATION lib)
@@
-37,6
+39,9
@@
ADD_LIBRARY(ubi-utils STATIC
libubi/ubiutils-common.c)
INSTALL(TARGETS ubi-utils ARCHIVE DESTINATION lib)
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")
SET_TARGET_PROPERTIES(ubi-utils PROPERTIES COMPILE_FLAGS
"-ffunction-sections -fdata-sections")
@@
-49,12
+54,18
@@
ADD_EXECUTABLE(mount_root mount_root.c)
TARGET_LINK_LIBRARIES(mount_root fstools)
INSTALL(TARGETS mount_root RUNTIME DESTINATION sbin)
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)
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)
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)
ENDIF(DEFINED CMAKE_UBIFS_EXTROOT)
INSTALL(TARGETS block RUNTIME DESTINATION sbin)