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

List:       kde-commits
Subject:    KDE/kdebase/kioslave
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2006-04-28 21:08:10
Message-ID: 1146258490.890846.6557.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 535218 by neundorf:

-compile fish under UNIX, this probably doesn't work under FreeBSD (and OS X ?) yet, \
will work as soon as we rely on cmake >= 2.4.0

Alex



 M  +1 -2      CMakeLists.txt  
 M  +28 -11    fish/CMakeLists.txt  
 AM            fish/generate_fishcode.sh  


--- trunk/KDE/kdebase/kioslave/CMakeLists.txt #535217:535218
@@ -7,8 +7,6 @@
 add_subdirectory( cgi ) 
 add_subdirectory( floppy ) 
 add_subdirectory( filter ) 
-###### READD IT !!!!!!
-#add_subdirectory( fish ) 
 add_subdirectory( info ) 
 add_subdirectory( mac ) 
 add_subdirectory( man ) 
@@ -18,6 +16,7 @@
 add_subdirectory( smtp ) 
 # need kdesu
 if(UNIX)
+   add_subdirectory( fish ) 
    add_subdirectory( sftp ) 
 endif(UNIX)
 add_subdirectory( tar ) 
--- trunk/KDE/kdebase/kioslave/fish/CMakeLists.txt #535217:535218
@@ -6,23 +6,40 @@
 
 ########### next target ###############
 
-set(kio_fish_PART_SRCS fish.cpp )
+find_program(MD5SUM_EXECUTABLE md5sum )
 
-kde4_automoc(${kio_fish_PART_SRCS})
+# TODO: 2.4.1 check md5 e.g. for FreeBSD
+#find_program(MD5SUM_EXECUTABLE NAMES md5sum md5 )
 
-kde4_add_plugin(kio_fish ${kio_fish_PART_SRCS})
+if (MD5SUM_EXECUTABLE)
+ 
 
-kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kio_fish )
+   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/fishcode.h 
+      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/generate_fishcode.sh ARGS \
${CMAKE_CURRENT_SOURCE_DIR}/fish.pl ${MD5SUM_EXECUTABLE} \
${CMAKE_CURRENT_BINARY_DIR}/fishcode.h "-f 1" +      DEPENDS \
${CMAKE_CURRENT_SOURCE_DIR}/fish.pl ) +   
+   
+   set(kio_fish_PART_SRCS fish.cpp ${CMAKE_CURRENT_BINARY_DIR}/fishcode.h)
+   
+   kde4_automoc(${kio_fish_PART_SRCS})
+   
+   kde4_add_plugin(kio_fish ${kio_fish_PART_SRCS})
+   
+   kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kio_fish )
+   
+   target_link_libraries(kio_fish ${KDE4_KIO_LIBS})
+   
+   install_targets(${PLUGIN_INSTALL_DIR} kio_fish )
+   
+   
+   ########### install files ###############
+   
+   install_files( ${SERVICES_INSTALL_DIR} FILES fish.protocol )
+   
 
-target_link_libraries(kio_fish  ${KDE4_KDECORE_LIBS} )
+endif (MD5SUM_EXECUTABLE)
 
-install_targets(${PLUGIN_INSTALL_DIR} kio_fish )
 
-
-########### install files ###############
-
-install_files( ${SERVICES_INSTALL_DIR} FILES fish.protocol )
-
 kde4_footer()
 
 
** trunk/KDE/kdebase/kioslave/fish/generate_fishcode.sh #property svn:executable
   + *


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