diff options
author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-11-09 20:13:03 +0000 |
---|---|---|
committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-11-09 20:13:03 +0000 |
commit | 73d188f4aee77b43e90406af884409574f679d7a (patch) | |
tree | 507c9289072d723772996d7979e449b82776cc16 | |
parent | 6cb1aebd721824aef2a0b38f00d7cbd9e1f181a9 (diff) | |
download | navit-svn-73d188f4aee77b43e90406af884409574f679d7a.tar.gz |
Fix:core:Set CPACK_INCLUDE_TOPLEVEL_DIRECTORY only for zip cpack generator, otherwise it breaks NSIS package generation when strict settings are active.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5936 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rwxr-xr-x | CMakeLists.txt | 1 | ||||
-rw-r--r-- | cpack.cmake | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f3d4569b..6d29d0ba 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,7 +112,6 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/GPL-2") set(CPACK_NSIS_PACKAGE_NAME "Navit ${PACKAGE_VERSION}") set(CPACK_PACKAGE_FILE_NAME ${PACKAGE}) set(CPACK_PACKAGE_EXECUTABLES "navit;Navit") -set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1) set(CPACK_NSIS_HELP_LINK "http://www.navit-project.org/?page=contact") set(CPACK_NSIS_URL_INFO_ABOUT "http://www.navit-project.org") if(WIN32) diff --git a/cpack.cmake b/cpack.cmake new file mode 100644 index 00000000..2bf38e61 --- /dev/null +++ b/cpack.cmake @@ -0,0 +1,4 @@ +if(CPACK_GENERATOR=="ZIP") + set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1) +endif(CPACK_GENERATOR=="ZIP") + |