From 7d97b181d301d6f3c0a6b5bcd1a12eca5ff153c1 Mon Sep 17 00:00:00 2001
From: Antonin Descampe <antonin@gmail.com>
Date: Tue, 7 Feb 2012 22:10:09 +0000
Subject: [PATCH] update OpenJPEGCPack.cmake with correct package names

---
 CMake/OpenJPEGCPack.cmake | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/CMake/OpenJPEGCPack.cmake b/CMake/OpenJPEGCPack.cmake
index dbd4e072..b7f2ba37 100644
--- a/CMake/OpenJPEGCPack.cmake
+++ b/CMake/OpenJPEGCPack.cmake
@@ -14,11 +14,11 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 
   set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${OPJ_PACKAGE_DESCRIPTION_SUMMARY})
   set(CPACK_PACKAGE_VENDOR           "OpenJPEG Team")
-  #set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
     "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt" COPYONLY
     )
   # For PackageMaker on MacOSX it is important to have a file extension:
+  set(CPACK_PACKAGE_DESCRIPTION_FILE    "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
   set(CPACK_RESOURCE_FILE_LICENSE    "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
   set(CPACK_PACKAGE_VERSION_MAJOR    "${OPENJPEG_VERSION_MAJOR}")
   set(CPACK_PACKAGE_VERSION_MINOR    "${OPENJPEG_VERSION_MINOR}")
@@ -26,6 +26,39 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
   set(CPACK_PACKAGE_INSTALL_DIRECTORY "OpenJPEG ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
   set(CPACK_SOURCE_PACKAGE_FILE_NAME  "openjpeg-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
+  # Make this explicit here, rather than accepting the CPack default value,
+  # so we can refer to it:
+  SET(CPACK_PACKAGE_NAME "${OPENJPEG_LIBRARY_NAME}")
+
+  IF(NOT DEFINED CPACK_SYSTEM_NAME)
+    # make sure package is not Cygwin-unknown, for Cygwin just
+    # cygwin is good for the system name
+    IF("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
+      SET(CPACK_SYSTEM_NAME Cygwin)
+    ELSE("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
+      SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
+    ENDIF("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
+  ENDIF(NOT DEFINED CPACK_SYSTEM_NAME)
+  IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
+    IF(CMAKE_CL_64)
+      SET(CPACK_SYSTEM_NAME win64-x64)
+    ELSE(CMAKE_CL_64)
+      SET(CPACK_SYSTEM_NAME win32-x86)
+    ENDIF(CMAKE_CL_64)
+  ENDIF(${CPACK_SYSTEM_NAME} MATCHES Windows)
+
+  IF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
+    # if the CPACK_PACKAGE_FILE_NAME is not defined by the cache
+    # default to source package - system, on cygwin system is not 
+    # needed
+    IF(CYGWIN)
+      SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}")
+    ELSE(CYGWIN)
+      SET(CPACK_PACKAGE_FILE_NAME 
+        "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
+    ENDIF(CYGWIN)
+  ENDIF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
+
   set(CPACK_BUNDLE_NAME "OpenJPEG ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
   configure_file(${CMAKE_ROOT}/Templates/AppleInfo.plist
     ${CMAKE_CURRENT_BINARY_DIR}/opj.plist)
-- 
2.30.2