diff options
| author | Tony Theodore <tonyt@logyst.com> | 2018-08-13 11:59:10 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-08-15 02:57:09 (GMT) |
| commit | be51d791a390fe16fc14993f87da69d40b3ecc1d (patch) | |
| tree | d15df7ab3057d46fb94974b782ac1692647f2c07 /src | |
| parent | ccc5e6be635857ba335b8122d6c48a4d9de27f6c (diff) | |
| download | mxe-be51d791a390fe16fc14993f87da69d40b3ecc1d.zip mxe-be51d791a390fe16fc14993f87da69d40b3ecc1d.tar.gz mxe-be51d791a390fe16fc14993f87da69d40b3ecc1d.tar.bz2 | |
cmake: revert "add option to disable -isystem"
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmake-1-fixes.patch | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/src/cmake-1-fixes.patch b/src/cmake-1-fixes.patch index 062c067..346cb8c 100644 --- a/src/cmake-1-fixes.patch +++ b/src/cmake-1-fixes.patch @@ -5,7 +5,7 @@ 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 +Subject: [PATCH 1/2] fix windres invocation options windres doesn't recognise various gcc flags like -mms-bitfields, -fopenmp, -mthreads etc. (basically not `-D` or `-I`) @@ -20,41 +20,15 @@ index 1111111..2222222 100644 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 +Subject: [PATCH 2/2] 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() +@@ -374,7 +374,9 @@ int cmCPackNSISGenerator::InitializeInternal() } #endif |