mirror of
https://github.com/monero-project/monero.git
synced 2024-11-06 08:27:37 +00:00
68 lines
2.8 KiB
Diff
68 lines
2.8 KiB
Diff
|
This file is part of MXE. See LICENSE.md for licensing information.
|
||
|
|
|
||
|
|
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
|
||
|
|
Subject: [PATCH 1/3] fix windres invocation options
|
||
|
|
|
||
|
|
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>")
|
||
|
|
|
||
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tony Theodore <tonyt@logyst.com>
|
||
|
|
Date: Tue, 25 Jul 2017 20:34:56 +1000
|
||
|
|
Subject: [PATCH 2/3] add option to disable -isystem
|
||
|
|
|
||
|
|
taken from (not accepted):
|
||
|
|
https://gitlab.kitware.com/cmake/cmake/merge_requests/895
|
||
|
|
|
||
|
|
see also:
|
||
|
|
https://gitlab.kitware.com/cmake/cmake/issues/16291
|
||
|
|
https://gitlab.kitware.com/cmake/cmake/issues/16919
|
||
|
|
|
||
|
|
diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake
|
||
|
|
index 1111111..2222222 100644
|
||
|
|
--- a/Modules/Compiler/GNU.cmake
|
||
|
|
+++ b/Modules/Compiler/GNU.cmake
|
||
|
|
@@ -42,7 +42,7 @@ macro(__compiler_gnu lang)
|
||
|
|
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
|
||
|
|
set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
|
||
|
|
set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
|
||
|
|
- if(NOT APPLE OR NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4) # work around #4462
|
||
|
|
+ if(NOT APPLE OR NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4 AND (NOT MXE_DISABLE_INCLUDE_SYSTEM_FLAG)) # work around #4462
|
||
|
|
set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
|
||
|
|
endif()
|
||
|
|
endmacro()
|
||
|
|
|
||
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tony Theodore <tonyt@logyst.com>
|
||
|
|
Date: Tue, 15 Aug 2017 15:25:06 +1000
|
||
|
|
Subject: [PATCH 3/3] add CPACK_NSIS_EXECUTABLE variable
|
||
|
|
|
||
|
|
|
||
|
|
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
|
||
|
|
@@ -384,7 +384,9 @@ int cmCPackNSISGenerator::InitializeInternal()
|
||
|
|
}
|
||
|
|
#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(
|