From 32e80bc4a75a8c864254289fa0fed87601a38a7c Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Wed, 11 Jan 2012 16:18:26 +0000 Subject: [PATCH] Fixing the PackageMaker generator --- CMake/OpenJPEGCPack.cmake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/CMake/OpenJPEGCPack.cmake b/CMake/OpenJPEGCPack.cmake index e174e5b7..a05d2ba1 100644 --- a/CMake/OpenJPEGCPack.cmake +++ b/CMake/OpenJPEGCPack.cmake @@ -13,9 +13,13 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") set(OPJ_PACKAGE_CONTACT "openjpeg users ") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${OPJ_PACKAGE_DESCRIPTION_SUMMARY}) - set(CPACK_PACKAGE_VENDOR "OpenJPEG") - set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") - set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") + 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_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}") set(CPACK_PACKAGE_VERSION_PATCH "${OPENJPEG_VERSION_BUILD}") @@ -23,11 +27,12 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") set(CPACK_SOURCE_PACKAGE_FILE_NAME "openjpeg-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/CMake/opj_logo.icns") - set(CPACK_BUNDLE_NAME "BundleGeneratorTest") + 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) SET(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_BINARY_DIR}/opj.plist) + #include(BundleUtilities) include(CPack) endiF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")