summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Bentele2020-10-23 18:19:14 +0200
committerManuel Bentele2020-10-23 18:19:14 +0200
commit9d7ead8946516bb753fa341eea9634d0a3a442fc (patch)
tree1e7524aba21711612341a4d12a9157b8fa527fe7
parent[BUILD] disable build of dnbd3-client if Linux kernel module is disabled (diff)
downloaddnbd3-9d7ead8946516bb753fa341eea9634d0a3a442fc.tar.gz
dnbd3-9d7ead8946516bb753fa341eea9634d0a3a442fc.tar.xz
dnbd3-9d7ead8946516bb753fa341eea9634d0a3a442fc.zip
[BUILD] fix comments and remove useless code fragments in CMake files
-rw-r--r--CMakeLists.txt4
-rw-r--r--src/kernel/CMakeLists.txt11
2 files changed, 7 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcdc6b7..122dedd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ if(DNBD3_KERNEL_MODULE AND UNIX AND CMAKE_SYSTEM_NAME MATCHES "Linux")
get_kernel_version(LINUX_KERNEL_VERSION ${KERNEL_BUILD_DIR})
else(DNBD3_KERNEL_MODULE AND UNIX AND CMAKE_SYSTEM_NAME MATCHES "Linux")
# disable build of the dnbd3 Linux kernel module on a system other than Linux, eg. FreeBSD
- message(STATUS "Detected BSD System: Disable build of the dnbd3 Linux kernel module")
+ message(STATUS "Detected non-Linux system: Disable build of the dnbd3 Linux kernel module")
set(DNBD3_KERNEL_MODULE OFF)
endif(DNBD3_KERNEL_MODULE AND UNIX AND CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -82,7 +82,7 @@ set(INCLUDE_VERSION_HEADER_GENERATE ${PROJECT_INCLUDE_GEN_DIR}/dnbd3/version.h)
set(INCLUDE_VERSION_HEADER_GENERATE_PREFIX ${PROJECT_INCLUDE_DIR_PREFIX}/dnbd3)
gen_project_version(${INCLUDE_VERSION_HEADER} ${INCLUDE_VERSION_HEADER_TEMPLATE} ${INCLUDE_VERSION_HEADER_GENERATE})
-# generate project build tpye C header file from template
+# generate project build type C header file from template
# exposes dnbd3-generate-build and dnbd3-build target
set(INCLUDE_BUILD_HEADER_TEMPLATE ${PROJECT_INCLUDE_DIR}/dnbd3/build.h.in)
set(INCLUDE_BUILD_HEADER_GENERATE ${PROJECT_INCLUDE_GEN_DIR}/dnbd3/build.h)
diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index 213098e..a7d7e5e 100644
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -1,17 +1,17 @@
cmake_minimum_required(VERSION 3.10)
# set the project name
-project(dnbd3-kernel-module)
+project(dnbd3-kernel)
# include macros to define Linux kernel build targets
include(Kernel)
# set C flags for a Linux kernel module
set(KERNEL_C_FLAGS "-DDNBD3_KERNEL_MODULE -I ${PROJECT_INCLUDE_GEN_DIR}"
- CACHE STRING "C flags to be used for building the dnbd3 kernel module")
+ CACHE STRING "C flags to be used for building the dnbd3 kernel module")
# set C flags for the debug mode of a Linux kernel module
set(KERNEL_C_FLAGS_DEBUG "-g -DDEBUG"
- CACHE STRING "Additional C flags to be used for building the dnbd3 kernel module in debug mode")
+ CACHE STRING "Additional C flags to be used for building the dnbd3 kernel module in debug mode")
# append include directories to the C flags
get_property(KERNEL_INCLUDE_DIRS DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
@@ -30,8 +30,7 @@ set(KERNEL_MODULE_DNBD3_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/blk.c
${CMAKE_CURRENT_SOURCE_DIR}/net.c
${CMAKE_CURRENT_SOURCE_DIR}/serialize.c
${CMAKE_CURRENT_SOURCE_DIR}/sysfs.c
- ${CMAKE_CURRENT_SOURCE_DIR}/utils.c
- ${PROJECT_VERSION_FILE})
+ ${CMAKE_CURRENT_SOURCE_DIR}/utils.c)
set(KERNEL_MODULE_DNBD3_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/blk.h
${CMAKE_CURRENT_SOURCE_DIR}/dnbd3_main.h
${CMAKE_CURRENT_SOURCE_DIR}/net.h
@@ -44,5 +43,5 @@ add_kernel_module(dnbd3 "${KERNEL_BUILD_DIR}"
"${KERNEL_MODULE_DNBD3_HEADER_FILES}"
${CMAKE_CURRENT_SOURCE_DIR}/Kbuild)
-# add dependency to generate ${PROJECT_VERSION_FILE} before dnbd3.ko is built
+# add dependency to generate project version header before dnbd3.ko is built
add_dependencies(dnbd3 dnbd3-generate-version)