Merge lp:~gerboland/unity-mir/disable-qdebug into lp:unity-mir

[Gerry Boland]

[cmake] set default build type to RelWithDebInfo, add workaround to set QT_NO_DEBUG with that option

[cmake] set default build type to RelWithDebInfo, add workaround to set QT_NO_DEBUG with that option

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:166
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~gerboland/unity-mir/disable-qdebug/+merge/201563/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-ci/218/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/81

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/218/rebuild

review: Needs Fixing (continuous-integration)

[Thomas Voß (thomas-voss)]

I would propose a case-insensitive comparison for the build type here:

string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower)

if(cmake_build_type_lower MATCHES RelWithDebInfo) # workaround for http://public.kitware.com/Bug/view.php?id=14696
  add_definitions(-DQT_NO_DEBUG)
endif()

[lp:~gerboland/unity-mir/disable-qdebug]

167. By Gerry Boland on 2014-01-14

Match against lower-case CMAKE_BUILD_TYPE

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/220/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/83

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/220/rebuild

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

It works if you always run twice, but better move the setting of the build type above the tolower call.

review: Needs Fixing

[Thomas Voß (thomas-voss)]

I'm missing this line: string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower)
Without that you never convert the build type to lower case and thus the check will fail.

review: Needs Fixing

[lp:~gerboland/unity-mir/disable-qdebug]

168. By Gerry Boland on 2014-01-15

Stupid error, fixed

[Gerry Boland (gerboland)]

> It works if you always run twice, but better move the setting of the build
> type above the tolower call.
Oh I'm an idiot, what was I thinking? Fixed

> I'm missing this line: string(TOLOWER "${CMAKE_BUILD_TYPE}"
> cmake_build_type_lower)
> Without that you never convert the build type to lower case and thus the
> check will fail.
Line was underneath, was typing faster than thinking. Fixed.

[Andreas Pokorny (andreas-pokorny)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:168
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/225/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/89
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/89/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/88

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/225/rebuild

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-10 09:13:05 +0000
+++ CMakeLists.txt	2014-01-15 11:58:20 +0000
@@ -19,8 +19,17 @@
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-error=format")
 endif()
 
+if(NOT CMAKE_BUILD_TYPE)
+    message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
+    set(CMAKE_BUILD_TYPE RelWithDebInfo)
+endif()
+
 string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower)
 
+if(cmake_build_type_lower MATCHES relwithdebinfo) # workaround for http://public.kitware.com/Bug/view.php?id=14696
+    add_definitions(-DQT_NO_DEBUG)
+endif()
+
 #####################################################################
 # Enable code coverage calculation with gcov/gcovr/lcov
 # Usage: