d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mxe/src/cmake-1-fixes.patch

42 lines
1.6 KiB
Diff
Raw Normal View History

Copyright headers: point to LICENSE.md and shorten The following script was applied: sed ':a;/part of MXE.$/{N;s/\n//;ba}' -i $(git grep -l 'part of MXE') sed 's/\(part of MXE\).*\(See index.html\)/\1. \2/' -i \ $(git grep -l 'part of MXE.*See index.html') before='This file is part of MXE. See index.html for further information.' after='This file is part of MXE. See LICENSE.md for licensing information.' sed "s/$before/$after/" -i $(git grep -l 'part of MXE') Then git grep 'index.html for further information' revealed two other files. One of them was patched manually (patch.mk). Makefile has text "See index.html for further information" unrelated to licensing. See https://github.com/mxe/mxe/issues/1500#issuecomment-241340792
2016-08-22 20:52:34 +01:00
This file is part of MXE. See LICENSE.md for licensing information.
cmake: fix windres invocation Windres doesn't recognise various gcc flags like `-mms-bitfields`, `-fopenmp`, `-mthreads` etc. (basically anything not `-D` or `-I`). CMake will filter options if `add_compile_options()` is used, but not for `add_definitions()`. The developers class it as a "won't fix" as they believe `add_definitions()` shouldn't be used for such flags. Fixes #1475
2016-08-11 17:10:23 +01:00
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Fri, 12 Aug 2016 02:01:20 +1000
cmake: revert "add option to disable -isystem"
2018-08-13 12:59:10 +01:00
Subject: [PATCH 1/2] fix windres invocation options
cmake: fix windres invocation Windres doesn't recognise various gcc flags like `-mms-bitfields`, `-fopenmp`, `-mthreads` etc. (basically anything not `-D` or `-I`). CMake will filter options if `add_compile_options()` is used, but not for `add_definitions()`. The developers class it as a "won't fix" as they believe `add_definitions()` shouldn't be used for such flags. Fixes #1475
2016-08-11 17:10:23 +01:00
windres doesn't recognise various gcc flags like -mms-bitfields,
-fopenmp, -mthreads etc. (basically not `-D` or `-I`)
diff --git a/Modules/Platform/Windows-windres.cmake b/Modules/Platform/Windows-windres.cmake
index 1111111..2222222 100644
--- a/Modules/Platform/Windows-windres.cmake
+++ b/Modules/Platform/Windows-windres.cmake
@@ -1 +1 @@
-set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> <INCLUDES> <FLAGS> <SOURCE> <OBJECT>")
+set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> <INCLUDES> <SOURCE> <OBJECT>")
cmake: add option to disable -isystem Alternative to #1811, this seems like it should be fixed upstream in gcc/cmake rather than individual packages
2017-07-25 12:09:02 +01:00
cmake: add prefixed cpack and CPACK_NSIS_EXECUTABLE see #1502
2017-08-15 06:44:59 +01:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 15 Aug 2017 15:25:06 +1000
cmake: revert "add option to disable -isystem"
2018-08-13 12:59:10 +01:00
Subject: [PATCH 2/2] add CPACK_NSIS_EXECUTABLE variable
cmake: add prefixed cpack and CPACK_NSIS_EXECUTABLE see #1502
2017-08-15 06:44:59 +01:00
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 1111111..2222222 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
cmake: revert "add option to disable -isystem"
2018-08-13 12:59:10 +01:00
@@ -374,7 +374,9 @@ int cmCPackNSISGenerator::InitializeInternal()
cmake: add prefixed cpack and CPACK_NSIS_EXECUTABLE see #1502
2017-08-15 06:44:59 +01:00
}
#endif
- nsisPath = cmSystemTools::FindProgram("makensis", path, false);
+ this->SetOptionIfNotSet("CPACK_NSIS_EXECUTABLE", "makensis");
+ nsisPath = cmSystemTools::FindProgram(
+ this->GetOption("CPACK_NSIS_EXECUTABLE"), path, false);
if (nsisPath.empty()) {
cmCPackLogger(