Author: dmacvicar Date: Tue Nov 13 14:13:05 2007 New Revision: 42009 URL: http://svn.opensuse.org/viewcvs/yast?rev=42009&view=rev Log: link http library Modified: branches/tmp/sh/mod-ui/web-wt/cmake/modules/FindWt.cmake branches/tmp/sh/mod-ui/web-wt/src/CMakeLists.txt Modified: branches/tmp/sh/mod-ui/web-wt/cmake/modules/FindWt.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/cmake/modules/FindWt.cmake?rev=42009&r1=42008&r2=42009&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/cmake/modules/FindWt.cmake (original) +++ branches/tmp/sh/mod-ui/web-wt/cmake/modules/FindWt.cmake Tue Nov 13 14:13:05 2007 @@ -1,12 +1,13 @@ -if(WT_INCLUDE_DIR AND WT_LIBRARY AND WT_LIBRARY_HTTP) +if(WT_INCLUDE_DIR AND WT_LIBRARY AND WT_HTTP_LIBRARY AND WT_EXT_LIBRARY) # Already in cache, be silent - set(WT_FIND_QUIETLY TRUE) -endif(WT_INCLUDE_DIR AND WT_LIBRARY AND WT_LIBRARY_HTTP) + set(WT_FIND_QUIETLY TRUE) +endif(WT_INCLUDE_DIR AND WT_LIBRARY AND WT_HTTP_LIBRARY AND WT_EXT_LIBRARY) set(WT_LIBRARY) set(WT_INCLUDE_DIR) -set(WT_LIBRARY_HTTP) +set(WT_HTTP_LIBRARY) +set(WT_EXT_LIBRARY) FIND_PATH(WT_INCLUDE_DIR WObject ${CMAKE_INSTALL_PREFIX}/include @@ -26,12 +27,17 @@ /usr/local/lib ) +FIND_LIBRARY(WT_EXT_LIBRARY NAMES wtext + PATHS + /usr/lib + /usr/local/lib +) -if(WT_INCLUDE_DIR AND WT_LIBRARY AND WT_HTTP_LIBRARY) +if(WT_INCLUDE_DIR AND WT_LIBRARY AND WT_HTTP_LIBRARY AND WT_EXT_LIBRARY) MESSAGE( STATUS "Wt found: includes in ${WT_INCLUDE_DIR}, library in ${WT_LIBRARY}") set(WT_FOUND TRUE) -else(WT_INCLUDE_DIR AND WT_LIBRARY AND WT_HTTP_LIBRARY) +else(WT_INCLUDE_DIR AND WT_LIBRARY AND WT_HTTP_LIBRARY AND WT_EXT_LIBRARY) MESSAGE( STATUS "Wt not found") -endif(WT_INCLUDE_DIR AND WT_LIBRARY AND WT_HTTP_LIBRARY) +endif(WT_INCLUDE_DIR AND WT_LIBRARY AND WT_HTTP_LIBRARY AND WT_EXT_LIBRARY) -MARK_AS_ADVANCED(WT_INCLUDE_DIR WT_LIBRARY WT_HTTP_LIBRARY) +MARK_AS_ADVANCED(WT_INCLUDE_DIR WT_LIBRARY AND WT_HTTP_LIBRARY AND WT_EXT_LIBRARY) Modified: branches/tmp/sh/mod-ui/web-wt/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/CMakeLists.txt?rev=42009&r1=42008&r2=42009&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/CMakeLists.txt (original) +++ branches/tmp/sh/mod-ui/web-wt/src/CMakeLists.txt Tue Nov 13 14:13:05 2007 @@ -9,11 +9,11 @@ ) SET(web_yast_plugin_SRCS - Y2CCWeb.cc YWebApplication.cc YWebUI_builtins.cc YWebUI_core.cc YWebUI_widgets.cc YWebWidgetFactory.cc + Y2CCWeb.cc YWebApplication.cc YWebDialog.cc YWebPushButton.cc YWebLabel.cc YWebUI_builtins.cc YWebUI_core.cc YWebUI_widgets.cc YWebWidgetFactory.cc ) SET(web_yast_plugin_HEADERS - Y2CCWeb.h YWebDialog.h YWebLabel.h YWebPushButton.h YWebSplit.h YWebUIComponent.h YWebUI.h YWebWidget.h + Y2CCWeb.h YWebApplication.h YWebDialog.h YWebOptionalWidgetFactory.h YWebPushButton.h YWebLabel.h YWebUIComponent.h YWebUI.h YWebWidgetFactory.h ) INCLUDE_DIRECTORIES( ${WT_INCLUDE_PATH} ) @@ -25,8 +25,13 @@ TARGET_LINK_LIBRARIES( py2web ${YAST_YCP_LIBRARY} ) TARGET_LINK_LIBRARIES( py2web ${YAST_PLUGIN_WFM_LIBRARY} ) TARGET_LINK_LIBRARIES( py2web ${WT_LIBRARY} ) +TARGET_LINK_LIBRARIES( py2web ${WT_HTTP_LIBRARY} ) +TARGET_LINK_LIBRARIES( py2web ${WT_EXT_LIBRARY} ) TARGET_LINK_LIBRARIES( py2web ${YAST_PLUGIN_UI_LIBRARY} ) - + +#SET_TARGET_PROPERTIES( py2web PROPERTIES VERSION "${LIBZYPP_VERSION_INFO}" ) +SET_TARGET_PROPERTIES( py2web PROPERTIES SOVERSION 2 ) + INSTALL(TARGETS py2web LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) #SET_TARGET_PROPERTIES( y2lang_web PROPERTIES PREFIX "" ) \ No newline at end of file -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org