win32 fix: use relative install prefix to avoid hardcoded install pathes in cmake_install.cmake files

svn path=/trunk/KDE/kdelibs/; revision=678005

1 files changed, 18 insertions, 7 deletions

diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index d9976b2f..c3526c4d 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -290,13 +290,20 @@ macro(_SET_FANCY _var _value _comment)
    endif (NOT DEFINED ${_var})

 endmacro(_SET_FANCY)

 

-

-_set_fancy(SHARE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/share              "Base directory for files which go to share/")

-_set_fancy(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX}                    "Base directory for executables and libraries")

-

-_set_fancy(BIN_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/bin"           "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")

-_set_fancy(SBIN_INSTALL_DIR         "${EXEC_INSTALL_PREFIX}/sbin"          "The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)")

-_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})")

+if (WIN32)

+    # use relative install prefix to avoid hardcoded install pathes in cmake_install.cmake files

+	_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(SBIN_INSTALL_DIR     "sbin"                             "The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)")

+	_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})")

+else (WIN32)

+	_set_fancy(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share"           "Base directory for files which go to share/")

+	_set_fancy(EXEC_INSTALL_PREFIX  "${CMAKE_INSTALL_PREFIX}"                 "Base directory for executables and libraries")

+    _set_fancy(BIN_INSTALL_DIR      "${EXEC_INSTALL_PREFIX}/bin"              "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")

+    _set_fancy(SBIN_INSTALL_DIR     "${EXEC_INSTALL_PREFIX}/sbin"             "The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)")

+    _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})")

+endif (WIN32)

 

 if(WIN32)

    _set_fancy(LIBEXEC_INSTALL_DIR   "${BIN_INSTALL_DIR}"                   "The subdirectory relative to the install prefix where libraries will be installed (default is ${BIN_INSTALL_DIR})")

@@ -305,7 +312,11 @@ else(WIN32)
 endif(WIN32)

 _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)")

 

+if (WIN32)

+_set_fancy(INCLUDE_INSTALL_DIR      "include"                              "The subdirectory to the header prefix")

+else(WIN32)

 _set_fancy(INCLUDE_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/include"      "The subdirectory to the header prefix")

+endif (WIN32)

 _set_fancy(CONFIG_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/config"       "The config file install dir")

 _set_fancy(DATA_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/apps"         "The parent directory where applications can install their data")

 _set_fancy(HTML_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/doc/HTML"     "The HTML install dir for documentation")