Author: sh-sh-sh Date: Tue Feb 26 18:19:13 2008 New Revision: 45039 URL: http://svn.opensuse.org/viewcvs/yast?rev=45039&view=rev Log: provide cmake support for dependent packages Added: trunk/libyui/cmake/ trunk/libyui/cmake/FindLibyui.cmake trunk/libyui/cmake/Makefile.am Modified: trunk/libyui/SUBDIRS trunk/libyui/VERSION trunk/libyui/yast2-libyui.spec.in Modified: trunk/libyui/SUBDIRS URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/SUBDIRS?rev=45039&r1=45038&r2=45039&view=diff ============================================================================== --- trunk/libyui/SUBDIRS (original) +++ trunk/libyui/SUBDIRS Tue Feb 26 18:19:13 2008 @@ -1 +1 @@ -src examples +src cmake examples Modified: trunk/libyui/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/VERSION?rev=45039&r1=45038&r2=45039&view=diff ============================================================================== --- trunk/libyui/VERSION (original) +++ trunk/libyui/VERSION Tue Feb 26 18:19:13 2008 @@ -1 +1 @@ -2.16.37 +2.16.38 Added: trunk/libyui/cmake/FindLibyui.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/cmake/FindLibyui.cmake?rev=45039&view=auto ============================================================================== --- trunk/libyui/cmake/FindLibyui.cmake (added) +++ trunk/libyui/cmake/FindLibyui.cmake Tue Feb 26 18:19:13 2008 @@ -0,0 +1,50 @@ +# +# Find libyui and sets the following variables +# LIBYUI_INCLUDE_DIR +# LIBYUI_LIBRARY +# UI_PLUGIN_DIR +# + +# set /usr as default prefix if not set +IF ( DEFINED CMAKE_INSTALL_PREFIX ) + MESSAGE(STATUS "prefix set to ${CMAKE_INSTALL_PREFIX}") +ELSE ( DEFINED CMAKE_INSTALL_PREFIX ) + SET(CMAKE_INSTALL_PREFIX /usr) + MESSAGE(STATUS "No prefix, set to default /usr") +ENDIF ( DEFINED CMAKE_INSTALL_PREFIX ) + +# Library +IF ( DEFINED LIB ) + SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB}" ) +ELSE ( DEFINED LIB ) + IF (CMAKE_SIZEOF_VOID_P MATCHES "8") + SET( LIB_SUFFIX "64" ) + ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") + SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) +ENDIF ( DEFINED LIB ) +MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) + +SET(UI_PLUGIN_DIR ${LIB_INSTALL_DIR}/YaST2/plugin) + +FIND_PATH(LIBYUI_INCLUDE_DIR YWidget.h + ${CMAKE_INSTALL_PREFIX}/include/YaST2/yui + /usr/include/YaST2/yui + /usr/local/include/YaST2/yui +) + +FIND_LIBRARY(LIBYUI_LIBRARY NAMES yui + PATHS + ${LIB_INSTALL_DIR} + /usr/local/lib +) + +if(LIBYUI_INCLUDE_DIR AND LIBYUI_LIBRARY AND UI_PLUGIN_DIR) + MESSAGE( STATUS "libyui found: includes in ${LIBYUI_INCLUDE_DIR}, library in ${LIBYUI_LIBRARY}") + MESSAGE( STATUS " UI plugins in ${UI_PLUGIN_DIR}") + set(YAST_FOUND TRUE) +else(LIBYUI_INCLUDE_DIR AND LIBYUI_LIBRARY AND UI_PLUGIN_DIR) + MESSAGE( STATUS "libyui not found") +endif(LIBYUI_INCLUDE_DIR AND LIBYUI_LIBRARY AND UI_PLUGIN_DIR) + +MARK_AS_ADVANCED(LIBYUI_INCLUDE_DIR AND LIBYUI_LIBRARY AND UI_PLUGIN_DIR) + Added: trunk/libyui/cmake/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/cmake/Makefile.am?rev=45039&view=auto ============================================================================== --- trunk/libyui/cmake/Makefile.am (added) +++ trunk/libyui/cmake/Makefile.am Tue Feb 26 18:19:13 2008 @@ -0,0 +1,4 @@ +cmakedir = ${prefix}/share/cmake/Modules +cmake_DATA = FindLibyui.cmake + +EXTRA_DIST = $(cmake_DATA) Modified: trunk/libyui/yast2-libyui.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/yast2-libyui.spec.in?rev=45039&r1=45038&r2=45039&view=diff ============================================================================== --- trunk/libyui/yast2-libyui.spec.in (original) +++ trunk/libyui/yast2-libyui.spec.in Tue Feb 26 18:19:13 2008 @@ -59,4 +59,7 @@ %{_libdir}/lib*.la @includedir@ @pkgconfigdir@/@RPMNAME@.pc +%dir %{_datadir}/cmake +%dir %{_datadir}/cmake/Modules +%{_datadir}/cmake/Modules/* %doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org