KDE/kdevelop

[Andreas Pakulat]

SVN commit 697066 by apaku:

Thiago said these libs should go into <libdir>/kde4 as they are unversioned.
IMPORTANT: 
  After fetching this change make sure to do a make uninstall first, or remove
  the libkdev* in <libdir> manually else you might run into trouble because the
  linker picks the wrong lib
  This also needs adjustment of LD_LIBRARY_PATH to also include <libdir>/kde4
CCMAIL:kdevelop-devel at kdevelop.org


 M  +1 -1      buildtools/managers/cmake/CMakeLists.txt  
 M  +1 -1      buildtools/managers/qmake/parser/CMakeLists.txt  
 M  +1 -1      languages/cpp/duchainbuilder/CMakeLists.txt  
 M  +1 -1      languages/cpp/expressionparser/CMakeLists.txt  
 M  +1 -1      languages/cpp/parser/CMakeLists.txt  
 M  +1 -1      languages/cpp/parser/rpp/CMakeLists.txt  


--- trunk/KDE/kdevelop/buildtools/managers/cmake/CMakeLists.txt #697065:697066
@@ -60,7 +60,7 @@
 
 install(TARGETS kdevcmakemanager DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(TARGETS kcm_kdevcmake_settings DESTINATION ${PLUGIN_INSTALL_DIR} )
-install(TARGETS kdevcmakecommon DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdevcmakecommon DESTINATION ${LIB_INSTALL_DIR}/kde4 )
 install(FILES kdevcmakemanager.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install(FILES kcm_kdevcmake_settings.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES data.kdev4 DESTINATION ${DATA_INSTALL_DIR}/kdevcmakemanager )
--- trunk/KDE/kdevelop/buildtools/managers/qmake/parser/CMakeLists.txt #697065:697066
@@ -47,7 +47,7 @@
 target_link_libraries(kdevqmakeparser ${KDE4_KDECORE_LIBS})
 
 install(TARGETS qmake-parser DESTINATION ${BIN_INSTALL_DIR})
-install(TARGETS kdevqmakeparser DESTINATION ${LIB_INSTALL_DIR})
+install(TARGETS kdevqmakeparser DESTINATION ${LIB_INSTALL_DIR}/kde4)
 
 add_custom_target( copy-generated
     COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_BINARY_DIR}/qmake_ast.h" "${CMAKE_CURRENT_SOURCE_DIR}/generated/qmake_ast.h"
--- trunk/KDE/kdevelop/languages/cpp/duchainbuilder/CMakeLists.txt #697065:697066
@@ -34,7 +34,7 @@
 #       to the plugin target
 kde4_add_library(kdevcppduchainbuilder SHARED ${kdevcppduchainbuilder_LIB_SRCS})
 target_link_libraries(kdevcppduchainbuilder ${KDEVPLATFORM_LANGUAGE_LIBRARY} ${KDEVPLATFORM_EDITOR_LIBRARY} kdevcppparser)
-install(TARGETS kdevcppduchainbuilder DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdevcppduchainbuilder DESTINATION ${LIB_INSTALL_DIR}/kde4 )
 
 ########### install files ###############
 
--- trunk/KDE/kdevelop/languages/cpp/expressionparser/CMakeLists.txt #697065:697066
@@ -22,7 +22,7 @@
 #       to the plugin target
 kde4_add_library(kdevcppexpressionparser SHARED ${kdevcppexpressionparser_LIB_SRCS})
 target_link_libraries(kdevcppexpressionparser ${KDEVPLATFORM_LANGUAGE_LIBRARY} ${KDEVPLATFORM_EDITOR_LIBRARY} kdevcppparser kdevcppduchainbuilder)
-install(TARGETS kdevcppexpressionparser DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdevcppexpressionparser DESTINATION ${LIB_INSTALL_DIR}/kde4 )
 
 ########### install files ###############
 
--- trunk/KDE/kdevelop/languages/cpp/parser/CMakeLists.txt #697065:697066
@@ -37,7 +37,7 @@
 #       to the plugin target
 kde4_add_library(kdevcppparser SHARED ${kdevcppparser_LIB_SRCS})
 target_link_libraries(kdevcppparser ${KDEVPLATFORM_LANGUAGE_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} kdevcpprpp )
-install(TARGETS kdevcppparser DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdevcppparser DESTINATION ${LIB_INSTALL_DIR}/kde4 )
 
 
 ########### install files ###############
--- trunk/KDE/kdevelop/languages/cpp/parser/rpp/CMakeLists.txt #697065:697066
@@ -20,7 +20,7 @@
 #       to the plugin target
 kde4_add_library(kdevcpprpp SHARED ${kdevcpprpp_LIB_SRCS})
 target_link_libraries(kdevcpprpp ${KDE4_KDECORE_LIBS})
-install(TARGETS kdevcpprpp DESTINATION ${LIB_INSTALL_DIR} )
+install(TARGETS kdevcpprpp DESTINATION ${LIB_INSTALL_DIR}/kde4 )
 
 ########### install files ###############