From 60fc79c717b4bc3c5ab3a45fb10dfe64a907485d Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Mon, 1 Oct 2012 14:18:20 +0000 Subject: [PATCH] [trunk] Requires CMake 2.8.2 at least --- CMakeLists.txt | 2 +- cmake/OpenJPEGCPack.cmake | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfa4beba..ea71f0d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like # e.g.: # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG") -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.2) if(COMMAND CMAKE_POLICY) cmake_policy(SET CMP0003 NEW) diff --git a/cmake/OpenJPEGCPack.cmake b/cmake/OpenJPEGCPack.cmake index 1a40ff17..a6e9a866 100644 --- a/cmake/OpenJPEGCPack.cmake +++ b/cmake/OpenJPEGCPack.cmake @@ -60,11 +60,13 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") endif() 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) + if(APPLE) + 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) + endif() include(CPack) endiF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")