From f546110bafa07185c399f2556f702a932bc63c3e Mon Sep 17 00:00:00 2001 From: Jerry Jacobs Date: Sat, 28 Jan 2017 12:09:37 +0100 Subject: [PATCH] cmake/CPackConfig.cmake: Fixup OSX zip filename --- cmake/CPackConfig.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/CPackConfig.cmake b/cmake/CPackConfig.cmake index 3dc2b6a3a..ac3cc6f7e 100644 --- a/cmake/CPackConfig.cmake +++ b/cmake/CPackConfig.cmake @@ -3,12 +3,13 @@ set (CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) set (CPACK_SET_DESTDIR "ON") if (APPLE) set(CPACK_GENERATOR "ZIP") + set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}-macosx-amd64") file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/dist/osx") - set (CPACK_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/cpack/staging") + set (CPACK_INSTALL_PREFIX "") set(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_BINARY_DIR}/dist/osx") elseif (WIN32) set(CPACK_GENERATOR "ZIP") file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/dist/windows") set (CPACK_INSTALL_PREFIX "") set(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_BINARY_DIR}/dist/windows") -endif() \ No newline at end of file +endif()