From 4c1af137e0f6f1617757f370258e556e6c2a11fa Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 10 Mar 2010 11:01:17 +0000 Subject: [PATCH] Based on a suggestion from Chuck Seberino, have added a section for testing of 64bit build under OSX and disable the use of quicktime when the build includes 64bit. --- CMakeModules/FindQuickTime.cmake | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/CMakeModules/FindQuickTime.cmake b/CMakeModules/FindQuickTime.cmake index 17ae700bf..dceb3897c 100644 --- a/CMakeModules/FindQuickTime.cmake +++ b/CMakeModules/FindQuickTime.cmake @@ -15,7 +15,7 @@ IF(APPLE) FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h) FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime) -ELSE(APPLE) +ELSE() FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h $ENV{QUICKTIME_DIR}/include $ENV{QUICKTIME_DIR} @@ -39,11 +39,24 @@ ELSE(APPLE) PATH_SUFFIXES lib64 lib ) FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime) -ENDIF(APPLE) +ENDIF() + SET(QUICKTIME_FOUND "NO") IF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR) SET(QUICKTIME_FOUND "YES") -ENDIF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR) - +ENDIF() +IF(APPLE) + #Quicktime is not supported under 64bit OSX build so we need to detect it and disable it. + #First check to see if we are running with a native 64-bit compiler (10.6 default) and implicit arch + IF(NOT CMAKE_OSX_ARCHITECTURES AND CMAKE_SIZEOF_VOID_P EQUAL 8) + SET(QUICKTIME_FOUND "NO") + ELSE() + #Otherwise check to see if 64-bit is explicitly called for. + LIST(FIND CMAKE_OSX_ARCHITECTURES "x86_64" has64Compile) + IF(NOT has64Compile EQUAL -1) + SET(QUICKTIME_FOUND "NO") + ENDIF() + ENDIF() +ENDIF()