From f07a72be63cfd99a81428813cc2ebaadffed3219 Mon Sep 17 00:00:00 2001 From: Pavel Siska Date: Thu, 3 Oct 2024 21:47:04 +0200 Subject: [PATCH] cmake - remove unnecessary lines --- CMakeLists.txt | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a143ff..382aa57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,12 +9,13 @@ project(telemetry VERSION ${VERSION}) include(cmake/build_type.cmake) include(cmake/installation.cmake) +include(cmake/dependencies.cmake) -option(TELEMETRY_BUILD_SHARED "Build shared library" ON) +option(TELEMETRY_BUILD_SHARED "Build shared library" ON) option(TELEMETRY_PACKAGE_BUILDER "Enable RPM package builder (make rpm)" ON) option(TELEMETRY_INSTALL_TARGETS "Generate the install target" ON) -option(TELEMETRY_ENABLE_TESTS "Build Unit tests (make test)" OFF) -option(ENABLE_DOC_DOXYGEN "Enable build of code documentation" OFF) +option(TELEMETRY_ENABLE_TESTS "Build Unit tests (make test)" OFF) +option(ENABLE_DOC_DOXYGEN "Enable build of code documentation" OFF) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -25,15 +26,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Wunused -Wconve set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Werror") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -ggdb3") -# This option ensures that standard include header paths are explicitly added -# to the generated compile_commands.json file. -# clang-tidy doesn't seem to find standard include headers otherwise. -if (CMAKE_EXPORT_COMPILE_COMMANDS) - set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}) -endif() - -include(cmake/dependencies.cmake) - if (TELEMETRY_ENABLE_TESTS) include(cmake/googletest.cmake) include(GoogleTest)