diff options
author | npmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-02-25 02:43:24 +0000 |
---|---|---|
committer | npmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-02-25 02:43:24 +0000 |
commit | 2ca7d83b37251efe124aa67ceb98cf24495162e9 (patch) | |
tree | 481a336fb10b7c577d3e146e6a4ed78f68d217a9 /libproxy/CMakeLists.txt | |
parent | ef8e418e4aaa3417b24e7362df3351dd2367cb05 (diff) | |
download | libproxy-2ca7d83b37251efe124aa67ceb98cf24495162e9.tar.gz |
cleanup the config_kde module; make it actually build
git-svn-id: http://libproxy.googlecode.com/svn/trunk@579 c587cffe-e639-0410-9787-d7902ae8ed56
Diffstat (limited to 'libproxy/CMakeLists.txt')
-rw-r--r-- | libproxy/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libproxy/CMakeLists.txt b/libproxy/CMakeLists.txt index 21e0b85..af027c2 100644 --- a/libproxy/CMakeLists.txt +++ b/libproxy/CMakeLists.txt @@ -57,13 +57,14 @@ if("${PKG_CONFIG_FOUND}") endif() endif() endif() - if("${X11_FOUND}") + if(X11_FOUND) px_check_modules(GNOME gconf-2.0) find_package(KDE4) - if("${KDE4_FOUND}" STREQUAL "TRUE") + find_package(Qt4) + if(KDE4_FOUND AND QT4_FOUND) set(KDE4_FOUND 1) - set(KDE4_LIBRARIES ${KDE4_KDECORE_LIBS}) - include_directories(${KDE4_INCLUDE_DIR}) + set(KDE4_LIBRARIES ${KDE4_KDECORE_LIBS} ${QT_LIBRARIES}) + include_directories(${KDE4_INCLUDE_DIR} ${QT_INCLUDES}) link_directories(${KDE4_LIB_DIR}) string(REGEX REPLACE " *-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) else() @@ -164,4 +165,4 @@ endif() set_property(SOURCE proxy.cpp PROPERTY COMPILE_DEFINITIONS MODULEDIR="${moduledir}";BUILTIN_MODULES=${BUILTIN_MODULES}) set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 0 SOVERSION 0.0.0) install(TARGETS libproxy DESTINATION ${rlibdir}) -install(FILES proxy.h DESTINATION ${rincludedir})
\ No newline at end of file +install(FILES proxy.h DESTINATION ${rincludedir}) |