From 00dfcccb1aad951df056c17671e04ddb5b9246fb Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 9 Mar 2016 19:45:08 +0200 Subject: [PATCH] when building on Windows natively create NSIS package Signed-off-by: Ivailo Monev --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1db1d2d38..498527fcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,9 +161,14 @@ set(CPACK_PACKAGE_VERSION_MINOR ${KATIE_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${KATIE_MICRO}) set(CPACK_PACKAGE_INSTALL_DIRECTORY "Katie") set(CPACK_SOURCE_IGNORE_FILES "/build/;/mingw/;/.git;${CPACK_SOURCE_IGNORE_FILES}") -if(WIN32) +if(WIN32 AND CMAKE_CROSSCOMPILING) + # Windows build on non-Windows host, NSIS is not manditory on such set(CPACK_GENERATOR "ZIP") set(CPACK_SOURCE_GENERATOR "ZIP") +elseif(WIN32) + # native Windows build, let's make a NSIS package + set(CPACK_GENERATOR "ZIP;NSIS") + set(CPACK_SOURCE_GENERATOR "ZIP") else() set(CPACK_GENERATOR "TXZ") set(CPACK_SOURCE_GENERATOR "TXZ") -- 2.11.0