[Cmake-commits] CMake branch, next, updated. v2.8.9-141-g69fa443
Philip Lowman
philip at yhbt.com
Sat Aug 18 17:05:37 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 69fa443a58699281437577b4ba3a037592ed158a (commit)
via dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac (commit)
via 224b5dea785d20a9054a2b7fb9e737c106084879 (commit)
from f9c04e2f1738d06b4a23549b32f5a7a6e708abcc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69fa443a58699281437577b4ba3a037592ed158a
commit 69fa443a58699281437577b4ba3a037592ed158a
Merge: f9c04e2 dd60ed2
Author: Philip Lowman <philip at yhbt.com>
AuthorDate: Sat Aug 18 17:05:35 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 18 17:05:35 2012 -0400
Merge topic 'FindOpenSceneGraph_13094' into next
dd60ed2 Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094
224b5de FindOpenSceneGraph: CMake variable OSG_DIR influences detection now too
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac
commit dd60ed2f4f523fecf2d9757d6b52f2bd0fa2bfac
Merge: 224b5de cfe4ac4
Author: Philip Lowman <philip at yhbt.com>
AuthorDate: Sat Aug 18 17:03:18 2012 -0400
Commit: Philip Lowman <philip at yhbt.com>
CommitDate: Sat Aug 18 17:03:18 2012 -0400
Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094
Resolved a few conflicts due to changes made in 13094 to paths
Conflicts:
Modules/FindOpenThreads.cmake
Modules/Findosg_functions.cmake
diff --cc Modules/FindOpenThreads.cmake
index 7668107,36247c1..e059960
--- a/Modules/FindOpenThreads.cmake
+++ b/Modules/FindOpenThreads.cmake
@@@ -58,15 -53,14 +58,15 @@@
find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
HINTS
- $ENV{OPENTHREADS_INCLUDE_DIR}
- $ENV{OPENTHREADS_DIR}
- $ENV{OSG_INCLUDE_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
- $ENV{OpenThreads_ROOT}
- $ENV{OSG_ROOT}
- # enough environment variables?
+ ENV OPENTHREADS_INCLUDE_DIR
+ ENV OPENTHREADS_DIR
+ ENV OSG_INCLUDE_DIR
+ ENV OSG_DIR
+ ENV OSGDIR
+ ENV OpenThreads_ROOT
+ ENV OSG_ROOT
+ ${OPENTHREADS_DIR}
+ ${OSG_DIR}
PATHS
/sw # Fink
/opt/local # DarwinPorts
@@@ -80,15 -74,13 +80,15 @@@
find_library(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32
HINTS
- $ENV{OPENTHREADS_LIBRARY_DIR}
- $ENV{OPENTHREADS_DIR}
- $ENV{OSG_LIBRARY_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
- $ENV{OpenThreads_ROOT}
- $ENV{OSG_ROOT}
+ ENV OPENTHREADS_LIBRARY_DIR
+ ENV OPENTHREADS_DIR
+ ENV OSG_LIBRARY_DIR
+ ENV OSG_DIR
+ ENV OSGDIR
+ ENV OpenThreads_ROOT
+ ENV OSG_ROOT
+ ${OPENTHREADS_DIR}
+ ${OSG_DIR}
PATHS
/sw
/opt/local
@@@ -101,16 -93,14 +101,16 @@@
find_library(OPENTHREADS_LIBRARY_DEBUG
NAMES OpenThreadsd OpenThreadsWin32d
HINTS
- $ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
- $ENV{OPENTHREADS_LIBRARY_DIR}
- $ENV{OPENTHREADS_DIR}
- $ENV{OSG_LIBRARY_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
- $ENV{OpenThreads_ROOT}
- $ENV{OSG_ROOT}
+ ENV OPENTHREADS_DEBUG_LIBRARY_DIR
+ ENV OPENTHREADS_LIBRARY_DIR
+ ENV OPENTHREADS_DIR
+ ENV OSG_LIBRARY_DIR
+ ENV OSG_DIR
+ ENV OSGDIR
+ ENV OpenThreads_ROOT
+ ENV OSG_ROOT
+ ${OPENTHREADS_DIR}
+ ${OSG_DIR}
PATHS
/sw
/opt/local
diff --cc Modules/Findosg_functions.cmake
index e65e858,3a8a0f5..2e90837
--- a/Modules/Findosg_functions.cmake
+++ b/Modules/Findosg_functions.cmake
@@@ -27,12 -26,10 +27,12 @@@ function(OSG_FIND_PATH module header
# Try the user's environment request before anything else.
find_path(${module_uc}_INCLUDE_DIR ${header}
HINTS
- $ENV{${module_uc}_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
- $ENV{OSG_ROOT}
+ ENV ${module_uc}_DIR
+ ENV OSG_DIR
+ ENV OSGDIR
+ ENV OSG_ROOT
+ ${${module_uc}_DIR}
+ ${OSG_DIR}
PATH_SUFFIXES include
PATHS
/sw # Fink
@@@ -53,13 -50,11 +53,13 @@@ function(OSG_FIND_LIBRARY module librar
find_library(${module_uc}_LIBRARY
NAMES ${library}
HINTS
- $ENV{${module_uc}_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
- $ENV{OSG_ROOT}
+ ENV ${module_uc}_DIR
+ ENV OSG_DIR
+ ENV OSGDIR
+ ENV OSG_ROOT
+ ${${module_uc}_DIR}
+ ${OSG_DIR}
- PATH_SUFFIXES lib64 lib
+ PATH_SUFFIXES lib
PATHS
/sw # Fink
/opt/local # DarwinPorts
@@@ -71,13 -66,11 +71,13 @@@
find_library(${module_uc}_LIBRARY_DEBUG
NAMES ${library}d
HINTS
- $ENV{${module_uc}_DIR}
- $ENV{OSG_DIR}
- $ENV{OSGDIR}
- $ENV{OSG_ROOT}
+ ENV ${module_uc}_DIR
+ ENV OSG_DIR
+ ENV OSGDIR
+ ENV OSG_ROOT
+ ${${module_uc}_DIR}
+ ${OSG_DIR}
- PATH_SUFFIXES lib64 lib
+ PATH_SUFFIXES lib
PATHS
/sw # Fink
/opt/local # DarwinPorts
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=224b5dea785d20a9054a2b7fb9e737c106084879
commit 224b5dea785d20a9054a2b7fb9e737c106084879
Author: Philip Lowman <philip at yhbt.com>
AuthorDate: Sat Aug 18 16:46:08 2012 -0400
Commit: Philip Lowman <philip at yhbt.com>
CommitDate: Sat Aug 18 16:46:08 2012 -0400
FindOpenSceneGraph: CMake variable OSG_DIR influences detection now too
diff --git a/Modules/FindOpenSceneGraph.cmake b/Modules/FindOpenSceneGraph.cmake
index 17ab057..2e6774e 100644
--- a/Modules/FindOpenSceneGraph.cmake
+++ b/Modules/FindOpenSceneGraph.cmake
@@ -26,6 +26,10 @@
# OSGDIR
# 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:
#
# OPENSCENEGRAPH_FOUND - Was the OSG and all of the specified components found?
@@ -49,7 +53,7 @@
#=============================================================================
# Copyright 2009 Kitware, Inc.
-# Copyright 2009 Philip Lowman <philip at yhbt.com>
+# Copyright 2009-2012 Philip Lowman <philip at yhbt.com>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
diff --git a/Modules/FindOpenThreads.cmake b/Modules/FindOpenThreads.cmake
index 4f6e920..7668107 100644
--- a/Modules/FindOpenThreads.cmake
+++ b/Modules/FindOpenThreads.cmake
@@ -15,10 +15,15 @@
# correspond to the ./configure --prefix=$OPENTHREADS_DIR
# 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.
#=============================================================================
# Copyright 2007-2009 Kitware, Inc.
+# Copyright 2012 Philip Lowman <philip at yhbt.com>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -53,7 +58,6 @@
find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
HINTS
- # enough environment variables?
$ENV{OPENTHREADS_INCLUDE_DIR}
$ENV{OPENTHREADS_DIR}
$ENV{OSG_INCLUDE_DIR}
@@ -61,6 +65,8 @@ find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
$ENV{OSGDIR}
$ENV{OpenThreads_ROOT}
$ENV{OSG_ROOT}
+ ${OPENTHREADS_DIR}
+ ${OSG_DIR}
PATHS
/sw # Fink
/opt/local # DarwinPorts
@@ -81,6 +87,8 @@ find_library(OPENTHREADS_LIBRARY
$ENV{OSGDIR}
$ENV{OpenThreads_ROOT}
$ENV{OSG_ROOT}
+ ${OPENTHREADS_DIR}
+ ${OSG_DIR}
PATHS
/sw
/opt/local
@@ -101,6 +109,8 @@ find_library(OPENTHREADS_LIBRARY_DEBUG
$ENV{OSGDIR}
$ENV{OpenThreads_ROOT}
$ENV{OSG_ROOT}
+ ${OPENTHREADS_DIR}
+ ${OSG_DIR}
PATHS
/sw
/opt/local
diff --git a/Modules/Findosg_functions.cmake b/Modules/Findosg_functions.cmake
index 30c0876..e65e858 100644
--- a/Modules/Findosg_functions.cmake
+++ b/Modules/Findosg_functions.cmake
@@ -1,11 +1,12 @@
#
# 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 Philip Lowman <philip at yhbt.com>
+# Copyright 2009-2012 Philip Lowman <philip at yhbt.com>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -30,6 +31,8 @@ function(OSG_FIND_PATH module header)
$ENV{OSG_DIR}
$ENV{OSGDIR}
$ENV{OSG_ROOT}
+ ${${module_uc}_DIR}
+ ${OSG_DIR}
PATH_SUFFIXES include
PATHS
/sw # Fink
@@ -54,6 +57,8 @@ function(OSG_FIND_LIBRARY module library)
$ENV{OSG_DIR}
$ENV{OSGDIR}
$ENV{OSG_ROOT}
+ ${${module_uc}_DIR}
+ ${OSG_DIR}
PATH_SUFFIXES lib64 lib
PATHS
/sw # Fink
@@ -70,6 +75,8 @@ function(OSG_FIND_LIBRARY module library)
$ENV{OSG_DIR}
$ENV{OSGDIR}
$ENV{OSG_ROOT}
+ ${${module_uc}_DIR}
+ ${OSG_DIR}
PATH_SUFFIXES lib64 lib
PATHS
/sw # Fink
-----------------------------------------------------------------------
Summary of changes:
Modules/FindOpenSceneGraph.cmake | 6 +++++-
Modules/FindOpenThreads.cmake | 12 +++++++++++-
Modules/Findosg_functions.cmake | 11 +++++++++--
3 files changed, 25 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list