[oclgrind] 01/01: Preserve external CMAKE_{C, CXX}_FLAGS defintions (from upstream).

[James Price]

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

jprice-guest pushed a commit to branch master
in repository oclgrind.

commit 4bbc1afa743003b16d07145c4799cfdc13add811
Author: James Price <j.price at bristol.ac.uk>
Date:   Wed Sep 9 14:31:47 2015 +0100

    Preserve external CMAKE_{C,CXX}_FLAGS defintions (from upstream).
---
 debian/patches/cmake-preserve-flags.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/cmake-preserve-flags.patch b/debian/patches/cmake-preserve-flags.patch
new file mode 100644
index 0000000..d2fa095
--- /dev/null
+++ b/debian/patches/cmake-preserve-flags.patch
@@ -0,0 +1,24 @@
+Description: Preserve external CMAKE_{C,CXX}_FLAGS definitions.
+Author: James Price <j.price at bristol.ac.uk>
+Origin: upstream commit:b093b01
+Last-Update: 2015-09-09
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ 
+ # Enable C99 for GCC (required for tests)
+ if (CMAKE_COMPILER_IS_GNUCC)
+-  set(CMAKE_C_FLAGS "-std=c99")
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+ endif()
+ 
+ # Enable rpath on OS X
+@@ -25,7 +25,7 @@
+ 
+ # Enable C++11 for Clang/GCC
+ if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+-  set(CMAKE_CXX_FLAGS "-std=c++11")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+ 
+ # Disable min/max macros on Windows
diff --git a/debian/patches/series b/debian/patches/series
index eb283b0..3af20fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix-llvm37.patch
 library-versions.patch
 pch-location.patch
 clang-library-order.patch
+cmake-preserve-flags.patch

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