Backing out NickyP's VS2010 changes; breaks compilation on OS X.

Sat, 17 Mar 2012 11:43:21 -0500

author
Tonya Souther <tonya.souther@gmail.com>
date
Sat, 17 Mar 2012 11:43:21 -0500
changeset 1681
4aa27e7bebb8
parent 1680
f70b0f60e3bb
child 1682
89234d0de3a6

Backing out NickyP's VS2010 changes; breaks compilation on OS X.

indra/cmake/QuickTimePlugin.cmake file | annotate | diff | revisions
     1.1 --- a/indra/cmake/QuickTimePlugin.cmake	Fri Mar 16 23:00:42 2012 -0700
     1.2 +++ b/indra/cmake/QuickTimePlugin.cmake	Sat Mar 17 11:43:21 2012 -0500
     1.3 @@ -1,56 +1,46 @@
     1.4  # -*- cmake -*-
     1.5 -if(INSTALL_PROPRIETARY OR USE_QUICKTIME)
     1.6 -  set(QUICKTIME ON CACHE BOOL "Build with Quicktime support")
     1.7 -endif(INSTALL_PROPRIETARY OR USE_QUICKTIME)
     1.8  
     1.9 -if(QUICKTIME)
    1.10 -
    1.11 +if(INSTALL_PROPRIETARY)
    1.12    include(Prebuilt)
    1.13    use_prebuilt_binary(quicktime)
    1.14 +endif(INSTALL_PROPRIETARY)
    1.15  
    1.16 +if (DARWIN)
    1.17 +  include(CMakeFindFrameworks)
    1.18 +  find_library(QUICKTIME_LIBRARY QuickTime)
    1.19 +elseif (WINDOWS)
    1.20 +  set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
    1.21 +      CACHE PATH "Location of the QuickTime SDK.")
    1.22  
    1.23 -  if (DARWIN)
    1.24 -    include(CMakeFindFrameworks)
    1.25 -    find_library(QUICKTIME_LIBRARY QuickTime)
    1.26 -  elseif (WINDOWS)
    1.27 -    if ("$ENV(QUICKTIME_SDK_DIR")
    1.28 -      set(QUICKTIME_SDK_DIR "$ENV(QUICKTIME_SDK_DIR)"
    1.29 -           CACHE PATH "Location of the QuickTime SDK.")
    1.30 -    else ()#APPLE LOCAL SDK
    1.31 -      set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
    1.32 -      CACHE PATH "Location of the QuickTime SDK.")
    1.33 -    endif ()
    1.34 +  find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient.lib
    1.35 +               PATHS
    1.36 +               ${ARCH_PREBUILT_DIRS_DEBUG}
    1.37 +               "${QUICKTIME_SDK_DIR}\\libraries"
    1.38 +               )
    1.39  
    1.40 -    find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient.lib
    1.41 -           PATHS
    1.42 -           ${ARCH_PREBUILT_DIRS_DEBUG}
    1.43 -           "${QUICKTIME_SDK_DIR}\\libraries"
    1.44 -           )
    1.45 +  find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient.lib
    1.46 +               PATHS
    1.47 +               ${ARCH_PREBUILT_DIRS_RELEASE}
    1.48 +               "${QUICKTIME_SDK_DIR}\\libraries"
    1.49 +               )
    1.50  
    1.51 -    find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient.lib
    1.52 -           PATHS
    1.53 -           ${ARCH_PREBUILT_DIRS_RELEASE}
    1.54 -           "${QUICKTIME_SDK_DIR}\\libraries"
    1.55 -           )
    1.56 -
    1.57 -    if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
    1.58 +  if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
    1.59      set(QUICKTIME_LIBRARY 
    1.60 -      optimized ${RELEASE_QUICKTIME_LIBRARY}
    1.61 -      debug ${DEBUG_QUICKTIME_LIBRARY}
    1.62 -      )
    1.63 -      
    1.64 -    endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
    1.65 -    
    1.66 -    include_directories(
    1.67 -    ${LIBS_PREBUILT_DIR}/include/quicktime
    1.68 +        optimized ${RELEASE_QUICKTIME_LIBRARY}
    1.69 +        debug ${DEBUG_QUICKTIME_LIBRARY}
    1.70 +        )
    1.71 +        
    1.72 +  endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
    1.73 +  
    1.74 +  include_directories(
    1.75 +    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
    1.76      "${QUICKTIME_SDK_DIR}\\CIncludes"
    1.77      )
    1.78 -  endif (DARWIN)
    1.79 +endif (DARWIN)
    1.80  
    1.81 -  mark_as_advanced(QUICKTIME_LIBRARY)
    1.82 +mark_as_advanced(QUICKTIME_LIBRARY)
    1.83  
    1.84 -  if (QUICKTIME_LIBRARY)
    1.85 -    set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
    1.86 -  endif (QUICKTIME_LIBRARY)
    1.87 -endif(QUICKTIME)
    1.88 +if (QUICKTIME_LIBRARY)
    1.89 +  set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
    1.90 +endif (QUICKTIME_LIBRARY)
    1.91  

mercurial