[khronos-opencl-clhpp] 12/13: append to CMAKE_CXX_FLAGS, do not overwrite

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch master
in repository khronos-opencl-clhpp.

commit 5778f912817e2febcab99e3402814d645ebade63
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu Jan 25 02:16:53 2018 +0100

    append to CMAKE_CXX_FLAGS, do not overwrite
---
 debian/changelog               |  1 +
 debian/patches/hardening.patch | 24 ++++++++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4d4e15d..f58590f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ khronos-opencl-clhpp (2.0.10+git12-g5dd8bb9-1) UNRELEASED; urgency=medium
   * Add myself to Uploaders.
   * Switch Vcs-* URLs to salsa.debian.org.
   * Deduplicate *.js in the documentation.
+  * hardening.patch: New, append to CMAKE_CXX_FLAGS, do not overwrite.
 
  -- Andreas Beckmann <anbe at debian.org>  Thu, 25 Jan 2018 00:53:08 +0100
 
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..9dd246e
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,24 @@
+Author: Andreas Beckmann <anbe at debian.org>
+Description: append to CMAKE_CXX_FLAGS, do not overwrite
+
+--- a/examples/src/CMakeLists.txt
++++ b/examples/src/CMakeLists.txt
+@@ -39,9 +39,9 @@ link_directories( ${OPENCL_LIB_DIR} )
+ if( MSVC )
+   set(CMAKE_CXX_FLAGS " -W3 /EHsc" )
+ elseif( CMAKE_COMPILER_IS_GNUCXX )
+-  set(CMAKE_CXX_FLAGS "-Wall -std=c++0x" )
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++0x" )
+ elseif( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
+-  set(CMAKE_CXX_FLAGS "-Wall -std=c++11" )
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11" )
+ endif()
+ 
+ add_executable(trivial ${TRIVIAL_SOURCES} ${TRIVIAL_HEADERS})
+@@ -58,4 +58,4 @@ target_link_libraries( trivialCL2SizeTCo
+ 
+ add_executable(headerexampleCL2 ${HEADEREXAMPLECL2_SOURCES} ${HEADEREXAMPLECL2_HEADERS})
+ add_dependencies(headerexampleCL2 generate_cl2hpp)
+-target_link_libraries( headerexampleCL2 OpenCL )
+\ No newline at end of file
++target_link_libraries( headerexampleCL2 OpenCL )
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..814900f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+hardening.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/khronos-opencl-clhpp.git