File libkstartperf-no-lib.diff of Package kdesdk4

Overview Repositories Revisions Requests Users Attributes Meta

File libkstartperf-no-lib.diff of Package kdesdk4 (Revision 6805fa9d148f46ba2aabee234d8cc8d5)

Currently displaying revision 6805fa9d148f46ba2aabee234d8cc8d5 , Show latest

Index: kstartperf.cpp
===================================================================
--- kstartperf/kstartperf.cpp	(revision 992104)
+++ kstartperf/kstartperf.cpp	(working copy)
@@ -47,13 +47,13 @@
 QString libkstartperf()
 {
     QString lib;
-    QString la_file = KStandardDirs::locate("lib", "libkstartperf.la");
+    QString la_file = KStandardDirs::locate("module", "kstartperf.la");
 
     if (la_file.isEmpty())
     {
         // if no '.la' file could be found, fallback to a search for the .so file
         // in the standard KDE directories
-        lib = KStandardDirs::locate("lib","libkstartperf.so");
+        lib = KStandardDirs::locate("module","kstartperf.so");
 	return lib;
     }
 
@@ -80,7 +80,7 @@
     }
 
     // Look up the actual .so file.
-    lib = KStandardDirs::locate("lib", lib);
+    lib = KStandardDirs::locate("module", lib);
     return lib;
 }
 
Index: CMakeLists.txt
===================================================================
--- kstartperf/CMakeLists.txt	(revision 992104)
+++ kstartperf/CMakeLists.txt	(working copy)
@@ -7,12 +7,11 @@
 set(kstartperf_LIB_SRCS libkstartperf.c )
 
 
-kde4_add_library(kstartperf SHARED ${kstartperf_LIB_SRCS})
+kde4_add_plugin(kstartperf ${kstartperf_LIB_SRCS})
 
 target_link_libraries(kstartperf dl)
 
-set_target_properties(kstartperf PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kstartperf ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kstartperf DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
 ########### next target ###############
@@ -25,6 +24,6 @@
 set_target_properties(kstartperf_bin PROPERTIES OUTPUT_NAME kstartperf)
 
 
-target_link_libraries(kstartperf_bin  ${KDE4_KDECORE_LIBS} kstartperf)
+target_link_libraries(kstartperf_bin  ${KDE4_KDECORE_LIBS})
 
 install(TARGETS kstartperf_bin  ${INSTALL_TARGETS_DEFAULT_ARGS} )

Places

File libkstartperf-no-lib.diff of Package kdesdk4 (Revision 6805fa9d148f46ba2aabee234d8cc8d5)

Places