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

List:       kde-commits
Subject:    KDE/kdebase/kdesu/kdesud
From:       David Faure <faure () kde ! org>
Date:       2006-04-12 12:45:11
Message-ID: 1144845911.233750.31838.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 529033 by dfaure:

Fix compilation on Mac OS X


 M  +3 -3      CMakeLists.txt  
 M  +4 -0      kdesud.cpp  


--- trunk/KDE/kdebase/kdesu/kdesud/CMakeLists.txt #529032:529033
@@ -1,5 +1,5 @@
 kde4_header()
-include_directories(  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )
+include_directories( ${KDE4_INCLUDES} )
 
 
 ########### next target ###############
@@ -13,9 +13,9 @@
 
 kde4_automoc(${kdesud_SRCS})
 
-kde4_add_executable(kdesud ${kdesud_SRCS})
+kde4_add_executable(kdesud NOGUI ${kdesud_SRCS})
 
-target_link_libraries(kdesud  ${KDE4_KDECORE_LIBS}  ${KDE4_KDESU_LIBS} )
+target_link_libraries(kdesud ${KDE4_KDECORE_LIBS}  ${KDE4_KDESU_LIBS} )
 
 install_targets(/bin kdesud )
 
--- trunk/KDE/kdebase/kdesu/kdesud/kdesud.cpp #529032:529033
@@ -73,8 +73,10 @@
 #include "repo.h"
 #include "handler.h"
 
+#ifdef Q_WS_X11
 #include <X11/X.h>
 #include <X11/Xlib.h>
+#endif
 
 #ifndef SUN_LEN
 #define SUN_LEN(ptr) ((kde_socklen_t) (((struct sockaddr_un *) 0)->sun_path) \
@@ -88,7 +90,9 @@
 Repository *repo;
 const char *Version = "1.01";
 QByteArray sock;
+#ifdef Q_WS_X11
 Display *x11Display;
+#endif
 int pipeOfDeath[2];
 
 // FIXME: This is just here to make it compile
[prev in list] [next in list] [prev in thread] [next in thread]