link http library
authordmacvicar <dmacvicar@e0cc52ee-31ee-0310-8b87-e83c4596d67c>
Tue, 13 Nov 2007 13:13:05 +0000 (13:13 +0000)
committerdmacvicar <dmacvicar@e0cc52ee-31ee-0310-8b87-e83c4596d67c>
Tue, 13 Nov 2007 13:13:05 +0000 (13:13 +0000)
git-svn-id: http://svn.opensuse.org/svn/yast/branches/tmp/sh/mod-ui/web-wt@42009 e0cc52ee-31ee-0310-8b87-e83c4596d67c

cmake/modules/FindWt.cmake
src/CMakeLists.txt

index 0001e74..7b3451e 100644 (file)
@@ -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 @@ FIND_LIBRARY(WT_HTTP_LIBRARY NAMES wthttp
   /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)
index 1b37a3d..86b9d91 100644 (file)
@@ -9,11 +9,11 @@ SET(yast_web_module_SRCS
 )
 
 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_LIBRARY} )
 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