From: José Fonseca Date: Wed, 29 Feb 2012 10:55:55 +0000 (+0000) Subject: Bump to version 3.0 X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=63c02f3d48d041b9c44c22b132221dd616e4b042 Bump to version 3.0 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6469b4b..0dc805a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -657,7 +657,7 @@ install ( DESTINATION ${DOC_INSTALL_DIR} ) -set (CPACK_PACKAGE_VERSION_MAJOR "2") +set (CPACK_PACKAGE_VERSION_MAJOR "3") set (CPACK_PACKAGE_VERSION_MINOR "0") # Use current date in YYYYMMDD format as patch number @@ -666,6 +666,13 @@ execute_process ( OUTPUT_VARIABLE CPACK_PACKAGE_VERSION_PATCH ) +# cpack mistakenly detects Mingw-w64 as win32 +if (MINGW) + if (CMAKE_SIZEOF_VOID_P EQUAL 8) + set (CPACK_SYSTEM_NAME win64) + endif () +endif () + # See http://www.vtk.org/Wiki/CMake:CPackPackageGenerators if (WIN32) set (CPACK_GENERATOR "ZIP")