From c36373569ac55ebf2141c8f54aff88f5ce30fb1e Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Tue, 9 Aug 2011 22:46:50 -0400 Subject: [PATCH] Check for KDE4 dev headers, in order for sip icons to show up in delegate. No, I don't have any clue why this fixes it. Stop asking. Go Away. --- CMakeLists.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6859f824..3312aefad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,19 +138,20 @@ ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd ) macro_optional_find_package(Threads) macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading") +macro_optional_find_package(KDE4) macro_optional_find_package(KDE4Installed) # this was used before we had FindKDE4Installed, just leaving it here to keep the flags # for future kde integration # macro_optional_find_package(KDE4) -# IF(KDE4_FOUND) -# #KDE4 adds and removes some compiler flags that we don't like -# STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} ) -# SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" ) -# ELSE() -# SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} ) -# ENDIF() +IF(KDE4_FOUND) + #KDE4 adds and removes some compiler flags that we don't like + STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} ) + SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" ) +ELSE() + SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} ) +ENDIF() IF( WIN32 ) find_library(QTSPARKLE_LIBRARIES qtsparkle)