Author: aschnell Date: Tue Feb 12 16:52:33 2008 New Revision: 44397 URL: http://svn.opensuse.org/viewcvs/yast?rev=44397&view=rev Log: - also set YAST_PLUGIN_UI_LIBRARY Modified: trunk/devtools/devtools/cmake/modules/FindYast.cmake Modified: trunk/devtools/devtools/cmake/modules/FindYast.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/cmake/modules/FindYast.cmake?rev=44397&r1=44396&r2=44397&view=diff ============================================================================== --- trunk/devtools/devtools/cmake/modules/FindYast.cmake (original) +++ trunk/devtools/devtools/cmake/modules/FindYast.cmake Tue Feb 12 16:52:33 2008 @@ -4,8 +4,9 @@ # YAST_LIBRARY # YAST_PLUGIN_DIR # YAST_DATA_DIR -# YAST_PLUGIN_SCR_LIBRARY # YAST_PLUGIN_WFM_LIBRARY +# YAST_PLUGIN_SCR_LIBRARY +# YAST_PLUGIN_UI_LIBRARY # YAST_YCP_LIBRARY # @@ -30,7 +31,7 @@ if(YAST_INCLUDE_DIR AND YAST_LIBRARY AND YAST_YCP_LIBRARY) # Already in cache, be silent - set(YAST_FIND_QUIETLY TRUE) + set(YAST_FIND_QUIETLY TRUE) endif(YAST_INCLUDE_DIR AND YAST_LIBRARY AND YAST_YCP_LIBRARY) set(YAST_LIBRARY) @@ -73,6 +74,13 @@ /usr/local/lib ) +FIND_LIBRARY(YAST_PLUGIN_UI_LIBRARY NAMES py2UI + PATHS + ${YAST_PLUGIN_DIR} + ${LIB_INSTALL_DIR} + /usr/local/lib +) + SET(CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/YaST2/data/devtools/cmake/modules" ${CMAKE_MODULE_PATH}) if(YAST_INCLUDE_DIR AND YAST_LIBRARY AND YAST_YCP_LIBRARY) @@ -80,12 +88,11 @@ MESSAGE( STATUS " plugins in ${YAST_PLUGIN_DIR}") MESSAGE( STATUS " scr in ${YAST_PLUGIN_SCR_LIBRARY}") MESSAGE( STATUS " wfm in ${YAST_PLUGIN_WFM_LIBRARY}") + MESSAGE( STATUS " UI in ${YAST_PLUGIN_UI_LIBRARY}") set(YAST_FOUND TRUE) else(YAST_INCLUDE_DIR AND YAST_LIBRARY AND YAST_YCP_LIBRARY) 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_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) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org