From 089444e957d66375fbf4678a65d5106c7349223a Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Tue, 27 Oct 2020 07:23:38 +0100 Subject: 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 -- src/CMakeLists.txt | 3 ++- src/kernel/CMakeLists.txt | 3 ++- src/kernel/tests/CMakeLists.txt | 3 ++- src/kernel/tests/lib/CMakeLists.txt | 3 ++- src/kernel/tests/testcases/kernel/syscalls/ioctl/CMakeLists.txt | 3 ++- src/utils/CMakeLists.txt | 3 ++- src/utils/lib/CMakeLists.txt | 3 ++- src/utils/libsmartcols/CMakeLists.txt | 3 ++- src/utils/sys-utils/CMakeLists.txt | 3 ++- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 89fa346..1552091 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,6 @@ apt-get install git \ make \ cmake \ gcc \ - g++ \ linux-headers-generic \ libcap-dev \ libncurses-dev \ @@ -52,7 +51,6 @@ yum install git \ make \ cmake \ gcc \ - gcc-c++ \ kernel-devel \ elfutils-libelf-devel \ libcap-devel \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 646a53f..7b88af3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(xloop-src) +project(xloop-src + LANGUAGES C) add_subdirectory(kernel) add_subdirectory(utils) diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt index 2f1446a..3dcc8a2 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(xloop-kernel) +project(xloop-kernel-modules + LANGUAGES C) # include macros to define Linux kernel build targets include(Kernel) diff --git a/src/kernel/tests/CMakeLists.txt b/src/kernel/tests/CMakeLists.txt index 201abcb..cf274ef 100644 --- a/src/kernel/tests/CMakeLists.txt +++ b/src/kernel/tests/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.10) -project(xloop-kernel-test) +project(xloop-kernel-test + LANGUAGES C) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/old) diff --git a/src/kernel/tests/lib/CMakeLists.txt b/src/kernel/tests/lib/CMakeLists.txt index 5b3f421..fafdd38 100644 --- a/src/kernel/tests/lib/CMakeLists.txt +++ b/src/kernel/tests/lib/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.10) -project(xloop-kernel-test-lib) +project(xloop-kernel-test-lib + LANGUAGES C) add_library(libltp STATIC ${CMAKE_CURRENT_SOURCE_DIR}/cloner.c ${CMAKE_CURRENT_SOURCE_DIR}/get_path.c diff --git a/src/kernel/tests/testcases/kernel/syscalls/ioctl/CMakeLists.txt b/src/kernel/tests/testcases/kernel/syscalls/ioctl/CMakeLists.txt index f503838..c6156f6 100644 --- a/src/kernel/tests/testcases/kernel/syscalls/ioctl/CMakeLists.txt +++ b/src/kernel/tests/testcases/kernel/syscalls/ioctl/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.10) -project(xloop-kernel-test-ioctl_xloop) +project(xloop-kernel-test-ioctl_xloop + LANGUAGES C) # test ioctl_xloop01 add_executable(ioctl_xloop01 ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_xloop01.c) diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index f3ea912..e791a40 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(xloop-utils) +project(xloop-utils + LANGUAGES C) # include global headers include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/src/utils/lib/CMakeLists.txt b/src/utils/lib/CMakeLists.txt index 22eafb3..ac70039 100644 --- a/src/utils/lib/CMakeLists.txt +++ b/src/utils/lib/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(xloop-utils-lib) +project(xloop-utils-lib + LANGUAGES C) add_library(libcommon STATIC ${CMAKE_CURRENT_SOURCE_DIR}/blkdev.c ${CMAKE_CURRENT_SOURCE_DIR}/canonicalize.c diff --git a/src/utils/libsmartcols/CMakeLists.txt b/src/utils/libsmartcols/CMakeLists.txt index dccb5e2..307f06d 100644 --- a/src/utils/libsmartcols/CMakeLists.txt +++ b/src/utils/libsmartcols/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(xloop-utils-libsmartcols) +project(xloop-utils-libsmartcols + LANGUAGES C) add_library(libsmartcols STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/buffer.c ${CMAKE_CURRENT_SOURCE_DIR}/src/calculate.c diff --git a/src/utils/sys-utils/CMakeLists.txt b/src/utils/sys-utils/CMakeLists.txt index e05b5cf..56bc69c 100644 --- a/src/utils/sys-utils/CMakeLists.txt +++ b/src/utils/sys-utils/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10) # set the project name -project(xloop-utils-sys-utils) +project(xloop-utils-sys-utils + LANGUAGES C) # add xlosetup executable add_executable(xlosetup ${CMAKE_CURRENT_SOURCE_DIR}/xlosetup.c) -- cgit v1.2.3-55-g7522