Reverting back the changes done earlier to Windows package names

sowmya-dass · sowmya-dass · commit 4b9ee5b80a16 · 2014-07-29T20:47:03.000+02:00
-windows platform names in packages made compact as it was earlier
-Adding the "-noinstall-" part to the Windows ZIP package name
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -207,9 +207,9 @@ INCLUDE(${CMAKE_SOURCE_DIR}/FindMySQL.cmake)
 IF(NOT CONNECTOR_PLATFORM)
   IF(WIN32)
     IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
-      SET(CONNECTOR_PLATFORM "windows-x86-64bit")
+      SET(CONNECTOR_PLATFORM "winx64")
     ELSE(CMAKE_SIZEOF_VOID_P MATCHES 8)
-      SET(CONNECTOR_PLATFORM "windows-x86-32bit")
+      SET(CONNECTOR_PLATFORM "win32")
     ENDIF(CMAKE_SIZEOF_VOID_P MATCHES 8)
   ELSE(WIN32)
     SET(CONNECTOR_PLATFORM "unknown")
@@ -254,11 +254,12 @@ SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README")
 SET(CPACK_RESOURCE_FILE_INSTALL "${CMAKE_SOURCE_DIR}/INSTALL")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}-${CONNECTOR_PLATFORM}")
-SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
 IF(WIN32)
   SET(CPACK_GENERATOR "ZIP")
+  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-noinstall-${MYSQLCPPCONN_VERSION}-${CONNECTOR_PLATFORM}")
 ELSE(WIN32)
   SET(CPACK_GENERATOR "TGZ")
+  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
 ENDIF(WIN32)
 
 INSTALL(FILES
diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt
@@ -29,11 +29,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
 # This is Windows only, so just set one of two possible
 
 SET(CONNECTOR_PLATFORM "Intel")
-SET(CONNECTOR_PLATFORM_SUFFIX "windows-x86-32bit")
+SET(CONNECTOR_PLATFORM_SUFFIX "win32")
 SET(CONNECTOR_DEFAULT_DEST "ProgramFilesFolder")
 IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
   SET(CONNECTOR_PLATFORM "x64")
-  SET(CONNECTOR_PLATFORM_SUFFIX "windows-x86-64bit")
+  SET(CONNECTOR_PLATFORM_SUFFIX "winx64")
   SET(CONNECTOR_DEFAULT_DEST "ProgramFiles64Folder")
 ENDIF(CMAKE_SIZEOF_VOID_P MATCHES 8)
 
