Merge lp:~michihenning/unity-api/clang-fixes into lp:unity-api

[Michi Henning]

Don't set -fno-permissive when compiling with clang because clang produces an "ignored" warning for this flag.

Set -DGTEST_USE_OWN_TR1_TUPLE=1 to make tests compile with clang.

Don't set -fno-permissive when compiling with clang because clang produces an "ignored" warning for this flag.

Set -DGTEST_USE_OWN_TR1_TUPLE=1 to make tests compile with clang.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:108
http://jenkins.qa.ubuntu.com/job/unity-api-ci/124/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-amd64-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-armhf-ci/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-i386-ci/82/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-api-ci/124/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-api/clang-fixes]

109. By Michi Henning on 2013-10-18

Removed trailing whitespace from previous commit.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:109
http://jenkins.qa.ubuntu.com/job/unity-api-ci/125/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-armhf-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-saucy-i386-ci/83

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-api-ci/125/rebuild

review: Approve (continuous-integration)

[Jussi Pakkanen (jpakkane)]

If it works, then it works.

[Michi Henning (michihenning)]

Yep, works. Not sure whether it's necessary with older versions of clang, but with 4.3, it's needed.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-26 02:48:38 +0000
+++ CMakeLists.txt	2013-10-18 03:03:05 +0000
@@ -98,7 +98,12 @@
 add_definitions(-DUNITY_DLL_EXPORTS)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pedantic -Wall -Wextra")
+
+# -fno-permissive causes warnings with clang, so we only enable it for gcc
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-permissive")
+endif()
 
 if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")
     option(Werror "Treat warnings as errors" ON)

=== modified file 'test/gtest/CMakeLists.txt'
--- test/gtest/CMakeLists.txt	2013-06-18 04:03:26 +0000
+++ test/gtest/CMakeLists.txt	2013-10-18 03:03:05 +0000
@@ -3,6 +3,12 @@
 set(LIBGTEST gtest)
 set(TESTLIBS ${TESTLIBS} ${LIBGTEST} ${CMAKE_THREAD_LIBS_INIT})
 
+# gtest does weird things with its own implementation of tr1::tuple. For clang, we need to
+# set this macro, otherwise anything that includes gtest.h won't compile.
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
+endif()
+
 add_subdirectory(libgtest)
 add_subdirectory(unity)