Merge lp:~elementary-apps/pantheon-terminal/fix-cmake-cppflags into lp:~elementary-apps/pantheon-terminal/trunk

[Sergey "Shnatsel" Davidoff]

Honor CPPFLAGS env variable in CMake to fix bug #1325329.

Honor CPPFLAGS env variable in CMake to fix bug #1325329

https://mondaybynoon.com/wp-content/uploads/xVyoSl.jpg

[David Gomes (davidgomes)]

review: Approve

[David Gomes (davidgomes)]

13:55:39 <ricotz> Munchor, hmm, http://www.cmake.org/pipermail/cmake/2009-April/028853.html

And put that newline in INSTALL back.

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

http://www.cmake.org/Bug/view.php?id=12928

[lp:~elementary-apps/pantheon-terminal/fix-cmake-cppflags]

576. By Launchpad Translations on behalf of elementary-apps on 2014-06-02

Launchpad automatic translations update.

[Sergey "Shnatsel" Davidoff (shnatsel)]

David: I've *added* the newline instead of removing it ;)

Rico: So what should I do? Apply this patch? Hack around in packaging? Or something else?

[lp:~elementary-apps/pantheon-terminal/fix-cmake-cppflags]

577. By Sergey "Shnatsel" Davidoff on 2014-06-04

Ditch the custom TerminalWidget.process_argv() method in favor of Glib.Shell.parse_argv() and drop a bash hardcoding in the process since it's no longer required. This fixes bug 1324577

578. By Launchpad Translations on behalf of elementary-apps on 2014-06-12

Launchpad automatic translations update.

579. By Launchpad Translations on behalf of elementary-apps on 2014-06-28

Launchpad automatic translations update.

580. By Launchpad Translations on behalf of elementary-apps on 2014-06-29

Launchpad automatic translations update.

581. By Phillip Sz on 2014-07-05

fix CMakeLists.txt URL and update to ubuntu 14.04

582. By Sergey "Shnatsel" Davidoff on 2014-07-07

Implement process competion notifications as per https://blueprints.launchpad.net/pantheon-terminal/+spec/process-completion-notifications

583. By Tom Beckmann on 2014-07-09

fix regression in previous commit that would assign no shell to be started if a custom one is set

584. By Launchpad Translations on behalf of elementary-apps on 2014-07-13

Launchpad automatic translations update.

585. By Launchpad Translations on behalf of elementary-apps on 2014-07-18

Launchpad automatic translations update.

586. By Sergey "Shnatsel" Davidoff on 2014-07-21

CMake: add contents of CPPFLAGS to CMake's flags, fixes hardening options not being passed (bug #1325329)

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-29 10:10:46 +0000
+++ CMakeLists.txt	2014-06-01 08:57:22 +0000
@@ -47,6 +47,7 @@
   gdk-3.0)
 
 add_definitions (${DEPS_CFLAGS})
+add_definitions (${CPPFLAGS})
 
 link_libraries (${DEPS_LIBRARIES})
 link_directories (${DEPS_LIBRARY_DIRS})

=== modified file 'INSTALL'
--- INSTALL	2013-09-30 20:08:22 +0000
+++ INSTALL	2014-06-01 08:57:22 +0000
@@ -8,4 +8,4 @@
   cd build/
   make install #Might need sudo
 
-To launch the Terminal locally (for development purposes), use "./pantheon-terminal" from the build/ directory.
\ No newline at end of file
+To launch the Terminal locally (for development purposes), use "./pantheon-terminal" from the build/ directory.