diff options
| author | glx22 <glx@openttd.org> | 2021-02-05 22:31:33 +0100 |
|---|---|---|
| committer | Loïc Guilloux <glx22@users.noreply.github.com> | 2021-02-05 23:41:55 +0100 |
| commit | 99448eedca8f3759b8de44c356f3947dbd6e448b (patch) | |
| tree | e34bb4190a163affbf2574c1f05fe1d088791330 | |
| parent | a667ed945f928a605a7e4c636d62d47eeb8dc6aa (diff) | |
| download | openttd-99448eedca8f3759b8de44c356f3947dbd6e448b.tar.xz | |
Fix: [CMake] os/windows/openttd.manifest is not a generated file
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cmake/CompileFlags.cmake | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ac5be5be..2fb7a2309 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -201,6 +201,11 @@ add_executable(openttd WIN32 ${GENERATED_SOURCE_FILES}) set_target_properties(openttd PROPERTIES OUTPUT_NAME "${BINARY_NAME}") # All other files are added via target_sources() +if(MSVC) + # Add DPI manifest to project; other WIN32 targets get this via ottdres.rc + target_sources(openttd PRIVATE "${CMAKE_SOURCE_DIR}/os/windows/openttd.manifest") +endif() + add_subdirectory(${CMAKE_SOURCE_DIR}/src) add_subdirectory(${CMAKE_SOURCE_DIR}/media/baseset) diff --git a/cmake/CompileFlags.cmake b/cmake/CompileFlags.cmake index 772041a42..f4047b839 100644 --- a/cmake/CompileFlags.cmake +++ b/cmake/CompileFlags.cmake @@ -27,9 +27,6 @@ macro(compile_flags) # Enable multi-threaded compilation. add_compile_options(/MP) endif() - - # Add DPI manifest to project; other WIN32 targets get this via ottdres.rc - list(APPEND GENERATED_SOURCE_FILES "${CMAKE_SOURCE_DIR}/os/windows/openttd.manifest") endif() # Add some -D flags for Debug builds. We cannot use add_definitions(), because |