aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cynapses.org>2010-07-13 17:49:01 +0200
committerAndreas Schneider <asn@cynapses.org>2010-07-13 17:49:01 +0200
commitaa8381999a2dd7734d0cf30fa4df14d5a17cc2ab (patch)
tree62d5571a2cffbb952663d44334581d45c61fdb25
parentac54a26c5d39a4b30e62384eb10d2398ac6ab789 (diff)
downloadlibssh-aa8381999a2dd7734d0cf30fa4df14d5a17cc2ab.tar.gz
libssh-aa8381999a2dd7734d0cf30fa4df14d5a17cc2ab.tar.xz
libssh-aa8381999a2dd7734d0cf30fa4df14d5a17cc2ab.zip
build: Fixed the NSIS build.
-rw-r--r--CPackConfig.cmake26
1 files changed, 15 insertions, 11 deletions
diff --git a/CPackConfig.cmake b/CPackConfig.cmake
index bb53a7c7..72f86d78 100644
--- a/CPackConfig.cmake
+++ b/CPackConfig.cmake
@@ -22,17 +22,21 @@ set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;tags;cscope.*")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-
-### nsis generator
-set(CPACK_GENERATOR "ZIP")
-
-find_package(NSIS)
-if (HAVE_NSIS)
- set(CPACK_GENERATOR "${CPACK_GENERATOR};NSIS")
- set(CPACK_NSIS_DISPLAY_NAME "The SSH Library")
- set(CPACK_NSIS_COMPRESSOR "/SOLID zlib")
- set(CPACK_NSIS_MENU_LINKS "http://www.libssh.org/" "libssh homepage")
-endif (HAVE_NSIS)
+if (WIN32)
+ set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS TRUE)
+ include(InstallRequiredSystemLibraries)
+
+ set(CPACK_GENERATOR "ZIP")
+
+ ### nsis generator
+ find_package(NSIS)
+ if (HAVE_NSIS)
+ set(CPACK_GENERATOR "${CPACK_GENERATOR};NSIS")
+ set(CPACK_NSIS_DISPLAY_NAME "The SSH Library")
+ set(CPACK_NSIS_COMPRESSOR "/SOLID zlib")
+ set(CPACK_NSIS_MENU_LINKS "http://www.libssh.org/" "libssh homepage")
+ endif (HAVE_NSIS)
+endif (WIN32)
set(CPACK_PACKAGE_INSTALL_DIRECTORY "libssh")