diff --git a/CMakeLists.txt b/CMakeLists.txt index e72bd919..9ffca376 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,7 +227,7 @@ IF (CMAKE_SYSTEM_NAME STREQUAL Windows) SET(CPACK_GENERATOR "NSIS") SET(CPACK_PACKAGE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/packages") - SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_v${vsUTCS_PKG_VERSION_STR}_Windows_${CMAKE_SYSTEM_VERSION}_${CMAKE_SYSTEM_PROCESSOR}") + SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${vsUTCS_PKG_VERSION_STR}_Windows_${CMAKE_SYSTEM_VERSION}_${CMAKE_SYSTEM_PROCESSOR}") ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Darwin) MESSAGE(STATUS "Configuring Packaging for macOS") # There's a few options for MacOSX; not sure what we want to use @@ -237,7 +237,7 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Darwin) # PackageMaker - see https://cmake.org/cmake/help/v3.3/module/CPackPackageMaker.html SET(CPACK_GENERATOR "DragNDrop") SET(CPACK_PACKAGE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/packages") - SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_v${vsUTCS_PKG_VERSION_STR}_macOS_${CMAKE_SYSTEM_VERSION}_${CMAKE_SYSTEM_PROCESSOR}") + SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${vsUTCS_PKG_VERSION_STR}_macOS_${CMAKE_SYSTEM_VERSION}_${CMAKE_SYSTEM_PROCESSOR}") ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Linux) MESSAGE(STATUS "Configuring Packaging for Linux") SET(CPACK_GENERATOR "TXZ")