summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
authorMarco Trevisan (TreviƱo) <mail@3v1n0.net>2015-10-02 14:02:05 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2015-10-02 14:02:05 +0000
commit9304ca7b15387572a39cc91542e3cc64fc851a19 (patch)
treef9792a40f98f6d6b7542f06d5ccf71a17afa72a5 /CMakeLists.txt
parentb8f8a52649fca093b357278a7b61ebcc99385e4a (diff)
parent9239a7575eec66b6750565550e2171b815abd4be (diff)
GnomeKeyGrabber: Don't allow an action to be grabbed multiple times
And always return the same action id for a specific key binding. Fixes: #1459571 Approved by: Andrea Azzarone (bzr r4018)
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7baf29f4..7b807a4ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,8 @@ set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
set (UNITY_API_VERSION "6.0")
set (UNITY_COMPONENTS_VERSION "6")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGNOME_DESKTOP_USE_UNSTABLE_API -std=c++0x -fno-permissive")
-set (CMAKE_CXX_FLAGS_DEBUG "-g3")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGNOME_DESKTOP_USE_UNSTABLE_API -std=c++11 -fno-permissive")
+set (CMAKE_CXX_FLAGS_DEBUG "-g3 -DUNITY_DEBUG_BUILD")
set (CMAKE_CXX_FLAGS_RELEASE "")
option(