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

List:       kde-commits
Subject:    KDE/kdelibs/dcop
From:       Peter Kümmel <syntheticpp () yahoo ! com>
Date:       2006-02-09 0:05:14
Message-ID: 1139443514.546563.11025.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 507304 by kuemmel:

don't build static kICE lib on windows, because 4 symbols are in kdewin32 dll, this \
produces linker errors when building dcop.



 M  +10 -2     CMakeLists.txt  


--- trunk/KDE/kdelibs/dcop/CMakeLists.txt #507303:507304
@@ -81,14 +81,22 @@
 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(-DSOCKCONN -DTCPCONN)
+   set(DCOP_LIB_SRCS ${DCOP_LIB_SRCS} ${kICE_STAT_SRCS})
+   set(LINK_WITH_kICE )
+endif(UNIX)
+
 kde4_automoc(${DCOP_LIB_SRCS})
 
 kde4_add_library(DCOP SHARED ${DCOP_LIB_SRCS})
 
-target_link_libraries(DCOP  ${QT_QTCORE_LIBRARY} ${KDEWIN32_LIBRARY} kICE )
+target_link_libraries(DCOP  ${QT_QTCORE_LIBRARY} ${KDEWIN32_LIBRARY} \
${LINK_WITH_kICE} )  
 set_target_properties(DCOP PROPERTIES VERSION 4.2.0 SOVERSION 4 )
 kde4_create_libtool_file(DCOP /kde4 )


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