[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/phonon
From:       Ralf Habacker <Ralf.Habacker () freenet ! de>
Date:       2009-08-04 15:46:05
Message-ID: 1249400765.049799.14339.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1006845 by habacker:

win32 needs relative pathes for installation as done in kdelibs

 M  +23 -10    CMakeLists.txt  


--- trunk/kdesupport/phonon/CMakeLists.txt #1006844:1006845
@@ -177,16 +177,29 @@
 
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
 
-_set_fancy(EXEC_INSTALL_PREFIX         "${CMAKE_INSTALL_PREFIX}"                   \
                "Base directory for executables and libraries")
-_set_fancy(SHARE_INSTALL_PREFIX        "${CMAKE_INSTALL_PREFIX}/share"             \
                "Base directory for files which go to share/")
-_set_fancy(BIN_INSTALL_DIR             "${EXEC_INSTALL_PREFIX}/bin"                \
                "The install dir for executables (default \
                ${EXEC_INSTALL_PREFIX}/bin)")
-_set_fancy(LIB_INSTALL_DIR             "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"   \
"The subdirectory relative to the install prefix where libraries will be installed \
                (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})")
-_set_fancy(INCLUDE_INSTALL_DIR         "${CMAKE_INSTALL_PREFIX}/include"           \
                "The subdirectory to the header prefix")
-_set_fancy(PLUGIN_INSTALL_DIR          "${LIB_INSTALL_DIR}/kde4"                   \
"The subdirectory relative to the install prefix where plugins will be installed \
                (default is ${LIB_INSTALL_DIR}/kde4)")
-_set_fancy(ICON_INSTALL_DIR            "${SHARE_INSTALL_PREFIX}/icons"             \
                "The icon install dir (default \
                ${SHARE_INSTALL_PREFIX}/share/icons/)")
-_set_fancy(SERVICES_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/kde4/services"     \
                "The install dir for service (desktop, protocol, ...) files")
-_set_fancy(DBUS_INTERFACES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" \
"The dbus interfaces install dir (default: \
                ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)")
-_set_fancy(DBUS_SERVICES_INSTALL_DIR   "${SHARE_INSTALL_PREFIX}/dbus-1/services"   \
"The dbus services install dir (default: ${SHARE_INSTALL_PREFIX}/dbus-1/services)") \
+if (WIN32) +    _set_fancy(EXEC_INSTALL_PREFIX         ""                   "Base \
directory for executables and libraries") +    _set_fancy(SHARE_INSTALL_PREFIX        \
"share"             "Base directory for files which go to share/") +    \
_set_fancy(BIN_INSTALL_DIR             "bin"                "The install dir for \
executables (default ${EXEC_INSTALL_PREFIX}/bin)") +    _set_fancy(LIB_INSTALL_DIR    \
"lib${LIB_SUFFIX}"   "The subdirectory relative to the install prefix where libraries \
will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})") +    \
_set_fancy(INCLUDE_INSTALL_DIR         "include"           "The subdirectory to the \
header prefix") +    _set_fancy(PLUGIN_INSTALL_DIR          "kde4"                   \
"The subdirectory relative to the install prefix where plugins will be installed \
(default is ${LIB_INSTALL_DIR}/kde4)") +    _set_fancy(ICON_INSTALL_DIR            \
"icons"             "The icon install dir (default \
${SHARE_INSTALL_PREFIX}/share/icons/)") +    _set_fancy(SERVICES_INSTALL_DIR        \
"kde4/services"     "The install dir for service (desktop, protocol, ...) files") +   \
_set_fancy(DBUS_INTERFACES_INSTALL_DIR "dbus-1/interfaces" "The dbus interfaces \
install dir (default: ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)") +    \
_set_fancy(DBUS_SERVICES_INSTALL_DIR   "dbus-1/services"   "The dbus services install \
dir (default: ${SHARE_INSTALL_PREFIX}/dbus-1/services)") +else(WIN32)
+    _set_fancy(EXEC_INSTALL_PREFIX         "${CMAKE_INSTALL_PREFIX}"                 \
"Base directory for executables and libraries") +    _set_fancy(SHARE_INSTALL_PREFIX  \
"${CMAKE_INSTALL_PREFIX}/share"             "Base directory for files which go to \
share/") +    _set_fancy(BIN_INSTALL_DIR             "${EXEC_INSTALL_PREFIX}/bin"     \
"The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)") +    \
_set_fancy(LIB_INSTALL_DIR             "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"   \
"The subdirectory relative to the install prefix where libraries will be installed \
(default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})") +    \
_set_fancy(INCLUDE_INSTALL_DIR         "${CMAKE_INSTALL_PREFIX}/include"           \
"The subdirectory to the header prefix") +    _set_fancy(PLUGIN_INSTALL_DIR          \
"${LIB_INSTALL_DIR}/kde4"                   "The subdirectory relative to the install \
prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)") +    \
_set_fancy(ICON_INSTALL_DIR            "${SHARE_INSTALL_PREFIX}/icons"             \
"The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)") +    \
_set_fancy(SERVICES_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/kde4/services"     \
"The install dir for service (desktop, protocol, ...) files") +    \
_set_fancy(DBUS_INTERFACES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" \
"The dbus interfaces install dir (default: \
${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)") +    \
_set_fancy(DBUS_SERVICES_INSTALL_DIR   "${SHARE_INSTALL_PREFIX}/dbus-1/services"   \
"The dbus services install dir (default: ${SHARE_INSTALL_PREFIX}/dbus-1/services)") \
+endif(WIN32)  
 set(INSTALL_TARGETS_DEFAULT_ARGS  RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
                                   LIBRARY DESTINATION "${LIB_INSTALL_DIR}"


[prev in list] [next in list] [prev in thread] [next in thread]