diff options
author | Andreas Schneider <asn@cynapses.org> | 2010-12-31 14:08:20 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cynapses.org> | 2010-12-31 14:08:20 +0100 |
commit | 8e632b14d1560e0bcaa37ca82e928906fce7f554 (patch) | |
tree | 53269d050205f0e8101e6763da6eb6e3cd856b71 | |
parent | 4728ac54fc4dffc6758879a6ad6faee04f6cc371 (diff) | |
download | libssh-8e632b14d1560e0bcaa37ca82e928906fce7f554.tar.gz libssh-8e632b14d1560e0bcaa37ca82e928906fce7f554.tar.xz libssh-8e632b14d1560e0bcaa37ca82e928906fce7f554.zip |
cmake: Fixed installation path for OS/2.
-rw-r--r-- | cmake/Modules/DefineInstallationPaths.cmake | 29 | ||||
-rw-r--r-- | cmake/Modules/DefinePlatformDefaults.cmake | 4 |
2 files changed, 17 insertions, 16 deletions
diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake index 71e1e85..d857871 100644 --- a/cmake/Modules/DefineInstallationPaths.cmake +++ b/cmake/Modules/DefineInstallationPaths.cmake @@ -1,4 +1,15 @@ -if (UNIX) +if (WIN32) + # Same same + set(BIN_INSTALL_DIR "bin" CACHE PATH "-") + set(SBIN_INSTALL_DIR "." CACHE PATH "-") + set(LIB_INSTALL_DIR "lib" CACHE PATH "-") + set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-") + set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-") + set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-") + set(ICON_INSTALL_DIR "." CACHE PATH "-") + set(SOUND_INSTALL_DIR "." CACHE PATH "-") + set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-") +elseif (UNIX OR OS2) IF (NOT APPLICATION_NAME) MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME") SET(APPLICATION_NAME ${PROJECT_NAME}) @@ -90,18 +101,4 @@ if (UNIX) "${SHARE_INSTALL_PREFIX}/info" CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)" ) -endif (UNIX) - -if (WIN32) - # Same same - set(BIN_INSTALL_DIR "bin" CACHE PATH "-") - set(SBIN_INSTALL_DIR "." CACHE PATH "-") - set(LIB_INSTALL_DIR "lib" CACHE PATH "-") - set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-") - set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-") - set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-") - set(ICON_INSTALL_DIR "." CACHE PATH "-") - set(SOUND_INSTALL_DIR "." CACHE PATH "-") - set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-") -endif (WIN32) - +endif () diff --git a/cmake/Modules/DefinePlatformDefaults.cmake b/cmake/Modules/DefinePlatformDefaults.cmake index 46c3185..0c3a05e 100644 --- a/cmake/Modules/DefinePlatformDefaults.cmake +++ b/cmake/Modules/DefinePlatformDefaults.cmake @@ -19,3 +19,7 @@ endif (CMAKE_SYSTEM_NAME MATCHES "NetBSD") if (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)") set(SOLARIS TRUE) endif (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)") + +if (CMAKE_SYSTEM_NAME MATCHES "OS2") + set(OS2 TRUE) +endif (CMAKE_SYSTEM_NAME MATCHES "OS2") |