mirror of
https://github.com/Icinga/icinga2.git
synced 2025-09-22 17:28:02 +02:00
Let CMake handle icinga-app/app.manifest by itself
This BREAKS CMake < v3.4 on Windows. At least this works at all.
This commit is contained in:
parent
d62e8251a2
commit
4bcf0f20dd
@ -2,6 +2,7 @@
|
||||
|
||||
if(MSVC)
|
||||
set(WindowsSources icinga.rc)
|
||||
list(APPEND icinga_app_SOURCES app.manifest)
|
||||
else()
|
||||
set(WindowsSources "")
|
||||
endif()
|
||||
@ -76,20 +77,6 @@ set_target_properties (
|
||||
OUTPUT_NAME icinga2
|
||||
)
|
||||
|
||||
# Amend manifest to tell Windows that the application is DPI aware (needed for Windows 8.1 and up)
|
||||
if(MSVC)
|
||||
if(CMAKE_MAJOR_VERSION LESS 3)
|
||||
MESSAGE(WARNING "CMake version 3.0 or newer is required use build variable TARGET_FILE")
|
||||
else()
|
||||
ADD_CUSTOM_COMMAND(
|
||||
TARGET icinga-app
|
||||
POST_BUILD
|
||||
COMMAND "mt.exe" -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\app.manifest\" -outputresource:\"icinga2\"\;\#1
|
||||
COMMENT "Adding OS version detection manifest..."
|
||||
)
|
||||
endif()
|
||||
endif(MSVC)
|
||||
|
||||
if(WIN32)
|
||||
set(InstallPath "${CMAKE_INSTALL_SBINDIR}")
|
||||
else()
|
||||
|
Loading…
x
Reference in New Issue
Block a user