diff options
| author | Dario Freddi <dario.freddi@collabora.com> | 2012-07-04 12:23:30 +0200 |
|---|---|---|
| committer | Dario Freddi <dario.freddi@collabora.com> | 2012-07-04 12:23:46 +0200 |
| commit | 82b68e7d6827d067906b21e1a151ec716a343c89 (patch) | |
| tree | ad7abb9f59062719e67e396c1c3ac516acce6c4e | |
| parent | e3f3bbe052bc7923f32fac293cc8dc2900aea8d4 (diff) | |
| parent | 7e80451869146725f68e39e8be0bdd5bed6e8dd8 (diff) | |
Merge branch 'trivia'
Reviewed-by: Dario Freddi <dario.freddi@collabora.com>
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | cmake/modules/TelepathyDefaults.cmake | 5 |
2 files changed, 9 insertions, 0 deletions
@@ -18,7 +18,11 @@ Enhancements: * ... Fixes: + * Fix a race condition in test-account-basics and test-dbus-properties. + * Fix compilation with gcc 4.7. + * Fix tests compilation with telepathy-glib 0.19. * Fix FindDBus.cmake to find the correct paths. + * Pass -fvisibility-inlines-hidden to the compiler if it's supported. * ... telepathy-qt 0.9.1 (2012-03-23) diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake index a7bf77a5..ee3ab33f 100644 --- a/cmake/modules/TelepathyDefaults.cmake +++ b/cmake/modules/TelepathyDefaults.cmake @@ -47,6 +47,11 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(VISIBILITY_HIDDEN_FLAGS) endif (CXX_FVISIBILITY_HIDDEN) + CHECK_CXX_ACCEPTS_FLAG("-fvisibility-inlines-hidden" CXX_FVISIBILITY_INLINES_HIDDEN) + if (CXX_FVISIBILITY_INLINES_HIDDEN) + set(VISIBILITY_HIDDEN_FLAGS "${VISIBILITY_HIDDEN_FLAGS} -fvisibility-inlines-hidden") + endif (CXX_FVISIBILITY_INLINES_HIDDEN) + CHECK_CXX_ACCEPTS_FLAG("-Wdeprecated-declarations" CXX_DEPRECATED_DECLARATIONS) if (CXX_DEPRECATED_DECLARATIONS) set(DEPRECATED_DECLARATIONS_FLAGS "-Wdeprecated-declarations -DTP_QT_DEPRECATED_WARNINGS") |