|
@@ -0,0 +1,34 @@
|
|
|
+From 17107b876fb308e3ef3e759ab90f3d8e4755cdc4 Mon Sep 17 00:00:00 2001
|
|
|
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
+Date: Fri, 8 Nov 2019 14:17:58 +0100
|
|
|
+Subject: [PATCH] CMakeLists.txt: add -c argument to build precompiled headers
|
|
|
+
|
|
|
+Add "-c" argument when building precompiler headers as suggested
|
|
|
+by Arnout in https://patchwork.ozlabs.org/patch/1187328.
|
|
|
+
|
|
|
+This will fix the build with RELRO
|
|
|
+
|
|
|
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
+[Retrieved from:
|
|
|
+https://github.com/domoticz/domoticz/commit/17107b876fb308e3ef3e759ab90f3d8e4755cdc4]
|
|
|
+---
|
|
|
+ CMakeLists.txt | 4 ++--
|
|
|
+ 1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
+
|
|
|
+diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
+index 32a0dd2a8c..010cdf2db8 100644
|
|
|
+--- a/CMakeLists.txt
|
|
|
++++ b/CMakeLists.txt
|
|
|
+@@ -277,10 +277,10 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
|
|
|
+ ENDFOREACH(item)
|
|
|
+
|
|
|
+ SEPARATE_ARGUMENTS(_compiler_FLAGS)
|
|
|
+- MESSAGE("${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_compiler_FLAGS} -x c++-header -o ${_output} ${_source}")
|
|
|
++ MESSAGE("${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_compiler_FLAGS} -x c++-header -c -o ${_output} ${_source}")
|
|
|
+ ADD_CUSTOM_COMMAND(
|
|
|
+ OUTPUT ${_output}
|
|
|
+- COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_compiler_FLAGS} -x c++-header -o ${_output} ${_source}
|
|
|
++ COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} ${_compiler_FLAGS} -x c++-header -c -o ${_output} ${_source}
|
|
|
+ DEPENDS ${_source} )
|
|
|
+ ADD_CUSTOM_TARGET(${_targetName}_gch DEPENDS ${_output})
|
|
|
+ ADD_DEPENDENCIES(${_targetName} ${_targetName}_gch)
|