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

List:       kde-core-devel
Subject:    Minor fix for CMake files to properly link QtScript library
From:       Florian Schanda <ma1flfs () cs ! bath ! ac ! uk>
Date:       2007-02-21 13:08:53
Message-ID: 200702211308.53790.ma1flfs () cs ! bath ! ac ! uk
[Download RAW message or body]

Hello all,

attached is a minor patch that properly links libQtScript for libkjsembed.so 
in kdelibs.

Not sure if this fix is correct.

	Florian

["kdelibs-qtscript-fix.patch" (text/x-diff)]

Index: cmake/modules/FindQt4.cmake
===================================================================
--- cmake/modules/FindQt4.cmake	(revision 635925)
+++ cmake/modules/FindQt4.cmake	(working copy)
@@ -594,6 +594,9 @@
 
     # Set QT_QTTEST_LIBRARY
     FIND_LIBRARY(QT_QTTEST_LIBRARY NAMES QtTest QtTest4 PATHS ${QT_LIBRARY_DIR}      \
NO_DEFAULT_PATH) +    
+    # Set QT_QTSCRIPT_LIBRARY
+    FIND_LIBRARY(QT_QTSCRIPT_LIBRARY NAMES QtScript QtScript4 PATHS \
${QT_LIBRARY_DIR}                      NO_DEFAULT_PATH)  
     FIND_LIBRARY(QT_QTDBUS_LIBRARY NAMES QtDBus QtDBus4 PATHS ${QT_LIBRARY_DIR}      \
NO_DEFAULT_PATH)  
Index: kjsembed/kjsembed/CMakeLists.txt
===================================================================
--- kjsembed/kjsembed/CMakeLists.txt	(revision 635925)
+++ kjsembed/kjsembed/CMakeLists.txt	(working copy)
@@ -71,7 +71,7 @@
 
 kde4_add_library(${KJSEMBEDLIBNAME} SHARED ${kjsembed_LIB_SRCS})
 
-target_link_libraries(${KJSEMBEDLIBNAME} ${KDE4_KDECORE_LIBS} \
${QT_QTUITOOLS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTXML_LIBRARY} \
${KJSLIBNAME} ) +target_link_libraries(${KJSEMBEDLIBNAME} ${KDE4_KDECORE_LIBS} \
${QT_QTUITOOLS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTXML_LIBRARY} \
${QT_QTSCRIPT_LIBRARY} ${KJSLIBNAME} )  
 set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} \
SOVERSION ${GENERIC_LIB_SOVERSION} )  install(TARGETS ${KJSEMBEDLIBNAME}  DESTINATION \
${LIB_INSTALL_DIR} )



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