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

List:       kde-commits
Subject:    playground/network/kbluetooth/src
From:       Michael Jansen <kde () michael-jansen ! biz>
Date:       2009-10-04 11:10:52
Message-ID: 1254654652.931528.5172.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1031198 by mjansen:

Fix build if kdelibs install prefix != kdebase/* install prefix.

CCMAIL: kde-buildsystem@kde.org

 M  +3 -2      CMakeLists.txt  
 M  +1 -1      device-manager/CMakeLists.txt  
 M  +1 -1      inputwizard/CMakeLists.txt  


--- trunk/playground/network/kbluetooth/src/CMakeLists.txt #1031197:1031198
@@ -6,6 +6,7 @@
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}
 	${KDE4_INCLUDES}
+	${KDE4WORKSPACE_INCLUDE_DIR}
 )
 
 add_subdirectory(inputwizard)
@@ -46,10 +47,10 @@
 # If major than 4.3.9 which means 4.4.0 link against KDE4_KDEUI
 if(${KDE_VERSION} VERSION_GREATER 4.3.9)
 	target_link_libraries(kbluetooth
-                      ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} \
${KDE4_KFILE_LIBS} solidcontrol) +                      ${KDE4_KIO_LIBRARY} \
${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KFILE_LIBS} \
${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY})  elseif(${KDE_VERSION} VERSION_GREATER 4.2.9 \
AND ${KDE_VERSION} VERSION_LESS 4.4.0)  target_link_libraries(kbluetooth
-                      ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} \
${KDE4_KFILE_LIBS} solidcontrol knotificationitem-1) +                      \
${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KFILE_LIBS} \
${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY} knotificationitem-1)  endif(${KDE_VERSION} \
VERSION_GREATER 4.3.9)  
 if(HAVE_NEPOMUK)
--- trunk/playground/network/kbluetooth/src/device-manager/CMakeLists.txt \
#1031197:1031198 @@ -19,7 +19,7 @@
 kde4_add_executable(kbluetooth-devicemanager ${deviceman_SRCS})
 
 target_link_libraries(kbluetooth-devicemanager
-                      ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} \
solidcontrol) +                      ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} \
${KDE4_SOLID_LIBS} ${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY})  
 install(TARGETS kbluetooth-devicemanager
         DESTINATION ${KDE4_BIN_INSTALL_DIR})
--- trunk/playground/network/kbluetooth/src/inputwizard/CMakeLists.txt \
#1031197:1031198 @@ -24,7 +24,7 @@
 kde4_add_executable(kbluetooth-inputwizard ${inputwizard_SRCS})
 
 target_link_libraries(kbluetooth-inputwizard
-                      ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} \
solidcontrol) +                      ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} \
${KDE4_SOLID_LIBS} ${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY})  
 install(TARGETS kbluetooth-inputwizard
         DESTINATION ${KDE4_BIN_INSTALL_DIR})


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