|
1 | | -From 8886e3dce286f807bd6c0f93683cad0c5a16a283 Mon Sep 17 00:00:00 2001 |
2 | | -From: Umberto Baldi < [email protected]> |
3 | | -Date: Thu, 5 May 2022 15:12:46 +0200 |
4 | | -Subject: [PATCH] CMake fix build not working with mingw toolchain |
5 | | - |
6 | | ---- |
7 | | - src/CMakeLists.txt | 6 +++--- |
8 | | - 1 file changed, 3 insertions(+), 3 deletions(-) |
9 | | - |
10 | 1 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
11 | | -index 9eae65e..94ef468 100644 |
| 2 | +index ca6cb64..2ccf4af 100644 |
12 | 3 | --- a/src/CMakeLists.txt |
13 | 4 | +++ b/src/CMakeLists.txt |
14 | | -@@ -50,12 +50,12 @@ endif() |
| 5 | +@@ -50,7 +50,7 @@ endif() |
15 | 6 | include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) |
16 | 7 | add_compile_definitions(CONFIG_DIR=\"${CONFIG_DIR}\") |
17 | 8 |
|
18 | 9 | -if(WIN32) |
19 | | -+if(MINGW) |
20 | | - set(EXTRA_WINDOWS_SOURCES "${PROJECT_BINARY_DIR}/src/windows.rc") |
| 10 | ++if(WIN32 OR MINGW) |
| 11 | + set(EXTRA_WINDOWS_RESOURCES "${PROJECT_BINARY_DIR}/src/windows.rc") |
21 | 12 | set(EXTRA_WINDOWS_LIBRARIES setupapi ws2_32) |
22 | 13 | endif() |
| 14 | +@@ -108,7 +108,7 @@ endif() |
23 | 15 |
|
24 | | --if(NOT WIN32) |
25 | | -+if(NOT MINGW) |
26 | | - set(LIB_MATH m) |
27 | | - add_compile_options(-Wall) # -Wextra |
28 | | - endif() |
29 | | -@@ -102,7 +102,7 @@ file(WRITE "${PROJECT_BINARY_DIR}/avrdude.conf.in" "${conf_file}") |
30 | 16 | configure_file(cmake_config.h.in ac_cfg.h) |
31 | | - configure_file("${PROJECT_BINARY_DIR}/avrdude.conf.in" avrdude.conf) |
32 | 17 | configure_file(avrdude.spec.in avrdude.spec) |
33 | 18 | -if(WIN32) |
34 | | -+if(MINGW) |
| 19 | ++if(WIN32 OR MINGW) |
35 | 20 | configure_file(windows.rc.in windows.rc) |
36 | 21 | endif() |
37 | 22 |
|
38 | | --- |
39 | | -2.17.1 |
40 | | - |
0 commit comments