diff options
| author | lazydodo <github@lazydodo.com> | 2016-08-22 17:15:03 +0300 |
|---|---|---|
| committer | lazydodo <github@lazydodo.com> | 2016-08-22 17:15:03 +0300 |
| commit | 0dec3d6e220902bd769bc7acec2bbc5320ff900c (patch) | |
| tree | 04e4560037b1b244139b0a868730a34e79baf8d0 /build_files | |
| parent | eb2ee7212e16547e2a79b967d2ed37d88b0f2565 (diff) | |
Build Packaging : Set proper package name on Windows.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/packaging.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index afdbc644b4e..72f10bb5705 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -38,7 +38,17 @@ unset(MY_WC_HASH) # Force Package Name execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE CPACK_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER) -set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${CMAKE_SYSTEM_PROCESSOR}) +if (MSVC) + if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + set(PACKAGE_ARCH Win64) + else() + set(PACKAGE_ARCH Win32) + endif() +else(MSVC) + set(PACKAGE_ARCH ${CMAKE_SYSTEM_PROCESSOR}) +endif() + +set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${PACKAGE_ARCH}) if(CMAKE_SYSTEM_NAME MATCHES "Linux") # RPM packages |