80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix manifest inclusion on CMake <3.22

Browse Source
This commit is contained in:
David Hrdlička
2021-12-23 22:01:26 +01:00
parent bb0d48f684
commit 2a61133a9e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/win/CMakeLists.txt
View File

@@ -27,13 +27,17 @@ if(NOT CPPTHREADS)
target_sources(plat PRIVATE win_thread.c) target_sources(plat PRIVATE win_thread.c)
endif() endif()
if(NOT MINGW) # CMake 3.22 messed this up for clang/clang++
# See https://gitlab.kitware.com/cmake/cmake/-/issues/22611
if(MSVC OR (NOT MINGW AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.22))
# MSVC linker adds its own manifest to the executable, which fails if # MSVC linker adds its own manifest to the executable, which fails if
# we include ours in 86Box.rc. We therefore need to pass the manifest # we include ours in 86Box.rc. We therefore need to pass the manifest
# directly as as a source file, so the linker can use that instead. # directly as as a source file, so the linker can use that instead.
set_property(SOURCE 86Box.rc PROPERTY COMPILE_DEFINITIONS NO_INCLUDE_MANIFEST) set_property(SOURCE 86Box.rc PROPERTY COMPILE_DEFINITIONS NO_INCLUDE_MANIFEST)
target_sources(86Box PRIVATE 86Box.manifest) target_sources(86Box PRIVATE 86Box.manifest)
endif()
if(NOT MINGW)
# Append null to resource strings (fixes file dialogs) # Append null to resource strings (fixes file dialogs)
set_property(SOURCE 86Box.rc PROPERTY COMPILE_FLAGS -n) set_property(SOURCE 86Box.rc PROPERTY COMPILE_FLAGS -n)