From 192046017af6b707d35c0d4eb99a41237499b073 Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Tue, 27 Oct 2020 10:08:15 +0100 Subject: [BUILD] remove the build requirement for an unused C++ compiler This patch sets the programming languages of each CMake project to C. With this change, CMake does not search for an unused C++ compiler anymore. --- README.md | 2 -- pkg/CMakeLists.txt | 3 ++- pkg/config/CMakeLists.txt | 3 ++- pkg/systemd/CMakeLists.txt | 3 ++- src/CMakeLists.txt | 3 ++- src/bench/CMakeLists.txt | 3 ++- src/client/CMakeLists.txt | 3 ++- src/fuse/CMakeLists.txt | 3 ++- src/kernel/CMakeLists.txt | 3 ++- src/server/CMakeLists.txt | 3 ++- src/shared/CMakeLists.txt | 3 ++- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 4f00d7a..aae3426 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ apt-get install git \ make \ cmake \ gcc \ - g++ \ linux-headers-generic \ libfuse-dev \ libjansson-dev \ @@ -57,7 +56,6 @@ yum install git \ make \ cmake \ gcc \ - gcc-c++ \ kernel-devel \ elfutils-libelf-devel \ fuse-devel \ diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt index 3112696..3060345 100644 --- a/pkg/CMakeLists.txt +++ b/pkg/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(dnbd3-pkg) +project(dnbd3-pkg + LANGUAGES C) add_subdirectory(config) add_subdirectory(systemd) diff --git a/pkg/config/CMakeLists.txt b/pkg/config/CMakeLists.txt index 1d553db..efbd2bf 100644 --- a/pkg/config/CMakeLists.txt +++ b/pkg/config/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(dnbd3-config) +project(dnbd3-config + LANGUAGES C) # define all configuration files set(DNBD3_CONFIG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/alt-servers diff --git a/pkg/systemd/CMakeLists.txt b/pkg/systemd/CMakeLists.txt index d1e5087..b094b4b 100644 --- a/pkg/systemd/CMakeLists.txt +++ b/pkg/systemd/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(dnbd3-systemd) +project(dnbd3-systemd + LANGUAGES C) # define all systemd related files set(DNBD3_SYSTEMD_FILES ${CMAKE_CURRENT_SOURCE_DIR}/dnbd3-server.service) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d0c61c5..1a7d583 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(dnbd3-src) +project(dnbd3-src + LANGUAGES C) add_subdirectory(bench) if(DNBD3_KERNEL_MODULE) diff --git a/src/bench/CMakeLists.txt b/src/bench/CMakeLists.txt index 59a5ef8..4e2becf 100644 --- a/src/bench/CMakeLists.txt +++ b/src/bench/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(dnbd3-bench) +project(dnbd3-bench + LANGUAGES C) # add compile option to enable enhanced POSIX pthread features add_definitions(-D_GNU_SOURCE) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index c219740..b29825f 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(dnbd3-client) +project(dnbd3-client + LANGUAGES C) # suppress -Wmultichar warnings add_compile_options(-Wno-multichar) diff --git a/src/fuse/CMakeLists.txt b/src/fuse/CMakeLists.txt index 4944a87..e0b6e43 100644 --- a/src/fuse/CMakeLists.txt +++ b/src/fuse/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(dnbd3-fuse) +project(dnbd3-fuse + LANGUAGES C) # add compile option to enable enhanced POSIX pthread features add_definitions(-D_GNU_SOURCE) diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt index a7d7e5e..0f5a4bd 100644 --- a/src/kernel/CMakeLists.txt +++ b/src/kernel/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(dnbd3-kernel) +project(dnbd3-kernel + LANGUAGES C) # include macros to define Linux kernel build targets include(Kernel) diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index de2a550..ff8009f 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(dnbd3-server) +project(dnbd3-server + LANGUAGES C) # find Jansson package required by the dnbd3-server find_package(Jansson) diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index f42b49f..6356399 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(dnbd3-shared) +project(dnbd3-shared + LANGUAGES C) # add compile option to get POLLRDHUP support for signals add_definitions(-D_GNU_SOURCE) -- cgit v1.2.3-55-g7522