[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/ksysguard/ksysguardd
From:       John Tapsell <john.tapsell () kdemail ! net>
Date:       2008-07-31 22:52:06
Message-ID: 1217544726.021168.17297.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 840362 by johnflux:

Remove linking against X11 - this was added due to confusion :-)


 M  +16 -21    CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/CMakeLists.txt #840361:840362
@@ -10,28 +10,25 @@
 
 macro_optional_find_package(Sensors)
 macro_bool_to_01(SENSORS_FOUND HAVE_LMSENSORS)
-find_library(X11_LIBRARY  X11)
-find_library(XEXT_LIBRARY Xext)
 
-if(X11_LIBRARY AND XEXT_LIBRARY)
-    check_include_files(sys/inotify.h SYS_INOTIFY_H_FOUND)
-    macro_bool_to_01(SYS_INOTIFY_H_FOUND HAVE_SYS_INOTIFY_H)
+check_include_files(sys/inotify.h SYS_INOTIFY_H_FOUND)
+macro_bool_to_01(SYS_INOTIFY_H_FOUND HAVE_SYS_INOTIFY_H)
 
 
-    configure_file(config-ksysguardd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguardd.h)
+configure_file(config-ksysguardd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguardd.h)
 
-    if( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" )
-        add_subdirectory( "FreeBSD" )
-        include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/FreeBSD )
-    else( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" )
-        if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
-            add_subdirectory( "Solaris" )
-            include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Solaris )
-        else( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
-            add_subdirectory( ${CMAKE_SYSTEM_NAME} )
-            include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SYSTEM_NAME} )
-        endif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
-    endif( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" )
+if( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" )
+    add_subdirectory( "FreeBSD" )
+    include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/FreeBSD )
+else( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" )
+    if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+        add_subdirectory( "Solaris" )
+        include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Solaris )
+    else( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+        add_subdirectory( ${CMAKE_SYSTEM_NAME} )
+        include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SYSTEM_NAME} )
+    endif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+endif( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" )
 
 ########### next target ###############
 
@@ -47,7 +44,7 @@
     add_executable(ksysguardd ${ksysguardd_SRCS})
 
     add_dependencies(ksysguardd libksysguardd)
-    target_link_libraries(ksysguardd libksysguardd ${X11_LIBRARY} ${XEXT_LIBRARY})
+    target_link_libraries(ksysguardd libksysguardd)
 
    if( NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
       target_link_libraries(ksysguardd ${KDE4_KDEFAKES_LIBS})
@@ -66,5 +63,3 @@
 endif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
 
 install(TARGETS ksysguardd ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-endif(X11_LIBRARY AND XEXT_LIBRARY)
[prev in list] [next in list] [prev in thread] [next in thread]