Show
Ignore:
Timestamp:
01/04/08 21:00:18 (6 years ago)
Author:
robert
Message:

From Eric Wing, "Attached are a few Find modules with updates. Among other things, they
contain better support for environmental variables to pre-empt the
autodection default search path order which is very helpful for people
who do automated builds. (I recommend that the remaining modules
consider adding the same system to make things consistent and easier
for those people that want to do the automated builds.)

The CMAKE_PREFIX_PATH has also been added to help people. I don't
recommend adding this to the other modules because it looks like CMake
agreed with my idea and will be adding the support in 2.6. So when
that ships, people will get it for free. (In the meantime, my modules
that do have it, it can be used.)

Finally, I've submitted all of these modules to official CMake plus
more so they will be in the next version of CMake. It looks like I may
need to sort some compatibility issues out with the KDE people who
seem to have conflicting modules, but this is unrelated to the updates
submitted here as OSG already has these conflicts. I figured I would
just sync OSG up with my current/best versions.

Also of note, I added the large batch of Findosg*.cmake modules to
CMake so people building against OpenSceneGraph can use these without
writing their own. I wasn't sure if I should submit them here or not
since they are for building against OSG and not for building OSG
itself. So they are not included.
"

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/CMakeModules/FindQuickTime.cmake

    r7025 r7766  
    77# $QUICKTIME_DIR is an environment variable that would 
    88# correspond to the ./configure --prefix=$QUICKTIME_DIR 
    9 # used in building gdal. 
    109# 
    1110# Created by Eric Wing.  
     
    1514 
    1615IF(APPLE) 
    17     FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h) 
    18     FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime) 
     16  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h) 
     17  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime) 
    1918ELSE(APPLE) 
    20     FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h 
    21         $ENV{QUICKTIME_DIR}/include 
    22         $ENV{QUICKTIME_DIR} 
    23     ) 
    24     FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime) 
     19  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h 
     20    $ENV{QUICKTIME_DIR}/include 
     21    $ENV{QUICKTIME_DIR} 
     22    NO_DEFAULT_PATH 
     23  ) 
     24  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h 
     25    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. 
     26    NO_DEFAULT_PATH 
     27    PATH_SUFFIXES include 
     28  ) 
     29  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h) 
     30 
     31  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime 
     32    $ENV{QUICKTIME_DIR}/lib 
     33    $ENV{QUICKTIME_DIR} 
     34    NO_DEFAULT_PATH 
     35  ) 
     36  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime 
     37    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. 
     38    NO_DEFAULT_PATH 
     39    PATH_SUFFIXES lib64 lib 
     40  ) 
     41  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime) 
    2542ENDIF(APPLE) 
    2643 
    2744SET(QUICKTIME_FOUND "NO") 
    2845IF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR) 
    29     SET(QUICKTIME_FOUND "YES") 
     46  SET(QUICKTIME_FOUND "YES") 
    3047ENDIF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR) 
    3148