[trunk] Requires CMake 2.8.2 at least

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfa4bebaed0c4d8fff59c88602abce6ca8a4c8c2..ea71f0d97a3b31e0775272d5a73892d19e71aa95 100644 (file)
--- 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 1a40ff17b1c99b283ccb1790bf42f190bd472811..a6e9a866e2b80cbcb84ee38cb5fd08f96416cac0 100644 (file)
--- 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")