From: Maximiliano Curia <maxy@gnuservers.com.ar>
Date: Wed, 28 Aug 2019 14:50:33 +0000 (-0300)
Subject: Use CXX_FLAGS for moc_predefs.h
X-Git-Tag: archive/raspbian/6.6.0-1+rpi1~1^2^2^2^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9476289e904f33c59b5130bc26086b30373231c6;p=kf6-kio.git

Use CXX_FLAGS for moc_predefs.h


Gbp-Pq: Name Use-CXX_FLAGS-for-moc_predefs.h.patch
---

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 3e76d09..2f60ba3 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -258,10 +258,12 @@ endif()
 
 # this should be done by cmake, see bug 371721
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 5.8.0)
+    separate_arguments(_cxxflags NATIVE_COMMAND "${CMAKE_CXX_FLAGS}")
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_predefs.h
-        COMMAND "${CMAKE_CXX_COMPILER}" "${CMAKE_CXX_COMPILER_ARG1}" "-dM" "-E" "-c" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp" > ${CMAKE_CURRENT_BINARY_DIR}/moc_predefs.h
+        COMMAND "${CMAKE_CXX_COMPILER}" "${CMAKE_CXX_COMPILER_ARG1}" ${_cxxflags} "-dM" "-E" "-c" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp" > ${CMAKE_CURRENT_BINARY_DIR}/moc_predefs.h
     )
+    unset(_cxxflags)
     set_property(TARGET KF5KIOCore APPEND PROPERTY AUTOMOC_MOC_OPTIONS --include ${CMAKE_CURRENT_BINARY_DIR}/moc_predefs.h)
     set_property(TARGET KF5KIOCore APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_predefs.h)
 endif()