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

List:       kde-commits
Subject:    KDE/kdelibs/dcop
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2006-02-10 21:33:15
Message-ID: 1139607195.897340.13042.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 508144 by neundorf:

dont compile kde-ice as static library, but just use the sources, also on !WIN32

Alex


 M  +17 -25    CMakeLists.txt  
 D             KDE-ICE/CMakeLists.txt  


--- trunk/KDE/kdelibs/dcop/CMakeLists.txt #508143:508144
@@ -28,7 +28,6 @@
   ${CMAKE_SOURCE_DIR}/dcop/KDE-ICE/globals.c
 )
 
-add_subdirectory( KDE-ICE )
 add_subdirectory( dcopidlng )
 add_subdirectory( dcopidl2cpp )
 add_subdirectory( client )
@@ -38,12 +37,8 @@
 
 ########### next target ###############
 
-set(dcopserver_shutdown_SRCS
-dcopserver_shutdown.c
-)
+set(dcopserver_shutdown_SRCS dcopserver_shutdown.c )
 
-#kde4_automoc(${dcopserver_shutdown_SRCS})
-
 kde4_add_executable(dcopserver_shutdown ${dcopserver_shutdown_SRCS})
 
 target_link_libraries(dcopserver_shutdown ${KDEWIN32_LIBRARY})
@@ -55,13 +50,13 @@
 
 if(KDE4_BUILD_TESTS)
 
-   set(testdcop_SRCS testdcop.cpp ) #${kICE_STAT_SRCS} )
+   set(testdcop_SRCS testdcop.cpp ${kICE_STAT_SRCS} )
    
    kde4_automoc(${testdcop_SRCS})
    
    kde4_add_executable(testdcop ${testdcop_SRCS})
    
-   target_link_libraries(testdcop  ${QT_QTCORE_LIBRARY} DCOP kICE)
+   target_link_libraries(testdcop  ${QT_QTCORE_LIBRARY} DCOP )
    
    
    ########### next target ###############
@@ -77,26 +72,26 @@
 ########### next target ###############
 
 set(DCOP_LIB_SRCS
-dcopstub.cpp
-dcopref.cpp
-dcopobject.cpp
-dcopclient.cpp
+   dcopstub.cpp
+   dcopref.cpp
+   dcopobject.cpp
+   dcopclient.cpp
+   ${kICE_STAT_SRCS}
 )
-
-if(UNIX)
-   set(LINK_WITH_kICE kICE)
-else(UNIX)
-   add_definitions(-DICE_t -DTRANS_SERVER -DTRANS_CLIENT -DANSICPP)
+   
+add_definitions(-DICE_t -DTRANS_SERVER -DTRANS_CLIENT -DANSICPP)
+   
+if (UNIX)
+   add_definitions(-DUNIXCONN)
+else (UNIX)
    add_definitions(-DSOCKCONN -DTCPCONN -DKICE_EXPORT=DCOP_EXPORT)
-   set(DCOP_LIB_SRCS ${DCOP_LIB_SRCS} ${kICE_STAT_SRCS})
-   set(LINK_WITH_kICE )
-endif(UNIX)
+endif (UNIX)
 
 kde4_automoc(${DCOP_LIB_SRCS})
 
 kde4_add_library(DCOP SHARED ${DCOP_LIB_SRCS})
 
-target_link_libraries(DCOP  ${QT_QTCORE_LIBRARY} ${KDEWIN32_LIBRARY} ${LINK_WITH_kICE} )
+target_link_libraries(DCOP  ${QT_QTCORE_LIBRARY} ${KDEWIN32_LIBRARY} )
 
 set_target_properties(DCOP PROPERTIES VERSION 4.2.0 SOVERSION 4 )
 kde4_create_libtool_file(DCOP /kde4 )
@@ -105,10 +100,7 @@
 
 ########### next target ###############
 
-set(dcopserver_KDEINIT_SRCS
-dcopserver.cpp
-dcopsignals.cpp
-)
+set(dcopserver_KDEINIT_SRCS dcopserver.cpp dcopsignals.cpp )
 
 kde4_automoc(${dcopserver_KDEINIT_SRCS})
 
[prev in list] [next in list] [prev in thread] [next in thread]