[med-svn] [htqc] 01/01: Fix for cmake input

[Andreas Tille]

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

tille pushed a commit to branch master
in repository htqc.

commit f71766db8e82bc6f5e558169bb167f308c830c9c
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jun 22 16:11:47 2015 +0200

    Fix for cmake input
---
 debian/patches/{no_c++11.patch => correct_cflags.patch} | 12 +++++++++++-
 debian/patches/series                                   |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/patches/no_c++11.patch b/debian/patches/correct_cflags.patch
similarity index 51%
rename from debian/patches/no_c++11.patch
rename to debian/patches/correct_cflags.patch
index 6195286..fc0cc28 100644
--- a/debian/patches/no_c++11.patch
+++ b/debian/patches/correct_cflags.patch
@@ -1,3 +1,13 @@
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Last-Update: Mon, 22 Jun 2015 15:49:39 +0200
+Description: Fix cmake file
+ The htqc authors might have used a version of cmake that interprets the
+ CMAKE_CXX_FLAGS as a list, and Elements of lists in cmake are separated
+ by ';'.
+ .
+ Apparently this is no longer possible so you'll have to (re-)set the
+ cxx_flags string directly.
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -22,7 +22,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "")
@@ -5,7 +15,7 @@
  endif ()
  
 -list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
-+#list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
++SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -std=c++11")
  #set(CMAKE_EXE_LINKER_FLAGS_DEBUG ${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fsanitize=address)
  
  set(CPACK_PACKAGE_VERSION_MAJOR 1)
diff --git a/debian/patches/series b/debian/patches/series
index 8b96e28..41f95e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# no_c++11.patch
+correct_cflags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/htqc.git