mirror of
https://github.com/Icinga/icinga2.git
synced 2026-02-03 20:40:17 -05:00
Merge pull request #10625 from Icinga/cmake4-compat-2.13
Some checks are pending
Linux / alpine:bash (push) Waiting to run
Linux / amazonlinux:2 (push) Waiting to run
Linux / amazonlinux:2023 (push) Waiting to run
Linux / debian:11 (linux/386) (push) Waiting to run
Linux / debian:11 (push) Waiting to run
Linux / debian:12 (linux/386) (push) Waiting to run
Linux / debian:12 (push) Waiting to run
Linux / debian:13 (push) Waiting to run
Linux / fedora:41 (push) Waiting to run
Linux / fedora:42 (push) Waiting to run
Linux / opensuse/leap:15.6 (push) Waiting to run
Linux / registry.suse.com/suse/sle15:15.6 (push) Waiting to run
Linux / registry.suse.com/suse/sle15:15.7 (push) Waiting to run
Linux / rockylinux/rockylinux:10 (push) Waiting to run
Linux / rockylinux:8 (push) Waiting to run
Linux / rockylinux:9 (push) Waiting to run
Linux / ubuntu:22.04 (push) Waiting to run
Linux / ubuntu:24.04 (push) Waiting to run
Linux / ubuntu:25.04 (push) Waiting to run
Windows / Windows (push) Waiting to run
Some checks are pending
Linux / alpine:bash (push) Waiting to run
Linux / amazonlinux:2 (push) Waiting to run
Linux / amazonlinux:2023 (push) Waiting to run
Linux / debian:11 (linux/386) (push) Waiting to run
Linux / debian:11 (push) Waiting to run
Linux / debian:12 (linux/386) (push) Waiting to run
Linux / debian:12 (push) Waiting to run
Linux / debian:13 (push) Waiting to run
Linux / fedora:41 (push) Waiting to run
Linux / fedora:42 (push) Waiting to run
Linux / opensuse/leap:15.6 (push) Waiting to run
Linux / registry.suse.com/suse/sle15:15.6 (push) Waiting to run
Linux / registry.suse.com/suse/sle15:15.7 (push) Waiting to run
Linux / rockylinux/rockylinux:10 (push) Waiting to run
Linux / rockylinux:8 (push) Waiting to run
Linux / rockylinux:9 (push) Waiting to run
Linux / ubuntu:22.04 (push) Waiting to run
Linux / ubuntu:24.04 (push) Waiting to run
Linux / ubuntu:25.04 (push) Waiting to run
Windows / Windows (push) Waiting to run
Backport changes to increase the CMake minimum version to 3.8 to support 2.13 support branch
This commit is contained in:
commit
331ab06f48
2 changed files with 10 additions and 2 deletions
|
|
@ -1,6 +1,7 @@
|
|||
# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
|
||||
|
||||
cmake_minimum_required(VERSION 2.8.8)
|
||||
# CMake 3.8 is required, CMake policy compatibility was verified up to 3.17.
|
||||
cmake_minimum_required(VERSION 3.8...3.17)
|
||||
set(BOOST_MIN_VERSION "1.66.0")
|
||||
|
||||
project(icinga2)
|
||||
|
|
@ -13,6 +14,10 @@ if(NOT CMAKE_BUILD_TYPE)
|
|||
FORCE)
|
||||
endif()
|
||||
|
||||
# Include symbols in executables so that function names can be printed in stack traces, for example in crash dumps.
|
||||
set(CMAKE_ENABLE_EXPORTS ON) # Added in CMake 3.4
|
||||
set(CMAKE_EXECUTABLE_ENABLE_EXPORTS ON) # Added in CMake 3.27 and supersedes the above one.
|
||||
|
||||
option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ON)
|
||||
option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ON)
|
||||
option(ICINGA2_WITH_CHECKER "Build the checker module" ON)
|
||||
|
|
@ -225,7 +230,6 @@ if(WIN32)
|
|||
list(APPEND base_DEPS ws2_32 dbghelp shlwapi msi)
|
||||
endif()
|
||||
|
||||
set(CMAKE_MACOSX_RPATH 1)
|
||||
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${CMAKE_INSTALL_FULL_LIBDIR}/icinga2")
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
|
|
|
|||
|
|
@ -19,6 +19,10 @@ set_target_properties(
|
|||
FOLDER Bin
|
||||
OUTPUT_NAME icinga2-installer
|
||||
LINK_FLAGS "/SUBSYSTEM:WINDOWS"
|
||||
|
||||
# Use a statically-linked runtime library as this binary is run during the installation process where the other DLLs
|
||||
# may not have been installed already and the system-provided version may be too old.
|
||||
MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
|
||||
)
|
||||
|
||||
target_link_libraries(icinga-installer shlwapi)
|
||||
|
|
|
|||
Loading…
Reference in a new issue