From 572ac46d8580b0849f55f7563b691d6cd2f2965d Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Wed, 18 Dec 2019 15:09:18 +0000 Subject: [PATCH] build: include GNUInstallDirs module Co-authored-by: Lorenzo Fontana Signed-off-by: Leonardo Di Donato --- CMakeLists.txt | 13 ++++---- rules/CMakeLists.txt | 74 +++++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 99a64fbb..9fd415fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,24 +15,24 @@ cmake_minimum_required(VERSION 3.5.1) project(falco) option(USE_BUNDLED_DEPS "Bundle hard to find dependencies into the Falco binary" OFF) +option(BUILD_WARNINGS_AS_ERRORS "Enable building with -Wextra -Werror flags" OFF) +option(USE_BUNDLED_DEPS "Enable bundled dependencies instead of using the system ones" OFF) +# Make flag for parallel processing include(ProcessorCount) processorcount(PROCESSOR_COUNT) if(NOT PROCESSOR_COUNT EQUAL 0) set(PROCESSOUR_COUNT_MAKE_FLAG -j${PROCESSOR_COUNT}) endif() -# if(NOT SYSDIG_DIR) get_filename_component(SYSDIG_DIR "${PROJECT_SOURCE_DIR}/../sysdig" REALPATH) endif() - # Custom CMake modules list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") -list(APPEND CMAKE_MODULE_PATH "${SYSDIG_DIR}/cmake/modules") -option(BUILD_WARNINGS_AS_ERRORS "Enable building with -Wextra -Werror flags") -option(USE_BUNDLED_DEPS "Enable bundled dependencies instead of using the system ones" OFF) +# GNU standard installation directories' definitions +include(GNUInstallDirs) if(NOT DEFINED FALCO_ETC_DIR) - set(FALCO_ETC_DIR "/etc/falco") + set(FALCO_ETC_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/falco") endif() if(NOT DRAIOS_DEBUG_FLAGS) @@ -65,7 +65,6 @@ set(CMAKE_CXX_FLAGS_DEBUG "${DRAIOS_DEBUG_FLAGS}") set(CMAKE_C_FLAGS_RELEASE "-O3 -fno-strict-aliasing -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O3 -fno-strict-aliasing -DNDEBUG") -add_definitions(-DPLATFORM_NAME="${CMAKE_SYSTEM_NAME}") add_definitions(-DK8S_DISABLE_THREAD) if(CMAKE_SYSTEM_NAME MATCHES "Linux") add_definitions(-DHAS_CAPTURE) diff --git a/rules/CMakeLists.txt b/rules/CMakeLists.txt index 4817eae0..d7e8b30c 100644 --- a/rules/CMakeLists.txt +++ b/rules/CMakeLists.txt @@ -1,21 +1,21 @@ # # Copyright (C) 2019 The Falco Authors. # +# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the +# specific language governing permissions and limitations under the License. # + +# GNU standard installation directories' definitions +include(GNUInstallDirs) + if(NOT DEFINED FALCO_ETC_DIR) - set(FALCO_ETC_DIR "/etc/falco") + set(FALCO_ETC_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/falco") endif() if(NOT DEFINED FALCO_RULES_DEST_FILENAME) @@ -26,35 +26,39 @@ if(NOT DEFINED FALCO_RULES_DEST_FILENAME) endif() if(DEFINED FALCO_COMPONENT) -install(FILES falco_rules.yaml - COMPONENT "${FALCO_COMPONENT}" - DESTINATION "${FALCO_ETC_DIR}" - RENAME "${FALCO_RULES_DEST_FILENAME}") + install( + FILES falco_rules.yaml + COMPONENT "${FALCO_COMPONENT}" + DESTINATION "${FALCO_ETC_DIR}" + RENAME "${FALCO_RULES_DEST_FILENAME}") -install(FILES falco_rules.local.yaml - COMPONENT "${FALCO_COMPONENT}" - DESTINATION "${FALCO_ETC_DIR}" - RENAME "${FALCO_LOCAL_RULES_DEST_FILENAME}") + install( + FILES falco_rules.local.yaml + COMPONENT "${FALCO_COMPONENT}" + DESTINATION "${FALCO_ETC_DIR}" + RENAME "${FALCO_LOCAL_RULES_DEST_FILENAME}") -# Intentionally *not* installing application_rules.yaml. Not needed -# when falco is embedded in other projects. + # Intentionally *not* installing application_rules.yaml. Not needed when falco is embedded in other projects. else() -install(FILES falco_rules.yaml - DESTINATION "${FALCO_ETC_DIR}" - RENAME "${FALCO_RULES_DEST_FILENAME}") + install( + FILES falco_rules.yaml + DESTINATION "${FALCO_ETC_DIR}" + RENAME "${FALCO_RULES_DEST_FILENAME}") -install(FILES falco_rules.local.yaml - DESTINATION "${FALCO_ETC_DIR}" - RENAME "${FALCO_LOCAL_RULES_DEST_FILENAME}") + install( + FILES falco_rules.local.yaml + DESTINATION "${FALCO_ETC_DIR}" + RENAME "${FALCO_LOCAL_RULES_DEST_FILENAME}") -install(FILES k8s_audit_rules.yaml - DESTINATION "${FALCO_ETC_DIR}" - RENAME "${FALCO_K8S_AUDIT_RULES_DEST_FILENAME}") + install( + FILES k8s_audit_rules.yaml + DESTINATION "${FALCO_ETC_DIR}" + RENAME "${FALCO_K8S_AUDIT_RULES_DEST_FILENAME}") -install(FILES application_rules.yaml - DESTINATION "/etc/falco/rules.available" - RENAME "${FALCO_APP_RULES_DEST_FILENAME}") + install( + FILES application_rules.yaml + DESTINATION "/etc/falco/rules.available" + RENAME "${FALCO_APP_RULES_DEST_FILENAME}") -install(DIRECTORY DESTINATION "/etc/falco/rules.d") + install(DIRECTORY DESTINATION "/etc/falco/rules.d") endif() -