kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindOpenSceneGraph_13094' 

dd60ed2 Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094
224b5de FindOpenSceneGraph: CMake variable OSG_DIR influences detection now too
This commit is contained in:
David Cole 2012-08-20 15:42:03 -04:00 committed by CMake Topic Stage
parent 9a4b4f2223 dd60ed2f4f
commit e19f260712
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindOpenSceneGraph.cmake
View File

@ -26,6 +26,10 @@
# OSGDIR # OSGDIR
# OSG_ROOT # OSG_ROOT
# #
# [CMake 2.8.10]:
# The CMake variable OSG_DIR can now be used as well to influence detection, instead of needing
# to specify an environment variable.
#
# This module defines the following output variables: # This module defines the following output variables:
# #
# OPENSCENEGRAPH_FOUND - Was the OSG and all of the specified components found? # OPENSCENEGRAPH_FOUND - Was the OSG and all of the specified components found?
@ -49,7 +53,7 @@
#============================================================================= #=============================================================================
# Copyright 2009 Kitware, Inc. # Copyright 2009 Kitware, Inc.
# Copyright 2009 Philip Lowman <philip@yhbt.com> # Copyright 2009-2012 Philip Lowman <philip@yhbt.com>
# #
# Distributed under the OSI-approved BSD License (the "License"); # Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details. # see accompanying file Copyright.txt for details.

12
Modules/FindOpenThreads.cmake
View File

@ -15,10 +15,15 @@
# correspond to the ./configure --prefix=$OPENTHREADS_DIR # correspond to the ./configure --prefix=$OPENTHREADS_DIR
# used in building osg. # used in building osg.
# #
# [CMake 2.8.10]:
# The CMake variables OPENTHREADS_DIR or OSG_DIR can now be used as well to influence
# detection, instead of needing to specify an environment variable.
#
# Created by Eric Wing. # Created by Eric Wing.
#============================================================================= #=============================================================================
# Copyright 2007-2009 Kitware, Inc. # Copyright 2007-2009 Kitware, Inc.
# Copyright 2012 Philip Lowman <philip@yhbt.com>
# #
# Distributed under the OSI-approved BSD License (the "License"); # Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details. # see accompanying file Copyright.txt for details.
@ -53,7 +58,6 @@
find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
HINTS HINTS
# enough environment variables?
ENV OPENTHREADS_INCLUDE_DIR ENV OPENTHREADS_INCLUDE_DIR
ENV OPENTHREADS_DIR ENV OPENTHREADS_DIR
ENV OSG_INCLUDE_DIR ENV OSG_INCLUDE_DIR
@ -61,6 +65,8 @@ find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
ENV OSGDIR ENV OSGDIR
ENV OpenThreads_ROOT ENV OpenThreads_ROOT
ENV OSG_ROOT ENV OSG_ROOT
${OPENTHREADS_DIR}
${OSG_DIR}
PATHS PATHS
/sw # Fink /sw # Fink
/opt/local # DarwinPorts /opt/local # DarwinPorts
@ -81,6 +87,8 @@ find_library(OPENTHREADS_LIBRARY
ENV OSGDIR ENV OSGDIR
ENV OpenThreads_ROOT ENV OpenThreads_ROOT
ENV OSG_ROOT ENV OSG_ROOT
${OPENTHREADS_DIR}
${OSG_DIR}
PATHS PATHS
/sw /sw
/opt/local /opt/local
@ -101,6 +109,8 @@ find_library(OPENTHREADS_LIBRARY_DEBUG
ENV OSGDIR ENV OSGDIR
ENV OpenThreads_ROOT ENV OpenThreads_ROOT
ENV OSG_ROOT ENV OSG_ROOT
${OPENTHREADS_DIR}
${OSG_DIR}
PATHS PATHS
/sw /sw
/opt/local /opt/local

11
Modules/Findosg_functions.cmake
View File

@ -1,11 +1,12 @@
# #
# This CMake file contains two macros to assist with searching for OSG # This CMake file contains two macros to assist with searching for OSG
# libraries and nodekits. # libraries and nodekits. Please see FindOpenSceneGraph.cmake for full
# documentation.
# #
#============================================================================= #=============================================================================
# Copyright 2009 Kitware, Inc. # Copyright 2009 Kitware, Inc.
# Copyright 2009 Philip Lowman <philip@yhbt.com> # Copyright 2009-2012 Philip Lowman <philip@yhbt.com>
# #
# Distributed under the OSI-approved BSD License (the "License"); # Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details. # see accompanying file Copyright.txt for details.
@ -30,6 +31,8 @@ function(OSG_FIND_PATH module header)
ENV OSG_DIR ENV OSG_DIR
ENV OSGDIR ENV OSGDIR
ENV OSG_ROOT ENV OSG_ROOT
${${module_uc}_DIR}
${OSG_DIR}
PATH_SUFFIXES include PATH_SUFFIXES include
PATHS PATHS
/sw # Fink /sw # Fink
@ -54,6 +57,8 @@ function(OSG_FIND_LIBRARY module library)
ENV OSG_DIR ENV OSG_DIR
ENV OSGDIR ENV OSGDIR
ENV OSG_ROOT ENV OSG_ROOT
${${module_uc}_DIR}
${OSG_DIR}
PATH_SUFFIXES lib PATH_SUFFIXES lib
PATHS PATHS
/sw # Fink /sw # Fink
@ -70,6 +75,8 @@ function(OSG_FIND_LIBRARY module library)
ENV OSG_DIR ENV OSG_DIR
ENV OSGDIR ENV OSGDIR
ENV OSG_ROOT ENV OSG_ROOT
${${module_uc}_DIR}
${OSG_DIR}
PATH_SUFFIXES lib PATH_SUFFIXES lib
PATHS PATHS
/sw # Fink /sw # Fink