[yast-commit] r45042 - /trunk/qt/src/CMakeLists.txt
Author: sh-sh-sh Date: Tue Feb 26 18:30:13 2008 New Revision: 45042 URL: http://svn.opensuse.org/viewcvs/yast?rev=45042&view=rev Log: removed useless copy&paste include Modified: trunk/qt/src/CMakeLists.txt Modified: trunk/qt/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/CMakeLists.txt?rev=45042&r1=45041&r2=45042&view=diff ============================================================================== --- trunk/qt/src/CMakeLists.txt (original) +++ trunk/qt/src/CMakeLists.txt Tue Feb 26 18:30:13 2008 @@ -136,25 +136,25 @@ YQWizard.h ) -INSTALL( FILES ${yast_qt_HEADERS} DESTINATION "${YAST_INCLUDE_DIR}/yast2-qt" ) +INSTALL( FILES ${yast_qt_HEADERS} DESTINATION "${LIBYUI_INCLUDE_DIR}/../yast2-qt" ) QT4_AUTOMOC(${qt_yast_plugin_SRCS}) QT4_WRAP_UI(qt_yast_plugin_SRCS QHelpDialog.ui) INCLUDE_DIRECTORIES( ${QT_INCLUDES} ) -INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR} ) -INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR}/yui ) +INCLUDE_DIRECTORIES( ${LIBYUI_INCLUDE_DIR} ) +INCLUDE_DIRECTORIES( ${LIBYUI_INCLUDE_DIR}/yui ) ADD_LIBRARY( py2qt SHARED ${qt_yast_plugin_SRCS}) -TARGET_LINK_LIBRARIES( py2qt ${YAST_YUI_LIBRARY} ) +TARGET_LINK_LIBRARIES( py2qt ${LIBYUI_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt ${QT_QTCORE_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt ${QT_QTGUI_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt dl X11 ) SET_TARGET_PROPERTIES( py2qt PROPERTIES SOVERSION 2 ) SET_TARGET_PROPERTIES( py2qt PROPERTIES LINK_FLAGS "-Wl,--no-undefined" ) -INSTALL(TARGETS py2qt LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) +INSTALL(TARGETS py2qt LIBRARY DESTINATION ${UI_PLUGIN_DIR} ) INSTALL(FILES lang_fonts DESTINATION ${CMAKE_INSTALL_PREFIX}/share/YaST2/data ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
sh-sh-sh@svn.opensuse.org