Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
From Stephan Huber, "Please revert the change to FindQuickTime.cmake …
…as this breaks compilation for IOS and possibly OS X."
  • Loading branch information
Robert OSFIELD committed May 6, 2014
1 parent 4349392 commit 7018e68
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions CMakeModules/FindQuickTime.cmake
@@ -1,22 +1,13 @@
# Locate QuickTime # Locate QuickTime
# This module defines # This module defines
# QUICKTIME_LIBRARY # QUICKTIME_LIBRARY
# QUICKTIME_FOUND, if false, do not try to link to gdal # QUICKTIME_FOUND, if false, do not try to link to gdal
# QUICKTIME_INCLUDE_DIR, where to find the headers # QUICKTIME_INCLUDE_DIR, where to find the headers
# #
# $QUICKTIME_DIR is an environment variable that would # $QUICKTIME_DIR is an environment variable that would
# correspond to the ./configure --prefix=$QUICKTIME_DIR # correspond to the ./configure --prefix=$QUICKTIME_DIR
# #
# Created by Eric Wing. # Created by Eric Wing.

# prefer FindQuickTime from cmake distribution
if(EXISTS ${CMAKE_ROOT}/Modules/FindQuickTime.cmake)
include(${CMAKE_ROOT}/Modules/FindQuickTime.cmake)

if(QUICKTIME_FOUND)
return()
endif()
endif()




# QuickTime on OS X looks different than QuickTime for Windows, # QuickTime on OS X looks different than QuickTime for Windows,
Expand Down Expand Up @@ -73,7 +64,7 @@ ELSE()
ENDIF() ENDIF()
ENDIF() ENDIF()
# Disable quicktime for >= 10.7, as it's officially deprecated # Disable quicktime for >= 10.7, as it's officially deprecated

IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.7" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9") IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.7" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9")
MESSAGE("disabling quicktime because it's not supported by the selected SDK ${OSG_OSX_SDK_NAME}") MESSAGE("disabling quicktime because it's not supported by the selected SDK ${OSG_OSX_SDK_NAME}")
SET(QUICKTIME_FOUND "NO") SET(QUICKTIME_FOUND "NO")
Expand Down

0 comments on commit 7018e68

Please sign in to comment.