Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

From Stephan Huber, "Please revert the change to FindQuickTime.cmake …

…as this breaks compilation for IOS and possibly OS X."
  • Loading branch information...
commit 7018e68953f35527e252b424309f94b84a70ad97 1 parent 4349392
Robert OSFIELD authored
Showing with 3 additions and 12 deletions.
  1. +3 −12 CMakeModules/FindQuickTime.cmake
View
15 CMakeModules/FindQuickTime.cmake
@@ -1,22 +1,13 @@
# Locate QuickTime
# This module defines
# 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_DIR is an environment variable that would
# correspond to the ./configure --prefix=$QUICKTIME_DIR
#
-# 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()
+# Created by Eric Wing.
# QuickTime on OS X looks different than QuickTime for Windows,
@@ -73,7 +64,7 @@ ELSE()
ENDIF()
ENDIF()
# 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")
MESSAGE("disabling quicktime because it's not supported by the selected SDK ${OSG_OSX_SDK_NAME}")
SET(QUICKTIME_FOUND "NO")
Please sign in to comment.
Something went wrong with that request. Please try again.