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

List:       kde-commits
Subject:    KDE/kdebase/workspace/ksysguard/ksysguardd
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2009-10-01 18:49:40
Message-ID: 1254422980.267609.23099.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1030162 by neundorf:

-require cmake 2.6.2 here, not 2.6.0
-the add_dependencies() is not necessary, the dependency is created automatically by \
                the target_link_libraries()
-for a library, which
  * is STATIC
  * is C, not C++
  * which does not use Qt
 using KDE4_ADD_LIBRARY() has no benefits over using ADD_LIBRARY()

Alex




 M  +1 -2      CMakeLists.txt  
 M  +1 -1      FreeBSD/CMakeLists.txt  
 M  +1 -1      Irix/CMakeLists.txt  
 M  +1 -1      Linux/CMakeLists.txt  
 M  +1 -1      NetBSD/CMakeLists.txt  
 M  +1 -1      OpenBSD/CMakeLists.txt  
 M  +1 -1      Solaris/CMakeLists.txt  
 M  +1 -1      Tru64/CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/CMakeLists.txt #1030161:1030162
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6.2)
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/CContLib/ )
 
 
@@ -49,7 +49,6 @@
 
     add_executable(ksysguardd ${ksysguardd_SRCS})
 
-    add_dependencies(ksysguardd libksysguardd)
     target_link_libraries(ksysguardd libksysguardd)
 
    if( NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/FreeBSD/CMakeLists.txt \
#1030161:1030162 @@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib \
${CMAKE_CURRENT_SOURCE_DIR}/../ )  
-KDE4_ADD_LIBRARY(libksysguardd STATIC 
+ADD_LIBRARY(libksysguardd STATIC 
             apm.c
             CPU.c
             diskstat.c
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/Irix/CMakeLists.txt \
#1030161:1030162 @@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib \
${CMAKE_CURRENT_SOURCE_DIR}/../ )  
-KDE4_ADD_LIBRARY(libksysguardd STATIC 
+ADD_LIBRARY(libksysguardd STATIC 
             cpu.c
             LoadAvg.c
             Memory.c
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/Linux/CMakeLists.txt \
#1030161:1030162 @@ -26,7 +26,7 @@
 ENDIF(EXISTS /proc/i8k)
 
 
-KDE4_ADD_LIBRARY(libksysguardd STATIC 
+ADD_LIBRARY(libksysguardd STATIC 
             ${LIBKSYSGUARDD_FILES})
 if(SENSORS_FOUND)
   TARGET_LINK_LIBRARIES(libksysguardd ${SENSORS_LIBRARIES})
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/NetBSD/CMakeLists.txt \
#1030161:1030162 @@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib \
${CMAKE_CURRENT_SOURCE_DIR}/../ )  
-KDE4_ADD_LIBRARY(libksysguardd STATIC 
+ADD_LIBRARY(libksysguardd STATIC 
             apm.c
             CPU.c
             diskstat.c
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/OpenBSD/CMakeLists.txt \
#1030161:1030162 @@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib \
${CMAKE_CURRENT_SOURCE_DIR}/../ )  
-KDE4_ADD_LIBRARY(libksysguardd STATIC 
+ADD_LIBRARY(libksysguardd STATIC 
             cpu.c
             memory.c
             ProcessList.c)
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/Solaris/CMakeLists.txt \
#1030161:1030162 @@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib \
${CMAKE_CURRENT_SOURCE_DIR}/../ )  
-KDE4_ADD_LIBRARY(libksysguardd STATIC 
+ADD_LIBRARY(libksysguardd STATIC 
             LoadAvg.c
             Memory.c
             NetDev.c
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/Tru64/CMakeLists.txt \
#1030161:1030162 @@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../CContLib \
${CMAKE_CURRENT_SOURCE_DIR}/../ )  
-KDE4_ADD_LIBRARY(libksysguardd STATIC 
+ADD_LIBRARY(libksysguardd STATIC 
             LoadAvg.c
             Memory.c
             NetDev.c)


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