Mailinglist Archive: yast-commit (1056 mails)

[coolo@xxxxxxxxxxxxxxxx]

Author: coolo
Date: Thu Feb 14 14:16:16 2008
New Revision: 44447

URL: http://svn.opensuse.org/viewcvs/yast?rev=44447&view=rev
Log:
also set a macro for -lyui

Modified:
    branches/tmp/coolo/split_qt_pkg/qt/src/CMakeLists.txt
    trunk/devtools/devtools/cmake/modules/FindYast.cmake

Modified: branches/tmp/coolo/split_qt_pkg/qt/src/CMakeLists.txt
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt/src/CMakeLists.txt?rev=44447&r1=44446&r2=44447&view=diff
==============================================================================
--- branches/tmp/coolo/split_qt_pkg/qt/src/CMakeLists.txt (original)
+++ branches/tmp/coolo/split_qt_pkg/qt/src/CMakeLists.txt Thu Feb 14 14:16:16 
2008
@@ -85,7 +85,7 @@
 
 ADD_LIBRARY( py2qt SHARED ${qt_yast_plugin_SRCS})
 TARGET_LINK_LIBRARIES( py2qt ${YAST_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt ${YAST_YCP_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt ${YAST_YUI_LIBRARY} )
 TARGET_LINK_LIBRARIES( py2qt ${QT_QTCORE_LIBRARY} )
 TARGET_LINK_LIBRARIES( py2qt ${QT_QTGUI_LIBRARY} )
 TARGET_LINK_LIBRARIES( py2qt ${YAST_PLUGIN_UI_LIBRARY} )

Modified: trunk/devtools/devtools/cmake/modules/FindYast.cmake
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/cmake/modules/FindYast.cmake?rev=44447&r1=44446&r2=44447&view=diff
==============================================================================
--- trunk/devtools/devtools/cmake/modules/FindYast.cmake (original)
+++ trunk/devtools/devtools/cmake/modules/FindYast.cmake Thu Feb 14 14:16:16 
2008
@@ -60,6 +60,12 @@
   /usr/local/lib
 )
 
+FIND_LIBRARY(YAST_YUI_LIBRARY NAMES yui
+  PATHS
+  ${LIB_INSTALL_DIR}
+  /usr/local/lib
+)
+
 FIND_LIBRARY(YAST_PLUGIN_WFM_LIBRARY NAMES py2wfm
   PATHS
   ${YAST_PLUGIN_DIR}
@@ -94,5 +100,6 @@
    MESSAGE( STATUS "YaST2 not found")
 endif(YAST_INCLUDE_DIR AND YAST_LIBRARY AND YAST_YCP_LIBRARY)
 
-MARK_AS_ADVANCED(YAST_INCLUDE_DIR YAST_LIBRARY YAST_YCP_LIBRARY 
YAST_PLUGIN_WFM_LIBRARY YAST_PLUGIN_SCR_LIBRARY YAST_PLUGIN_UI_LIBRARY 
YAST_PLUGIN_DIR YAST_IMAGE_DIR YAST_DATA_DIR)
+MARK_AS_ADVANCED(YAST_INCLUDE_DIR YAST_LIBRARY YAST_YCP_LIBRARY 
YAST_PLUGIN_WFM_LIBRARY YAST_PLUGIN_SCR_LIBRARY 
+                 YAST_PLUGIN_UI_LIBRARY YAST_PLUGIN_DIR YAST_IMAGE_DIR 
YAST_DATA_DIR YAST_YUI_LIBRARY )
 

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx