Author: mlandres Date: Thu Jul 17 16:24:59 2008 New Revision: 10612 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10612&view=rev Log: some more LIB_INSTALL_DIR fixes Modified: trunk/dialogsolver/CMakeLists.txt trunk/dialogsolver/src/CMakeLists.txt trunk/dialogsolver/yast_plugin/CMakeLists.txt Modified: trunk/dialogsolver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/CMakeLists.txt?rev=10612&r1=10611&r2=10612&view=diff ============================================================================== --- trunk/dialogsolver/CMakeLists.txt (original) +++ trunk/dialogsolver/CMakeLists.txt Thu Jul 17 16:24:59 2008 @@ -12,6 +12,8 @@ SET( RPMNAME "libqdialogsolver1" ) +INCLUDE(ZyppCommon) + FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Zypp REQUIRED) FIND_PACKAGE(Gettext REQUIRED) @@ -103,5 +105,5 @@ ${AUTOBUILD_COMMAND} ) - + MESSAGE(STATUS "Writing spec file...") Modified: trunk/dialogsolver/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/CMakeLists.txt?rev=10612&r1=10611&r2=10612&view=diff ============================================================================== --- trunk/dialogsolver/src/CMakeLists.txt (original) +++ trunk/dialogsolver/src/CMakeLists.txt Thu Jul 17 16:24:59 2008 @@ -44,5 +44,5 @@ SET_TARGET_PROPERTIES( qdialogsolver PROPERTIES SOVERSION 1 ) SET_TARGET_PROPERTIES( qdialogsolver PROPERTIES LINK_FLAGS "-Wl,--no-undefined" ) -INSTALL(TARGETS qdialogsolver LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" ) +INSTALL(TARGETS qdialogsolver LIBRARY DESTINATION "${LIB_INSTALL_DIR}" ) Modified: trunk/dialogsolver/yast_plugin/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/yast_plugin/CMakeLists.txt?rev=10612&r1=10611&r2=10612&view=diff ============================================================================== --- trunk/dialogsolver/yast_plugin/CMakeLists.txt (original) +++ trunk/dialogsolver/yast_plugin/CMakeLists.txt Thu Jul 17 16:24:59 2008 @@ -2,6 +2,13 @@ # Solver Dialog ################################################################ +#CMake Warning (dev) at yast_plugin/CMakeLists.txt:5 (ADD_DEFINITIONS): +# Policy CMP0005 is not set: Preprocessor definition values are now escaped +# automatically. Run "cmake --help-policy CMP0005" for policy details. Use +# the cmake_policy command to set the policy and suppress this warning. +if(COMMAND cmake_policy) + cmake_policy(SET CMP0005 OLD) +endif(COMMAND cmake_policy) ADD_DEFINITIONS( -DY2LOG=\\\"QT4\\\" ${QT_DEFINITIONS} -DICONDIR=\\"${Y2QT_ICONDIR}\\" @@ -12,7 +19,7 @@ ) SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format-nonliteral -fmessage-length=0" ) -SET(qt_solver_dialog_plugin_SRCS +SET(qt_solver_dialog_plugin_SRCS YQZyppSolverDialogPluginImpl.cc ) @@ -24,9 +31,14 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) INCLUDE_DIRECTORIES( ${CMAKE_INSTALL_PREFIX}/include/YaST2/yast2-qt ) -INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) -INCLUDE_DIRECTORIES( ../src ) +INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) +INCLUDE_DIRECTORIES( ../src ) +# CMake Warning (dev) at yast_plugin/CMakeLists.txt:30 (ADD_LIBRARY): +# Policy CMP0003 should be set before this line. Add code such as +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +endif(COMMAND cmake_policy) ADD_LIBRARY( py2qt_zypp_solver_dialog SHARED ${qt_solver_dialog_plugin_SRCS} ) TARGET_LINK_LIBRARIES( py2qt_zypp_solver_dialog yui) TARGET_LINK_LIBRARIES( py2qt_zypp_solver_dialog ${QT_QTCORE_LIBRARY} ) @@ -35,6 +47,6 @@ SET_TARGET_PROPERTIES( py2qt_zypp_solver_dialog PROPERTIES SOVERSION 2 ) SET_TARGET_PROPERTIES( py2qt_zypp_solver_dialog PROPERTIES LINK_FLAGS "-Wl,--no-undefined -Wl,-rpath -Wl,${CMAKE_INSTALL_PREFIX}/lib/YaST2/plugin" ) -INSTALL(TARGETS py2qt_zypp_solver_dialog LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/YaST2/plugin" ) +INSTALL(TARGETS py2qt_zypp_solver_dialog LIBRARY DESTINATION "${LIB_INSTALL_DIR}/YaST2/plugin" ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org