[Cmake-commits] [cmake-commits] hoffman committed CPack.OSXX11.Info.plist.in 1.1 1.1.12.1 CPack.RuntimeScript.in 1.2.12.2 1.2.12.3 CPack.cmake 1.35.2.4 1.35.2.5 FindBoost.cmake 1.4.2.8 1.4.2.9 FindCxxTest.cmake NONE 1.2.2.2 FindDevIL.cmake NONE 1.2.2.2 FindDoxygen.cmake 1.14.12.1 1.14.12.2 FindFLTK.cmake 1.36.14.1 1.36.14.2 FindKDE3.cmake 1.10.2.4 1.10.2.5 FindKDE4.cmake 1.10.2.5 1.10.2.6 FindOpenMP.cmake NONE 1.2.2.2 FindOpenThreads.cmake 1.2.2.1 1.2.2.2 FindQt4.cmake 1.96.2.18 1.96.2.19 FindRTI.cmake NONE 1.3.2.2 Findosg.cmake 1.2.2.1 1.2.2.2 FindosgAnimation.cmake NONE 1.2.2.2 FindosgDB.cmake 1.2.2.1 1.2.2.2 FindosgFX.cmake 1.2.2.1 1.2.2.2 FindosgGA.cmake 1.2.2.1 1.2.2.2 FindosgIntrospection.cmake 1.2.2.1 1.2.2.2 FindosgManipulator.cmake 1.2.2.1 1.2.2.2 FindosgParticle.cmake 1.2.2.1 1.2.2.2 FindosgProducer.cmake 1.2.2.1 1.2.2.2 FindosgShadow.cmake 1.2.2.1 1.2.2.2 FindosgSim.cmake 1.2.2.1 1.2.2.2 FindosgTerrain.cmake 1.2.2.1 1.2.2.2 FindosgText.cmake 1.2.2.1 1.2.2.2 FindosgUtil.cmake 1.2.2.1 1.2.2.2 FindosgViewer.cmake 1.2.2.1 1.2.2.2 FindosgVolume.cmake NONE 1.2.2.2 FindosgWidget.cmake NONE 1.2.2.2 Findosg_functions.cmake NONE 1.4.2.2 UseQt4.cmake 1.13.2.3 1.13.2.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Feb 4 11:44:18 EST 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv32179/Modules
Modified Files:
Tag: CMake-2-6
CPack.OSXX11.Info.plist.in CPack.RuntimeScript.in CPack.cmake
FindBoost.cmake FindDoxygen.cmake FindFLTK.cmake
FindKDE3.cmake FindKDE4.cmake FindOpenThreads.cmake
FindQt4.cmake Findosg.cmake FindosgDB.cmake FindosgFX.cmake
FindosgGA.cmake FindosgIntrospection.cmake
FindosgManipulator.cmake FindosgParticle.cmake
FindosgProducer.cmake FindosgShadow.cmake FindosgSim.cmake
FindosgTerrain.cmake FindosgText.cmake FindosgUtil.cmake
FindosgViewer.cmake UseQt4.cmake
Added Files:
Tag: CMake-2-6
FindCxxTest.cmake FindDevIL.cmake FindOpenMP.cmake
FindRTI.cmake FindosgAnimation.cmake FindosgVolume.cmake
FindosgWidget.cmake Findosg_functions.cmake
Log Message:
ENH: merge in changes to 2.6 RC 10
--- NEW FILE: FindDevIL.cmake ---
# This module locates the developer's image library.
# http://openil.sourceforge.net/
#
# This module sets:
# IL_LIBRARY the name of the IL library.
# ILU_LIBRARY the name of the ILU library.
# ILUT_LIBRARY the name of the ILUT library.
# IL_INCLUDE_DIR where to find the il.h, ilu.h and ilut.h files.
# IL_FOUND this is set to TRUE if all the above variables were set.
# Original file by: Christopher Harvey
# TODO: Add version support.
# Tested under Linux and Windows (MSVC)
INCLUDE(FindPackageHandleStandardArgs)
FIND_PATH(IL_INCLUDE_DIR il.h
PATH_SUFFIXES include IL
DOC "The path the the directory that contains il.h"
)
#MESSAGE("IL_INCLUDE_DIR is ${IL_INCLUDE_DIR}")
FIND_LIBRARY(IL_LIBRARY
NAMES IL
PATH_SUFFIXES lib64 lib lib32
DOC "The file that corresponds to the base il library."
)
#MESSAGE("IL_LIBRARY is ${IL_LIBRARY}")
FIND_LIBRARY(ILUT_LIBRARY
NAMES ILUT
PATH_SUFFIXES lib64 lib lib32
DOC "The file that corresponds to the il (system?) utility library."
)
#MESSAGE("ILUT_LIBRARY is ${ILUT_LIBRARY}")
FIND_LIBRARY(ILU_LIBRARY
NAMES ILU
PATH_SUFFIXES lib64 lib lib32
DOC "The file that corresponds to the il utility library."
)
#MESSAGE("ILU_LIBRARY is ${ILU_LIBRARY}")
FIND_PACKAGE_HANDLE_STANDARD_ARGS(IL DEFAULT_MSG
IL_LIBRARY ILU_LIBRARY
ILUT_LIBRARY IL_INCLUDE_DIR)
--- NEW FILE: FindRTI.cmake ---
# - Try to find M&S HLA RTI libraries
# This module finds if any HLA RTI is installed and locates the standard RTI
# include files and libraries.
#
# RTI is a simulation infrastructure standartized by IEEE and SISO. It has a
# well defined C++ API that assures that simulation applications are
# independent on a particular RTI implementation.
# http://en.wikipedia.org/wiki/Run-Time_Infrastructure_(simulation)
#
# This code sets the following variables:
# RTI_INCLUDE_DIR = the directory where RTI includes file are found
# RTI_LIBRARIES = The libraries to link against to use RTI
# RTI_DEFINITIONS = -DRTI_USES_STD_FSTREAM
# RTI_FOUND = Set to FALSE if any HLA RTI was not found
#
# Report problems to <certi-devel at nongnu.org>
MACRO(RTI_MESSAGE_QUIETLY QUIET TYPE MSG)
IF(NOT ${QUIET})
MESSAGE(${TYPE} "${MSG}")
ENDIF(NOT ${QUIET})
ENDMACRO(RTI_MESSAGE_QUIETLY QUIET TYPE MSG)
# Detect the CERTI installation, http://www.cert.fr/CERTI
IF ("$ENV{CERTI_HOME}" STRGREATER "")
FILE(TO_CMAKE_PATH "$ENV{CERTI_HOME}" CERTI_HOME)
RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "Using environment defined CERTI_HOME: ${CERTI_HOME}")
ENDIF ("$ENV{CERTI_HOME}" STRGREATER "")
SET(RTI_DEFINITIONS "-DRTI_USES_STD_FSTREAM")
# Detect the MAK Technologies RTI installation, http://www.mak.com/products/rti.php
# note: the following list is ordered to find the most recent version first
SET(RTI_POSSIBLE_DIRS
${CERTI_HOME}
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 3.2 MSVC++ 8.0;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MAK RTI 3.2-win32-msvc++8.0;InstallLocation]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 2.2;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MAK RTI 2.2;InstallLocation]")
SET(RTI_OLD_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}")
# The MAK RTI has the "lib" prefix even on Windows.
SET(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
FIND_LIBRARY(RTI_LIBRARY
NAMES RTI RTI-NG
PATHS ${RTI_POSSIBLE_DIRS}
PATH_SUFFIXES lib
DOC "The RTI Library")
IF (RTI_LIBRARY)
SET(RTI_LIBRARIES ${RTI_LIBRARY})
RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI library found: ${RTI_LIBRARY}")
ELSE (RTI_LIBRARY)
RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI library NOT found")
ENDIF (RTI_LIBRARY)
FIND_LIBRARY(RTI_FEDTIME_LIBRARY
NAMES FedTime
PATHS ${RTI_POSSIBLE_DIRS}
PATH_SUFFIXES lib
DOC "The FedTime Library")
IF (RTI_FEDTIME_LIBRARY)
SET(RTI_LIBRARIES ${RTI_LIBRARIES} ${RTI_FEDTIME_LIBRARY})
RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI FedTime found: ${RTI_FEDTIME_LIBRARY}")
ENDIF (RTI_FEDTIME_LIBRARY)
FIND_PATH(RTI_INCLUDE_DIR
NAMES RTI.hh
PATHS ${RTI_POSSIBLE_DIRS}
PATH_SUFFIXES include
DOC "The RTI Include Files")
IF (RTI_INCLUDE_DIR)
RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI headers found: ${RTI_INCLUDE_DIR}")
ELSE (RTI_INCLUDE_DIR)
RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI headers NOT found")
ENDIF (RTI_INCLUDE_DIR)
# Set the modified system variables back to the original value.
SET(CMAKE_FIND_LIBRARY_PREFIXES "${RTI_OLD_FIND_LIBRARY_PREFIXES}")
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(RTI DEFAULT_MSG
RTI_LIBRARY RTI_INCLUDE_DIR)
# $Id: FindRTI.cmake,v 1.3.2.2 2009-02-04 16:44:12 hoffman Exp $
Index: CPack.OSXX11.Info.plist.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.OSXX11.Info.plist.in,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -C 2 -d -r1.1 -r1.1.12.1
*** CPack.OSXX11.Info.plist.in 10 Jan 2007 20:30:25 -0000 1.1
--- CPack.OSXX11.Info.plist.in 4 Feb 2009 16:44:01 -0000 1.1.12.1
***************
*** 5,8 ****
--- 5,21 ----
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
+ <key>CFBundleDocumentTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>@CPACK_FILE_ASSOCIATION_EXTENSION@</string>
+ </array>
+ <key>CFBundleTypeName</key>
+ <string>@CPACK_FILE_ASSOCIATION_TYPE@</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ </dict>
+ </array>
<key>CFBundleExecutable</key>
<string>@CPACK_PACKAGE_FILE_NAME@</string>
Index: FindosgFX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgFX.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgFX.cmake 13 Jun 2008 12:55:16 -0000 1.2.2.1
--- FindosgFX.cmake 4 Feb 2009 16:44:13 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osgFX
# This module defines
! # OSGFX_LIBRARY
! # OSGFX_FOUND, if false, do not try to link to osgFX
! # OSGFX_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osgFX
# This module defines
! #
! # OSGFX_FOUND - Was osgFX found?
! # OSGFX_INCLUDE_DIR - Where to find the headers
! # OSGFX_LIBRARIES - The libraries to link against for the osgFX (use this)
! #
! # OSGFX_LIBRARY - The osgFX library
! # OSGFX_LIBRARY_DEBUG - The osgFX debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgFX/BumpMapping>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGFX_INCLUDE_DIR osgFX/BumpMapping
! HINTS
! $ENV{OSGFX_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGFX_LIBRARY
! NAMES osgFX
! HINTS
! $ENV{OSGFX_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGFX_FOUND "NO")
! IF(OSGFX_LIBRARY AND OSGFX_INCLUDE_DIR)
! SET(OSGFX_FOUND "YES")
! ENDIF(OSGFX_LIBRARY AND OSGFX_INCLUDE_DIR)
--- 30,38 ----
# #include <osgFX/BumpMapping>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGFX osgFX/BumpMapping)
! OSG_FIND_LIBRARY(OSGFX osgFX)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGFX DEFAULT_MSG
+ OSGFX_LIBRARY OSGFX_INCLUDE_DIR)
Index: Findosg.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Findosg.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** Findosg.cmake 13 Jun 2008 12:55:15 -0000 1.2.2.1
--- Findosg.cmake 4 Feb 2009 16:44:12 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osg
# This module defines
! # OSG_LIBRARY
! # OSG_FOUND, if false, do not try to link to osg
! # OSG_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osg
# This module defines
! #
! # OSG_FOUND - Was the Osg found?
! # OSG_INCLUDE_DIR - Where to find the headers
! # OSG_LIBRARIES - The libraries to link against for the OSG (use this)
! #
! # OSG_LIBRARY - The OSG library
! # OSG_LIBRARY_DEBUG - The OSG debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,68 ****
# #include <osgUtil/SceneView>
! # Try the user's environment request before anything else.
! FIND_PATH(OSG_INCLUDE_DIR osg/PositionAttitudeTransform
! HINTS
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSG_LIBRARY
! NAMES osg
! HINTS
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSG_FOUND "NO")
! IF(OSG_LIBRARY AND OSG_INCLUDE_DIR)
! SET(OSG_FOUND "YES")
! ENDIF(OSG_LIBRARY AND OSG_INCLUDE_DIR)
--- 30,37 ----
# #include <osgUtil/SceneView>
! include(Findosg_functions)
! OSG_FIND_PATH (OSG osg/PositionAttitudeTransform)
! OSG_FIND_LIBRARY(OSG osg)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSG DEFAULT_MSG OSG_LIBRARY OSG_INCLUDE_DIR)
Index: FindosgGA.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgGA.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgGA.cmake 13 Jun 2008 12:55:16 -0000 1.2.2.1
--- FindosgGA.cmake 4 Feb 2009 16:44:13 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osgGA
# This module defines
! # OSGGA_LIBRARY
! # OSGGA_FOUND, if false, do not try to link to osgGA
! # OSGGA_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osgGA
# This module defines
! #
! # OSGGA_FOUND - Was osgGA found?
! # OSGGA_INCLUDE_DIR - Where to find the headers
! # OSGGA_LIBRARIES - The libraries to link against for the osgGA (use this)
! #
! # OSGGA_LIBRARY - The osgGA library
! # OSGGA_LIBRARY_DEBUG - The osgGA debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgGA/FlightManipulator>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGGA_INCLUDE_DIR osgGA/FlightManipulator
! HINTS
! $ENV{OSGGA_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGGA_LIBRARY
! NAMES osgGA
! HINTS
! $ENV{OSGGA_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGGA_FOUND "NO")
! IF(OSGGA_LIBRARY AND OSGGA_INCLUDE_DIR)
! SET(OSGGA_FOUND "YES")
! ENDIF(OSGGA_LIBRARY AND OSGGA_INCLUDE_DIR)
--- 30,38 ----
# #include <osgGA/FlightManipulator>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGGA osgGA/FlightManipulator)
! OSG_FIND_LIBRARY(OSGGA osgGA)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGGA DEFAULT_MSG
+ OSGGA_LIBRARY OSGGA_INCLUDE_DIR)
Index: FindOpenThreads.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenThreads.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindOpenThreads.cmake 13 Jun 2008 12:55:15 -0000 1.2.2.1
--- FindOpenThreads.cmake 4 Feb 2009 16:44:02 -0000 1.2.2.2
***************
*** 39,43 ****
# Explicit -DVAR=value arguments should still be able to override everything.
! FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
HINTS
$ENV{OPENTHREADS_INCLUDE_DIR}
--- 39,43 ----
# Explicit -DVAR=value arguments should still be able to override everything.
! find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
HINTS
$ENV{OPENTHREADS_INCLUDE_DIR}
***************
*** 63,67 ****
! FIND_LIBRARY(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32
HINTS
--- 63,67 ----
! find_library(OPENTHREADS_LIBRARY
NAMES OpenThreads OpenThreadsWin32
HINTS
***************
*** 96,101 ****
)
!
! FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
NAMES OpenThreadsd OpenThreadsWin32d
HINTS
--- 96,100 ----
)
! find_library(OPENTHREADS_LIBRARY_DEBUG
NAMES OpenThreadsd OpenThreadsWin32d
HINTS
***************
*** 129,145 ****
)
! IF(OPENTHREADS_LIBRARY)
! IF(NOT OPENTHREADS_LIBRARY_DEBUG)
! #MESSAGE("-- Warning Debug OpenThreads not found, using: ${OPENTHREADS_LIBRARY}")
! #SET(OPENTHREADS_LIBRARY_DEBUG "${OPENTHREADS_LIBRARY}")
! SET(OPENTHREADS_LIBRARY_DEBUG "${OPENTHREADS_LIBRARY}" CACHE FILEPATH "Debug version of OpenThreads Library (use regular version if not available)" FORCE)
! ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)
! ENDIF(OPENTHREADS_LIBRARY)
!
! SET(OPENTHREADS_FOUND "NO")
! IF(OPENTHREADS_INCLUDE_DIR AND OPENTHREADS_LIBRARY)
! SET(OPENTHREADS_FOUND "YES")
! # MESSAGE("-- Found OpenThreads: "${OPENTHREADS_LIBRARY})
! ENDIF(OPENTHREADS_INCLUDE_DIR AND OPENTHREADS_LIBRARY)
!
--- 128,141 ----
)
+ if(OPENTHREADS_LIBRARY_DEBUG)
+ set(OPENTHREADS_LIBRARIES
+ optimized ${OPENTHREADS_LIBRARY}
+ debug ${OPENTHREADS_LIBRARY_DEBUG})
+ else()
+ set(OPENTHREADS_LIBRARY_DEBUG ${OPENTHREADS_LIBRARY})
+ set(OPENTHREADS_LIBRARIES ${OPENTHREADS_LIBRARY})
+ endif()
! include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENTHREADS DEFAULT_MSG
! OPENTHREADS_LIBRARY OPENTHREADS_INCLUDE_DIR)
--- NEW FILE: FindOpenMP.cmake ---
# - Finds OpenMP support
# This module can be used to detect OpenMP support in a compiler.
# If the compiler supports OpenMP, the flags required to compile with
# openmp support are set.
#
# The following variables are set:
# OpenMP_C_FLAGS - flags to add to the C compiler for OpenMP support
# OpenMP_CXX_FLAGS - flags to add to the CXX compiler for OpenMP support
# OPENMP_FOUND - true if openmp is detected
#
# Supported compilers can be found at http://openmp.org/wp/openmp-compilers/
# Copyright 2008, 2009 <André Rigland Brodtkorb> Andre.Brodtkorb at ifi.uio.no
#
# Redistribution AND use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
include(CheckCSourceCompiles)
include(CheckCXXSourceCompiles)
include(FindPackageHandleStandardArgs)
set(OpenMP_C_FLAG_CANDIDATES
#Gnu
"-fopenmp"
#Microsoft Visual Studio
"/openmp"
#Intel windows
"-Qopenmp"
#Intel
"-openmp"
#Empty, if compiler automatically accepts openmp
" "
#Sun
"-xopenmp"
#HP
"+Oopenmp"
#IBM XL C/c++
"-qsmp"
#Portland Group
"-mp"
)
set(OpenMP_CXX_FLAG_CANDIDATES ${OpenMP_C_FLAG_CANDIDATES})
# sample openmp source code to test
set(OpenMP_C_TEST_SOURCE
"
#include <omp.h>
int main() {
#ifdef _OPENMP
return 0;
#else
breaks_on_purpose
#endif
}
")
# use the same source for CXX as C for now
set(OpenMP_CXX_TEST_SOURCE ${OpenMP_C_TEST_SOURCE})
# if these are set then do not try to find them again,
# by avoiding any try_compiles for the flags
if(DEFINED OpenMP_C_FLAGS AND DEFINED OpenMP_CXX_FLAGS)
set(OpenMP_C_FLAG_CANDIDATES)
set(OpenMP_CXX_FLAG_CANDIDATES)
endif(DEFINED OpenMP_C_FLAGS AND DEFINED OpenMP_CXX_FLAGS)
# check c compiler
foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
set(CMAKE_REQUIRED_FLAGS "${FLAG}")
unset(OpenMP_FLAG_DETECTED CACHE)
message(STATUS "Try OpenMP C flag = [${FLAG}]")
check_c_source_compiles("${OpenMP_CXX_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
if(OpenMP_FLAG_DETECTED)
set(OpenMP_C_FLAGS_INTERNAL "${FLAG}")
break()
endif(OpenMP_FLAG_DETECTED)
endforeach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
# check cxx compiler
foreach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
set(CMAKE_REQUIRED_FLAGS "${FLAG}")
unset(OpenMP_FLAG_DETECTED CACHE)
message(STATUS "Try OpenMP CXX flag = [${FLAG}]")
check_cxx_source_compiles("${OpenMP_C_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
if(OpenMP_FLAG_DETECTED)
set(OpenMP_CXX_FLAGS_INTERNAL "${FLAG}")
break()
endif(OpenMP_FLAG_DETECTED)
endforeach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
set(OpenMP_C_FLAGS "${OpenMP_C_FLAGS_INTERNAL}"
CACHE STRING "C compiler flags for OpenMP parallization")
set(OpenMP_CXX_FLAGS "${OpenMP_CXX_FLAGS_INTERNAL}"
CACHE STRING "C++ compiler flags for OpenMP parallization")
# handle the standard arguments for find_package
find_package_handle_standard_args(OpenMP DEFAULT_MSG
OpenMP_C_FLAGS OpenMP_CXX_FLAGS )
mark_as_advanced(
OpenMP_C_FLAGS
OpenMP_CXX_FLAGS
)
--- NEW FILE: FindCxxTest.cmake ---
# - Find CxxTest
# Find the CxxTest suite and declare a helper macro for creating unit tests
# and integrating them with CTest.
# For more details on CxxTest see http://cxxtest.tigris.org
#
# INPUT Variables
#
# CXXTEST_USE_PYTHON
# If true, the CXXTEST_ADD_TEST macro will use
# the Python test generator instead of Perl.
#
# OUTPUT Variables
#
# CXXTEST_FOUND
# True if the CxxTest framework was found
# CXXTEST_INCLUDE_DIR
# Where to find the CxxTest include directory
# CXXTEST_PERL_TESTGEN_EXECUTABLE
# The perl-based test generator.
# CXXTEST_PYTHON_TESTGEN_EXECUTABLE
# The python-based test generator.
#
# MACROS for use by CMake users:
#
# CXXTEST_ADD_TEST(<test_name> <gen_source_file> <input_files_to_testgen...>)
# Creates a CxxTest runner and adds it to the CTest testing suite
# Parameters:
# test_name The name of the test
# gen_source_file The generated source filename to be generated by CxxTest
# input_files_to_testgen The list of header files containing the
# CxxTest::TestSuite's to be included in this runner
#
# #==============
# Example Usage:
#
# FIND_PACKAGE(CxxTest)
# INCLUDE_DIRECTORIES(${CXXTEST_INCLUDE_DIR})
#
# ENABLE_TESTING()
# CXXTEST_ADD_TEST(unittest_foo foo_test.cc ${CMAKE_CURRENT_SOURCE_DIR}/foo_test.h)
#
# This will:
# 1. Invoke the testgen executable to autogenerate foo_test.cc in the
# binary tree from "foo_test.h" in the current source directory.
# 2. Create an executable and test called unittest_foo.
#
# #=============
# Example foo_test.h:
#
# #include <cxxtest/TestSuite.h>
#
# class MyTestSuite : public CxxTest::TestSuite
# {
# public:
# void testAddition( void )
# {
# TS_ASSERT( 1 + 1 > 1 );
# TS_ASSERT_EQUALS( 1 + 1, 2 );
# }
# };
#
#
# FindCxxTest.cmake
# Copyright (c) 2008
# Philip Lowman <philip at yhbt.com>
#
# Version 1.0 (1/8/08)
# Fixed CXXTEST_INCLUDE_DIRS so it will work properly
# Eliminated superfluous CXXTEST_FOUND assignment
# Cleaned up and added more documentation
#=============================================================
# CXXTEST_ADD_TEST (public macro)
#=============================================================
MACRO(CXXTEST_ADD_TEST _cxxtest_testname _cxxtest_outfname)
SET(_cxxtest_real_outfname ${CMAKE_CURRENT_BINARY_DIR}/${_cxxtest_outfname})
IF(CXXTEST_USE_PYTHON)
SET(_cxxtest_executable ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE})
ELSE()
SET(_cxxtest_executable ${CXXTEST_PERL_TESTGEN_EXECUTABLE})
ENDIF()
ADD_CUSTOM_COMMAND(
OUTPUT ${_cxxtest_real_outfname}
DEPENDS ${ARGN}
COMMAND ${_cxxtest_executable}
--error-printer -o ${_cxxtest_real_outfname} ${ARGN}
)
SET_SOURCE_FILES_PROPERTIES(${_cxxtest_real_outfname} PROPERTIES GENERATED true)
ADD_EXECUTABLE(${_cxxtest_testname} ${_cxxtest_real_outfname})
IF(CMAKE_RUNTIME_OUTPUT_DIRECTORY)
ADD_TEST(${_cxxtest_testname} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_cxxtest_testname})
ELSEIF(EXECUTABLE_OUTPUT_PATH)
ADD_TEST(${_cxxtest_testname} ${EXECUTABLE_OUTPUT_PATH}/${_cxxtest_testname})
ELSE()
ADD_TEST(${_cxxtest_testname} ${CMAKE_CURRENT_BINARY_DIR}/${_cxxtest_testname})
ENDIF()
ENDMACRO(CXXTEST_ADD_TEST)
#=============================================================
# main()
#=============================================================
FIND_PATH(CXXTEST_INCLUDE_DIR cxxtest/TestSuite.h)
FIND_PROGRAM(CXXTEST_PERL_TESTGEN_EXECUTABLE cxxtestgen.pl)
FIND_PROGRAM(CXXTEST_PYTHON_TESTGEN_EXECUTABLE cxxtestgen.py)
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(CxxTest DEFAULT_MSG CXXTEST_INCLUDE_DIR)
SET(CXXTEST_INCLUDE_DIRS ${CXXTEST_INCLUDE_DIR})
Index: FindosgShadow.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgShadow.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgShadow.cmake 13 Jun 2008 12:55:16 -0000 1.2.2.1
--- FindosgShadow.cmake 4 Feb 2009 16:44:13 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osgShadow
# This module defines
! # OSGSHADOW_LIBRARY
! # OSGSHADOW_FOUND, if false, do not try to link to osgShadow
! # OSGSHADOW_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osgShadow
# This module defines
! #
! # OSGSHADOW_FOUND - Was osgShadow found?
! # OSGSHADOW_INCLUDE_DIR - Where to find the headers
! # OSGSHADOW_LIBRARIES - The libraries to link for osgShadow (use this)
! #
! # OSGSHADOW_LIBRARY - The osgShadow library
! # OSGSHADOW_LIBRARY_DEBUG - The osgShadow debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgShadow/ShadowTexture>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGSHADOW_INCLUDE_DIR osgShadow/ShadowTexture
! HINTS
! $ENV{OSGSHADOW_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGSHADOW_LIBRARY
! NAMES osgShadow
! HINTS
! $ENV{OSGSHADOW_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGSHADOW_FOUND "NO")
! IF(OSGSHADOW_LIBRARY AND OSGSHADOW_INCLUDE_DIR)
! SET(OSGSHADOW_FOUND "YES")
! ENDIF(OSGSHADOW_LIBRARY AND OSGSHADOW_INCLUDE_DIR)
--- 30,38 ----
# #include <osgShadow/ShadowTexture>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGSHADOW osgShadow/ShadowTexture)
! OSG_FIND_LIBRARY(OSGSHADOW osgShadow)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGSHADOW DEFAULT_MSG
+ OSGSHADOW_LIBRARY OSGSHADOW_INCLUDE_DIR)
Index: FindosgDB.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgDB.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgDB.cmake 13 Jun 2008 12:55:15 -0000 1.2.2.1
--- FindosgDB.cmake 4 Feb 2009 16:44:13 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osgDB
# This module defines
! # OSGDB_LIBRARY
! # OSGDB_FOUND, if false, do not try to link to osgDB
! # OSGDB_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osgDB
# This module defines
! #
! # OSGDB_FOUND - Was osgDB found?
! # OSGDB_INCLUDE_DIR - Where to find the headers
! # OSGDB_LIBRARIES - The libraries to link against for the osgDB (use this)
! #
! # OSGDB_LIBRARY - The osgDB library
! # OSGDB_LIBRARY_DEBUG - The osgDB debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgDB/DatabasePager>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGDB_INCLUDE_DIR osgDB/DatabasePager
! HINTS
! $ENV{OSGDB_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGDB_LIBRARY
! NAMES osgDB
! HINTS
! $ENV{OSGDB_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGDB_FOUND "NO")
! IF(OSGDB_LIBRARY AND OSGDB_INCLUDE_DIR)
! SET(OSGDB_FOUND "YES")
! ENDIF(OSGDB_LIBRARY AND OSGDB_INCLUDE_DIR)
--- 30,38 ----
# #include <osgDB/DatabasePager>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGDB osgDB/DatabasePager)
! OSG_FIND_LIBRARY(OSGDB osgDB)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGDB DEFAULT_MSG
+ OSGDB_LIBRARY OSGDB_INCLUDE_DIR)
Index: CPack.RuntimeScript.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.RuntimeScript.in,v
retrieving revision 1.2.12.2
retrieving revision 1.2.12.3
diff -C 2 -d -r1.2.12.2 -r1.2.12.3
*** CPack.RuntimeScript.in 13 Jun 2008 12:55:14 -0000 1.2.12.2
--- CPack.RuntimeScript.in 4 Feb 2009 16:44:01 -0000 1.2.12.3
***************
*** 7,10 ****
--- 7,30 ----
version=`sw_vers -productVersion`
+ if [ "$?" == "0" ]; then
+ major=${version%%\.*}
+ rest=${version#*\.}
+ minor=${rest%%\.*}
+ build=${rest#*\.}
+ else
+ major=10
+ minor=4
+ build=0
+ fi
+
+ echo $version
+ echo "Major = $major"
+ echo "Minor = $minor"
+ echo "Build = $build"
+
+
+ # if 10.5 or greater, then all the open-x11 stuff need not occur
+ if ((( $major < 10 )) || ((( $major == 10)) && (( $minor < 5 )))); then
+ version=`sw_vers -productVersion`
if [ "$?" = "0" ]; then
major=${version%%\.*}
***************
*** 43,46 ****
--- 63,67 ----
fi
__END_OF_GETDISPLAY_SCRIPT__
+ fi
chmod +x "$TMP/getdisplay.sh"
rm -f $TMP/display
Index: FindDoxygen.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindDoxygen.cmake,v
retrieving revision 1.14.12.1
retrieving revision 1.14.12.2
diff -C 2 -d -r1.14.12.1 -r1.14.12.2
*** FindDoxygen.cmake 31 Dec 2008 15:14:19 -0000 1.14.12.1
--- FindDoxygen.cmake 4 Feb 2009 16:44:01 -0000 1.14.12.2
***************
*** 1,103 ****
# - This module looks for Doxygen and the path to Graphviz's dot
! # Doxygen is a documentation generation tool see http://www.doxygen.org
! # With the OS X GUI version, it likes to be installed to /Applications and
! # it contains the doxygen executable in the bundle. In the versions I've
! # seen, it is located in Resources, but in general, more often binaries are
! # located in MacOS. This code sets the following variables:
! # DOXYGEN_EXECUTABLE = The path to the doxygen command.
! # DOXYGEN_DOT_EXECUTABLE = The path to the dot program used by doxygen.
! # DOXYGEN_DOT_PATH = The path to dot not including the executable
! # DOXYGEN = same as DOXYGEN_EXECUTABLE for backwards compatibility
! # DOT = same as DOXYGEN_DOT_EXECUTABLE for backwards compatibility
- # The official Doxygen.app that is distributed for OS X uses non-standard
- # conventions. Instead of the command-line "doxygen" tool being placed in
- # Doxygen.app/Contents/MacOS, "Doxywizard" is placed there instead and
- # "doxygen" is actually placed in Contents/Resources. This is most likely
- # to accomodate people who double-click on the Doxygen.app package and expect
- # to see something happen. However, the CMake backend gets horribly confused
- # by this. Once CMake sees the bundle, it indiscrimately uses Doxywizard
- # as the executable to use. The only work-around I have found is to disable
- # the app-bundle feature for only this command.
- # Save the old setting
- SET(TEMP_DOXYGEN_SAVE_CMAKE_FIND_APPBUNDLE ${CMAKE_FIND_APPBUNDLE})
- # Disable the App-bundle detection feature
- SET(CMAKE_FIND_APPBUNDLE "NEVER")
# For backwards compatibility support
- # DOXYGEN_FIND_QUIETLY, but it should have been
- # Doxygen_FIND_QUIETLY.
IF(Doxygen_FIND_QUIETLY)
SET(DOXYGEN_FIND_QUIETLY TRUE)
ENDIF(Doxygen_FIND_QUIETLY)
! IF (NOT DOXYGEN_FIND_QUIETLY)
! MESSAGE(STATUS "Looking for doxygen...")
! ENDIF (NOT DOXYGEN_FIND_QUIETLY)
FIND_PROGRAM(DOXYGEN_EXECUTABLE
NAMES doxygen
! PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\doxygen_is1;Inno Setup: App Path]/bin"
! /Applications/Doxygen.app/Contents/Resources
! /Applications/Doxygen.app/Contents/MacOS
DOC "Doxygen documentation generation tool (http://www.doxygen.org)"
)
! IF (DOXYGEN_EXECUTABLE)
! SET (DOXYGEN_FOUND "YES")
! IF (NOT DOXYGEN_FIND_QUIETLY)
! MESSAGE(STATUS "Looking for doxygen... - found ${DOXYGEN_EXECUTABLE}")
! ENDIF (NOT DOXYGEN_FIND_QUIETLY)
! ELSE (DOXYGEN_EXECUTABLE)
! IF (NOT DOXYGEN_FIND_QUIETLY)
! IF (DOXYGEN_FIND_REQUIRED)
! MESSAGE(FATAL_ERROR "Looking for doxygen... - NOT found")
! ELSE (DOXYGEN_FIND_REQUIRED)
! MESSAGE(STATUS "Looking for doxygen... - NOT found")
! ENDIF (DOXYGEN_FIND_REQUIRED)
! ENDIF (NOT DOXYGEN_FIND_QUIETLY)
! ENDIF (DOXYGEN_EXECUTABLE)
!
! # In the older versions of OS X Doxygen, dot was included with the
! # Doxygen bundle. But the new versions place make you download Graphviz.app
! # which contains dot in its bundle.
! IF (NOT DOXYGEN_FIND_QUIETLY)
! MESSAGE(STATUS "Looking for dot tool...")
! ENDIF (NOT DOXYGEN_FIND_QUIETLY)
! FIND_PROGRAM(DOXYGEN_DOT_EXECUTABLE
! NAMES dot
! PATHS "$ENV{ProgramFiles}/Graphviz 2.21/bin"
! "C:/Program Files/Graphviz 2.21/bin"
! "$ENV{ProgramFiles}/ATT/Graphviz/bin"
! "C:/Program Files/ATT/Graphviz/bin"
! [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin
! /Applications/Graphviz.app/Contents/MacOS
! /Applications/Doxygen.app/Contents/Resources
! /Applications/Doxygen.app/Contents/MacOS
! DOC "Graphviz Dot tool for using Doxygen"
! )
! IF (NOT DOXYGEN_FIND_QUIETLY)
! IF (DOXYGEN_DOT_EXECUTABLE)
! MESSAGE(STATUS "Looking for dot tool... - found ${DOXYGEN_DOT_EXECUTABLE}")
# The Doxyfile wants the path to Dot, not the entire path and executable
! GET_FILENAME_COMPONENT(DOXYGEN_DOT_PATH "${DOXYGEN_DOT_EXECUTABLE}" PATH CACHE)
! ELSE (DOXYGEN_DOT_EXECUTABLE)
! MESSAGE(STATUS "Looking for dot tool... - NOT found")
! ENDIF (DOXYGEN_DOT_EXECUTABLE)
! ENDIF (NOT DOXYGEN_FIND_QUIETLY)
! # Restore the old app-bundle setting setting
! SET(CMAKE_FIND_APPBUNDLE ${TEMP_DOXYGEN_SAVE_CMAKE_FIND_APPBUNDLE})
! # Backwards compatibility for CMake4.3 and less
SET (DOXYGEN ${DOXYGEN_EXECUTABLE} )
SET (DOT ${DOXYGEN_DOT_EXECUTABLE} )
MARK_AS_ADVANCED(
- DOXYGEN_FOUND
DOXYGEN_EXECUTABLE
- DOXYGEN_DOT_FOUND
DOXYGEN_DOT_EXECUTABLE
DOXYGEN_DOT_PATH
--- 1,127 ----
# - This module looks for Doxygen and the path to Graphviz's dot
! # Doxygen is a documentation generation tool. Please see
! # http://www.doxygen.org
! #
! # This module accepts the following optional variables:
! #
! # DOXYGEN_SKIP_DOT = If true this module will skip trying to find Dot
! # (an optional component often used by Doxygen)
! #
! # This modules defines the following variables:
! #
! # DOXYGEN_EXECUTABLE = The path to the doxygen command.
! # DOXYGEN_FOUND = Was Doxygen found or not?
! #
! # DOXYGEN_DOT_EXECUTABLE = The path to the dot program used by doxygen.
! # DOXYGEN_DOT_FOUND = Was Dot found or not?
! # DOXYGEN_DOT_PATH = The path to dot not including the executable
! #
! #
# For backwards compatibility support
IF(Doxygen_FIND_QUIETLY)
SET(DOXYGEN_FIND_QUIETLY TRUE)
ENDIF(Doxygen_FIND_QUIETLY)
! # ===== Rationale for OS X AppBundle mods below =====
! # With the OS X GUI version, Doxygen likes to be installed to /Applications and
! # it contains the doxygen executable in the bundle. In the versions I've
! # seen, it is located in Resources, but in general, more often binaries are
! # located in MacOS.
! #
! # NOTE: The official Doxygen.app that is distributed for OS X uses non-standard
! # conventions. Instead of the command-line "doxygen" tool being placed in
! # Doxygen.app/Contents/MacOS, "Doxywizard" is placed there instead and
! # "doxygen" is placed in Contents/Resources. This is most likely done
! # so that something happens when people double-click on the Doxygen.app
! # package. Unfortunately, CMake gets confused by this as when it sees the
! # bundle it uses "Doxywizard" as the executable to use instead of
! # "doxygen". Therefore to work-around this issue we temporarily disable
! # the app-bundle feature, just for this CMake module:
! if(APPLE)
! # Save the old setting
! SET(TEMP_DOXYGEN_SAVE_CMAKE_FIND_APPBUNDLE ${CMAKE_FIND_APPBUNDLE})
! # Disable the App-bundle detection feature
! SET(CMAKE_FIND_APPBUNDLE "NEVER")
! endif()
! # FYI:
! # In the older versions of OS X Doxygen, dot was included with the
! # Doxygen bundle. But the new versions require you to download
! # Graphviz.app which contains "dot" in it's bundle.
! # ============== End OSX stuff ================
!
! #
! # Find Doxygen...
! #
FIND_PROGRAM(DOXYGEN_EXECUTABLE
NAMES doxygen
! PATHS
! "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\doxygen_is1;Inno Setup: App Path]/bin"
! /Applications/Doxygen.app/Contents/Resources
! /Applications/Doxygen.app/Contents/MacOS
DOC "Doxygen documentation generation tool (http://www.doxygen.org)"
)
! include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(DOXYGEN DEFAULT_MSG DOXYGEN_EXECUTABLE)
! #
! # Find Dot...
! #
! IF(NOT DOXYGEN_SKIP_DOT)
! FIND_PROGRAM(DOXYGEN_DOT_EXECUTABLE
! NAMES dot
! PATHS
! "$ENV{ProgramFiles}/Graphviz 2.21/bin"
! "C:/Program Files/Graphviz 2.21/bin"
! "$ENV{ProgramFiles}/ATT/Graphviz/bin"
! "C:/Program Files/ATT/Graphviz/bin"
! [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin
! /Applications/Graphviz.app/Contents/MacOS
! /Applications/Doxygen.app/Contents/Resources
! /Applications/Doxygen.app/Contents/MacOS
! DOC "Graphviz Dot tool for using Doxygen"
! )
!
! include(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(DOXYGEN_DOT DEFAULT_MSG DOXYGEN_DOT_EXECUTABLE)
!
! if(DOXYGEN_DOT_EXECUTABLE)
# The Doxyfile wants the path to Dot, not the entire path and executable
! get_filename_component(DOXYGEN_DOT_PATH "${DOXYGEN_DOT_EXECUTABLE}" PATH CACHE)
! endif()
!
! endif(NOT DOXYGEN_SKIP_DOT)
+ #
+ # Backwards compatibility...
+ #
! if(APPLE)
! # Restore the old app-bundle setting setting
! SET(CMAKE_FIND_APPBUNDLE ${TEMP_DOXYGEN_SAVE_CMAKE_FIND_APPBUNDLE})
! endif()
! # Maintain the _FOUND variables as "YES" or "NO" for backwards compatibility
! # (allows people to stuff them directly into Doxyfile with configure_file())
! if(DOXYGEN_FOUND)
! set(DOXYGEN_FOUND "YES")
! else()
! set(DOXYGEN_FOUND "NO")
! endif()
! if(DOXYGEN_DOT_FOUND)
! set(DOXYGEN_DOT_FOUND "YES")
! else()
! set(DOXYGEN_DOT_FOUND "NO")
! endif()
!
! # For backwards compatibility support
SET (DOXYGEN ${DOXYGEN_EXECUTABLE} )
SET (DOT ${DOXYGEN_DOT_EXECUTABLE} )
MARK_AS_ADVANCED(
DOXYGEN_EXECUTABLE
DOXYGEN_DOT_EXECUTABLE
DOXYGEN_DOT_PATH
Index: FindKDE4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE4.cmake,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -C 2 -d -r1.10.2.5 -r1.10.2.6
*** FindKDE4.cmake 3 Sep 2008 13:43:16 -0000 1.10.2.5
--- FindKDE4.cmake 4 Feb 2009 16:44:02 -0000 1.10.2.6
***************
*** 17,21 ****
IF(NOT KDE4_FIND_QUIETLY)
MESSAGE( STATUS "KDE4/Qt4 and Qt3 cannot be used together in one project.")
! ENDIF(NOT KDE_FIND_QUIETLY)
RETURN()
ENDIF(KDE4_FIND_REQUIRED)
--- 17,21 ----
IF(NOT KDE4_FIND_QUIETLY)
MESSAGE( STATUS "KDE4/Qt4 and Qt3 cannot be used together in one project.")
! ENDIF(NOT KDE4_FIND_QUIETLY)
RETURN()
ENDIF(KDE4_FIND_REQUIRED)
--- NEW FILE: Findosg_functions.cmake ---
#
# This CMake file contains two macros to assist with searching for OSG
# libraries and nodekits.
#
#
# OSG_FIND_PATH
#
function(OSG_FIND_PATH module header)
string(TOUPPER ${module} module_uc)
# 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}
PATH_SUFFIXES include
PATHS
~/Library/Frameworks
/Library/Frameworks
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
endfunction(OSG_FIND_PATH module header)
#
# OSG_FIND_LIBRARY
#
function(OSG_FIND_LIBRARY module library)
string(TOUPPER ${module} module_uc)
find_library(${module_uc}_LIBRARY
NAMES ${library}
HINTS
$ENV{${module_uc}_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
find_library(${module_uc}_LIBRARY_DEBUG
NAMES ${library}d
HINTS
$ENV{${module_uc}_DIR}
$ENV{OSG_DIR}
$ENV{OSGDIR}
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
)
if(NOT ${module_uc}_LIBRARY_DEBUG)
# They don't have a debug library
set(${module_uc}_LIBRARY_DEBUG ${${module_uc}_LIBRARY} PARENT_SCOPE)
set(${module_uc}_LIBRARIES ${${module_uc}_LIBRARY} PARENT_SCOPE)
else()
# They really have a FOO_LIBRARY_DEBUG
set(${module_uc}_LIBRARIES
optimized ${${module_uc}_LIBRARY}
debug ${${module_uc}_LIBRARY_DEBUG}
PARENT_SCOPE
)
endif()
endfunction(OSG_FIND_LIBRARY module library)
Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -C 2 -d -r1.13.2.3 -r1.13.2.4
*** UseQt4.cmake 11 Nov 2008 21:52:22 -0000 1.13.2.3
--- UseQt4.cmake 4 Feb 2009 16:44:16 -0000 1.13.2.4
***************
*** 12,15 ****
--- 12,18 ----
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
+ IF(Q_WS_MAC AND QT_USE_FRAMEWORKS)
+ INCLUDE_DIRECTORIES(${QT_QTCORE_LIBRARY})
+ ENDIF(Q_WS_MAC AND QT_USE_FRAMEWORKS)
SET(QT_LIBRARIES "")
Index: FindosgParticle.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgParticle.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgParticle.cmake 13 Jun 2008 12:55:16 -0000 1.2.2.1
--- FindosgParticle.cmake 4 Feb 2009 16:44:13 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osgParticle
# This module defines
! # OSGPARTICLE_LIBRARY
! # OSGPARTICLE_FOUND, if false, do not try to link to osgParticle
! # OSGPARTICLE_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osgParticle
# This module defines
! #
! # OSGPARTICLE_FOUND - Was osgParticle found?
! # OSGPARTICLE_INCLUDE_DIR - Where to find the headers
! # OSGPARTICLE_LIBRARIES - The libraries to link for osgParticle (use this)
! #
! # OSGPARTICLE_LIBRARY - The osgParticle library
! # OSGPARTICLE_LIBRARY_DEBUG - The osgParticle debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgParticle/FireEffect>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGPARTICLE_INCLUDE_DIR osgParticle/FireEffect
! HINTS
! $ENV{OSGPARTICLE_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGPARTICLE_LIBRARY
! NAMES osgParticle
! HINTS
! $ENV{OSGPARTICLE_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGPARTICLE_FOUND "NO")
! IF(OSGPARTICLE_LIBRARY AND OSGPARTICLE_INCLUDE_DIR)
! SET(OSGPARTICLE_FOUND "YES")
! ENDIF(OSGPARTICLE_LIBRARY AND OSGPARTICLE_INCLUDE_DIR)
--- 30,38 ----
# #include <osgParticle/FireEffect>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGPARTICLE osgParticle/FireEffect)
! OSG_FIND_LIBRARY(OSGPARTICLE osgParticle)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGPARTICLE DEFAULT_MSG
+ OSGPARTICLE_LIBRARY OSGPARTICLE_INCLUDE_DIR)
Index: FindosgTerrain.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgTerrain.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgTerrain.cmake 13 Jun 2008 12:55:16 -0000 1.2.2.1
--- FindosgTerrain.cmake 4 Feb 2009 16:44:13 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osgTerrain
# This module defines
! # OSGTERRAIN_LIBRARY
! # OSGTERRAIN_FOUND, if false, do not try to link to osgTerrain
! # OSGTERRAIN_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osgTerrain
# This module defines
! #
! # OSGTERRAIN_FOUND - Was osgTerrain found?
! # OSGTERRAIN_INCLUDE_DIR - Where to find the headers
! # OSGTERRAIN_LIBRARIES - The libraries to link for osgTerrain (use this)
! #
! # OSGTERRAIN_LIBRARY - The osgTerrain library
! # OSGTERRAIN_LIBRARY_DEBUG - The osgTerrain debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgTerrain/Terrain>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGTERRAIN_INCLUDE_DIR osgTerrain/Terrain
! HINTS
! $ENV{OSGTERRAIN_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGTERRAIN_LIBRARY
! NAMES osgTerrain
! HINTS
! $ENV{OSGTERRAIN_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGTERRAIN_FOUND "NO")
! IF(OSGTERRAIN_LIBRARY AND OSGTERRAIN_INCLUDE_DIR)
! SET(OSGTERRAIN_FOUND "YES")
! ENDIF(OSGTERRAIN_LIBRARY AND OSGTERRAIN_INCLUDE_DIR)
--- 30,38 ----
# #include <osgTerrain/Terrain>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGTERRAIN osgTerrain/Terrain)
! OSG_FIND_LIBRARY(OSGTERRAIN osgTerrain)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGTERRAIN DEFAULT_MSG
+ OSGTERRAIN_LIBRARY OSGTERRAIN_INCLUDE_DIR)
Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.35.2.4
retrieving revision 1.35.2.5
diff -C 2 -d -r1.35.2.4 -r1.35.2.5
*** CPack.cmake 13 Jul 2008 21:55:23 -0000 1.35.2.4
--- CPack.cmake 4 Feb 2009 16:44:01 -0000 1.35.2.5
***************
*** 709,712 ****
--- 709,713 ----
if(APPLE)
option(CPACK_BINARY_BUNDLE "Enable to build OSX bundles" OFF)
+ option(CPACK_BINARY_DRAGNDROP "Enable to build OSX Drag And Drop package" OFF)
option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages" ON)
option(CPACK_BINARY_OSXX11 "Enable to build OSX X11 packages" OFF)
***************
*** 716,720 ****
option(CPACK_BINARY_STGZ "Enable to build STGZ packages" ON)
option(CPACK_BINARY_TGZ "Enable to build TGZ packages" ON)
! option(CPACK_BINARY_TBZ2 "Enable to build TBZ2 packages" ON)
option(CPACK_BINARY_DEB "Enable to build Debian packages" OFF)
option(CPACK_BINARY_RPM "Enable to build RPM packages" OFF)
--- 717,721 ----
option(CPACK_BINARY_STGZ "Enable to build STGZ packages" ON)
option(CPACK_BINARY_TGZ "Enable to build TGZ packages" ON)
! option(CPACK_BINARY_TBZ2 "Enable to build TBZ2 packages" OFF)
option(CPACK_BINARY_DEB "Enable to build Debian packages" OFF)
option(CPACK_BINARY_RPM "Enable to build RPM packages" OFF)
***************
*** 723,730 ****
else(UNIX)
option(CPACK_BINARY_NSIS "Enable to build NSIS packages" ON)
! option(CPACK_BINARY_ZIP "Enable to build ZIP packages" ON)
endif(UNIX)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_BUNDLE Bundle)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_PACKAGEMAKER PackageMaker)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_OSXX11 OSXX11)
--- 724,732 ----
else(UNIX)
option(CPACK_BINARY_NSIS "Enable to build NSIS packages" ON)
! option(CPACK_BINARY_ZIP "Enable to build ZIP packages" OFF)
endif(UNIX)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_BUNDLE Bundle)
+ cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_DRAGNDROP DragNDrop)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_PACKAGEMAKER PackageMaker)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_OSXX11 OSXX11)
***************
*** 769,773 ****
CPACK_BINARY_NSIS CPACK_BINARY_ZIP CPACK_BINARY_BUNDLE
CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ
! CPACK_SOURCE_TZ CPACK_SOURCE_ZIP)
# Set some other variables
--- 771,775 ----
CPACK_BINARY_NSIS CPACK_BINARY_ZIP CPACK_BINARY_BUNDLE
CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ
! CPACK_SOURCE_TZ CPACK_SOURCE_ZIP CPACK_BINARY_DRAGNDROP)
# Set some other variables
Index: FindosgText.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgText.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgText.cmake 13 Jun 2008 12:55:16 -0000 1.2.2.1
--- FindosgText.cmake 4 Feb 2009 16:44:15 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osgText
# This module defines
! # OSGTEXT_LIBRARY
! # OSGTEXT_FOUND, if false, do not try to link to osgText
! # OSGTEXT_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osgText
# This module defines
! #
! # OSGTEXT_FOUND - Was osgText found?
! # OSGTEXT_INCLUDE_DIR - Where to find the headers
! # OSGTEXT_LIBRARIES - The libraries to link for osgText (use this)
! #
! # OSGTEXT_LIBRARY - The osgText library
! # OSGTEXT_LIBRARY_DEBUG - The osgText debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgText/Text>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGTEXT_INCLUDE_DIR osgText/Text
! HINTS
! $ENV{OSGTEXT_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGTEXT_LIBRARY
! NAMES osgText
! HINTS
! $ENV{OSGTEXT_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGTEXT_FOUND "NO")
! IF(OSGTEXT_LIBRARY AND OSGTEXT_INCLUDE_DIR)
! SET(OSGTEXT_FOUND "YES")
! ENDIF(OSGTEXT_LIBRARY AND OSGTEXT_INCLUDE_DIR)
--- 30,38 ----
# #include <osgText/Text>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGTEXT osgText/Text)
! OSG_FIND_LIBRARY(OSGTEXT osgText)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGTEXT DEFAULT_MSG
+ OSGTEXT_LIBRARY OSGTEXT_INCLUDE_DIR)
--- NEW FILE: FindosgVolume.cmake ---
# This is part of the Findosg* suite used to find OpenSceneGraph components.
# Each component is separate and you must opt in to each module. You must
# also opt into OpenGL and OpenThreads (and Producer if needed) as these
# modules won't do it for you. This is to allow you control over your own
# system piece by piece in case you need to opt out of certain components
# or change the Find behavior for a particular module (perhaps because the
# default FindOpenGL.cmake module doesn't work with your system as an
# example).
# If you want to use a more convenient module that includes everything,
# use the FindOpenSceneGraph.cmake instead of the Findosg*.cmake modules.
#
# Locate osgVolume
# This module defines
#
# OSGVOLUME_FOUND - Was osgVolume found?
# OSGVOLUME_INCLUDE_DIR - Where to find the headers
# OSGVOLUME_LIBRARIES - The libraries to link for osgVolume (use this)
#
# OSGVOLUME_LIBRARY - The osgVolume library
# OSGVOLUME_LIBRARY_DEBUG - The osgVolume debug library
#
# $OSGDIR is an environment variable that would
# correspond to the ./configure --prefix=$OSGDIR
# used in building osg.
#
# Created by Eric Wing.
# Header files are presumed to be included like
# #include <osg/PositionAttitudeTransform>
# #include <osgVolume/Volume>
include(Findosg_functions)
OSG_FIND_PATH (OSGVOLUME osgVolume/Volume)
OSG_FIND_LIBRARY(OSGVOLUME osgVolume)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGVOLUME DEFAULT_MSG
OSGVOLUME_LIBRARY OSGVOLUME_INCLUDE_DIR)
Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.cmake,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -C 2 -d -r1.10.2.4 -r1.10.2.5
*** FindKDE3.cmake 3 Sep 2008 13:43:16 -0000 1.10.2.4
--- FindKDE3.cmake 4 Feb 2009 16:44:01 -0000 1.10.2.5
***************
*** 107,117 ****
OUTPUT_VARIABLE kde_config_version )
! STRING(REGEX MATCH "KDE: .\\." kde_version ${kde_config_version})
! IF (${kde_version} MATCHES "KDE: 3\\.")
EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --prefix
OUTPUT_VARIABLE kdedir )
STRING(REGEX REPLACE "\n" "" KDE3PREFIX "${kdedir}")
! ENDIF (${kde_version} MATCHES "KDE: 3\\.")
ENDIF(KDECONFIG_EXECUTABLE)
--- 107,117 ----
OUTPUT_VARIABLE kde_config_version )
! STRING(REGEX MATCH "KDE: .\\." kde_version "${kde_config_version}")
! IF ("${kde_version}" MATCHES "KDE: 3\\.")
EXECUTE_PROCESS(COMMAND ${KDECONFIG_EXECUTABLE} --prefix
OUTPUT_VARIABLE kdedir )
STRING(REGEX REPLACE "\n" "" KDE3PREFIX "${kdedir}")
! ENDIF ("${kde_version}" MATCHES "KDE: 3\\.")
ENDIF(KDECONFIG_EXECUTABLE)
Index: FindosgProducer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgProducer.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgProducer.cmake 13 Jun 2008 12:55:16 -0000 1.2.2.1
--- FindosgProducer.cmake 4 Feb 2009 16:44:13 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osgProducer
# This module defines
! # OSGPRODUCER_LIBRARY
! # OSGPRODUCER_FOUND, if false, do not try to link to osgProducer
! # OSGPRODUCER_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osgProducer
# This module defines
! #
! # OSGPRODUCER_FOUND - Was osgProducer found?
! # OSGPRODUCER_INCLUDE_DIR - Where to find the headers
! # OSGPRODUCER_LIBRARIES - The libraries to link for osgProducer (use this)
! #
! # OSGPRODUCER_LIBRARY - The osgProducer library
! # OSGPRODUCER_LIBRARY_DEBUG - The osgProducer debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgProducer/OsgSceneHandler>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGPRODUCER_INCLUDE_DIR osgProducer/OsgSceneHandler
! HINTS
! $ENV{OSGPRODUCER_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGPRODUCER_LIBRARY
! NAMES osgProducer
! HINTS
! $ENV{OSGPRODUCER_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGPRODUCER_FOUND "NO")
! IF(OSGPRODUCER_LIBRARY AND OSGPRODUCER_INCLUDE_DIR)
! SET(OSGPRODUCER_FOUND "YES")
! ENDIF(OSGPRODUCER_LIBRARY AND OSGPRODUCER_INCLUDE_DIR)
--- 30,38 ----
# #include <osgProducer/OsgSceneHandler>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGPRODUCER osgProducer/OsgSceneHandler)
! OSG_FIND_LIBRARY(OSGPRODUCER osgProducer)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGPRODUCER DEFAULT_MSG
+ OSGPRODUCER_LIBRARY OSGPRODUCER_INCLUDE_DIR)
Index: FindosgUtil.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgUtil.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgUtil.cmake 13 Jun 2008 12:55:16 -0000 1.2.2.1
--- FindosgUtil.cmake 4 Feb 2009 16:44:16 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osgUtil
# This module defines
! # OSGUTIL_LIBRARY
! # OSGUTIL_FOUND, if false, do not try to link to osgUtil
! # OSGUTIL_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osgUtil
# This module defines
! #
! # OSGUTIL_FOUND - Was osgUtil found?
! # OSGUTIL_INCLUDE_DIR - Where to find the headers
! # OSGUTIL_LIBRARIES - The libraries to link for osgUtil (use this)
! #
! # OSGUTIL_LIBRARY - The osgUtil library
! # OSGUTIL_LIBRARY_DEBUG - The osgUtil debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgUtil/SceneView>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGUTIL_INCLUDE_DIR osgUtil/SceneView
! HINTS
! $ENV{OSGUTIL_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGUTIL_LIBRARY
! NAMES osgUtil
! HINTS
! $ENV{OSGUTIL_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGUTIL_FOUND "NO")
! IF(OSGUTIL_LIBRARY AND OSGUTIL_INCLUDE_DIR)
! SET(OSGUTIL_FOUND "YES")
! ENDIF(OSGUTIL_LIBRARY AND OSGUTIL_INCLUDE_DIR)
--- 30,38 ----
# #include <osgUtil/SceneView>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGUTIL osgUtil/SceneView)
! OSG_FIND_LIBRARY(OSGUTIL osgUtil)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGUTIL DEFAULT_MSG
+ OSGUTIL_LIBRARY OSGUTIL_INCLUDE_DIR)
Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -C 2 -d -r1.4.2.8 -r1.4.2.9
*** FindBoost.cmake 24 Oct 2008 15:18:45 -0000 1.4.2.8
--- FindBoost.cmake 4 Feb 2009 16:44:01 -0000 1.4.2.9
***************
*** 2,49 ****
# Usage of this module as follows:
#
! # SET(Boost_USE_STATIC_LIBS ON)
! # SET(Boost_USE_MULTITHREAD OFF)
! # FIND_PACKAGE( Boost 1.34.1 COMPONENTS date_time filesystem iostreams ... )
#
! # The Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
! # boost version numbers that should be taken into account when searching
! # for the libraries. Unfortunately boost puts the version number into the
! # actual filename for the libraries, so this might be needed in the future
! # when new Boost versions are released.
#
! # Currently this module searches for the following version numbers:
! # 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1, 1.36,
! # 1.36.0, 1.36.1
#
# The components list needs to be the actual names of boost libraries, that is
# the part of the actual library files that differ on different libraries. So
# its "date_time" for "libboost_date_time...". Anything else will result in
! # errors
#
! # You can provide a minimum version number that should be used. If you provide this
# version number and specify the REQUIRED attribute, this module will fail if it
# can't find the specified or a later version. If you specify a version number this is
# automatically put into the considered list of version numbers and thus doesn't need
! # to be specified in the Boost_ADDITIONAL_VERSIONS variable
#
# Variables used by this module, they can change the default behaviour and need to be set
# before calling find_package:
! # Boost_USE_MULTITHREAD Can be set to OFF to use the non-multithreaded
! # boost libraries. Defaults to ON.
# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
# boost libraries. Defaults to OFF.
# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
! # the boost include directory. The default list
! # of version numbers is:
! # 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1,
! # 1.35, 1.35.0, 1.35.1, 1.36, 1.36.0, 1.36.1
! # If you want to look for an older or newer
! # version set this variable to a list of
! # strings, where each string contains a number, i.e.
! # SET(Boost_ADDITIONAL_VERSIONS "0.99.0" "1.35.0")
# BOOST_ROOT or BOOSTROOT Preferred installation prefix for searching for Boost,
# set this if the module has problems finding the proper Boost installation
# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
# module has problems finding the proper Boost installation
# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
# module has problems finding the proper Boost installation
--- 2,96 ----
# Usage of this module as follows:
#
! # == Using Header-Only libraries from within Boost: ==
#
! # FIND_PACKAGE( Boost 1.36.0 )
! # INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
! # ADD_EXECUTABLE(foo foo.cc)
#
! # == Using actual libraries from within Boost: ==
! #
! # SET(Boost_USE_STATIC_LIBS ON)
! # SET(Boost_USE_MULTITHREADED ON)
! # FIND_PACKAGE( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
! # INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
! #
! # ADD_EXECUTABLE(foo foo.cc)
! # TARGET_LINK_LIBRARIES(foo ${Boost_LIBRARIES})
#
# The components list needs to be the actual names of boost libraries, that is
# the part of the actual library files that differ on different libraries. So
# its "date_time" for "libboost_date_time...". Anything else will result in
! # errors. If you're using parts of Boost that contains header files only (e.g.
! # foreach) you do not need to specify COMPONENTS.
#
! # You should provide a minimum version number that should be used. If you provide this
# version number and specify the REQUIRED attribute, this module will fail if it
# can't find the specified or a later version. If you specify a version number this is
# automatically put into the considered list of version numbers and thus doesn't need
! # to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
! #
! # NOTE for Visual Studio Users:
! # Automatic linking is used on MSVC & Borland compilers by default when
! # #including things in Boost. It's important to note that setting
! # Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
! # autolinking typically uses static libraries by default.
! #
! # Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
! # more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
! # above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
! # gets set to OFF.
! #
! # =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
! #
! # OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
! # boost version numbers that should be taken into account when searching
! # for Boost. Unfortunately boost puts the version number into the
! # actual filename for the libraries, so this variable will certainly be needed
! # in the future when new Boost versions are released.
! #
! # Currently this module searches for the following version numbers:
! # 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
! # 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0
! #
! # NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
! # add both 1.x and 1.x.0 as shown above. Official boost include directories
! # omit the 3rd version number from include paths if it is 0 although not all
! # binary boost releases do so.
! #
! # SET(Boost_ADDITIONAL_VERSIONS "0.99" "0.99.0" "1.78" "1.78.0")
! #
! # ============================================================================
#
# Variables used by this module, they can change the default behaviour and need to be set
# before calling find_package:
! #
! # Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded
! # boost libraries. If not specified, defaults
! # to ON.
! #
# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
# boost libraries. Defaults to OFF.
+ #
+ # Other Variables used by this module which you may want to set.
+ #
# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
! # the boost include directory. Please see
! # the documentation above regarding this
! # annoying, but necessary variable :(
! #
! # Boost_DEBUG Set this to TRUE to enable debugging output
! # of FindBoost.cmake if you are having problems.
! # Please enable this before filing any bug
! # reports.
! #
! # Boost_COMPILER Set this to the compiler suffix used by boost (e.g. -gcc43) if the
! # module has problems finding the proper Boost installation
! #
# BOOST_ROOT or BOOSTROOT Preferred installation prefix for searching for Boost,
# set this if the module has problems finding the proper Boost installation
+ #
# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
# module has problems finding the proper Boost installation
+ #
# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
# module has problems finding the proper Boost installation
***************
*** 56,74 ****
# Boost_FOUND System has Boost, this means the include dir was found,
# as well as all the libraries specified in the COMPONENTS list
# Boost_INCLUDE_DIRS Boost include directories, not cached
# Boost_INCLUDE_DIR This is almost the same as above, but this one is cached and may be
# modified by advanced users
# Boost_LIBRARIES Link these to use the Boost libraries that you specified, not cached
# Boost_LIBRARY_DIRS The path to where the Boost library files are.
# Boost_VERSION The version number of the boost libraries that have been found,
# same as in version.hpp from Boost
# Boost_LIB_VERSION The version number in filename form as its appended to the library filenames
# Boost_MAJOR_VERSION major version number of boost
# Boost_MINOR_VERSION minor version number of boost
# Boost_SUBMINOR_VERSION subminor version number of boost
! # Boost_LIB_DIAGNOSTIC_DEFINITIONS Only set on windows. Can be used with add_definitions
! # to print diagnostic information about the automatic
! # linking done on windows.
!
# For each component you list the following variables are set.
# ATTENTION: The component names need to be in lower case, just as the boost
--- 103,131 ----
# Boost_FOUND System has Boost, this means the include dir was found,
# as well as all the libraries specified in the COMPONENTS list
+ #
# Boost_INCLUDE_DIRS Boost include directories, not cached
+ #
# Boost_INCLUDE_DIR This is almost the same as above, but this one is cached and may be
# modified by advanced users
+ #
# Boost_LIBRARIES Link these to use the Boost libraries that you specified, not cached
+ #
# Boost_LIBRARY_DIRS The path to where the Boost library files are.
+ #
# Boost_VERSION The version number of the boost libraries that have been found,
# same as in version.hpp from Boost
+ #
# Boost_LIB_VERSION The version number in filename form as its appended to the library filenames
+ #
# Boost_MAJOR_VERSION major version number of boost
# Boost_MINOR_VERSION minor version number of boost
# Boost_SUBMINOR_VERSION subminor version number of boost
! #
! # Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call
! # add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINTIIONS})
! # to have diagnostic information about
! # Boost's automatic linking outputted
! # during compilation time.
! #
# For each component you list the following variables are set.
# ATTENTION: The component names need to be in lower case, just as the boost
***************
*** 92,97 ****
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
! OPTION(Boost_USE_MULTITHREADED
! "Use the multithreaded versions of the Boost libraries" ON)
if(Boost_FIND_VERSION_EXACT)
--- 149,156 ----
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
!
! IF(NOT DEFINED Boost_USE_MULTITHREADED)
! SET(Boost_USE_MULTITHREADED TRUE)
! ENDIF()
if(Boost_FIND_VERSION_EXACT)
***************
*** 105,108 ****
--- 164,168 ----
# versions, find those that are acceptable to the user request.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+ "1.38.0" "1.38" "1.37.0" "1.37"
"1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
"1.34" "1.33.1" "1.33.0" "1.33")
***************
*** 173,179 ****
IF (Boost_${basename}_LIBRARY)
! SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
! GET_FILENAME_COMPONENT(Boost_LIBRARY_DIRS "${Boost_${basename}_LIBRARY}" PATH)
! SET(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
ENDIF (Boost_${basename}_LIBRARY)
--- 233,257 ----
IF (Boost_${basename}_LIBRARY)
! IF(WIN32)
! # Workaround issue #8378.
! SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE STRING "The Boost ${basename} library")
! ELSE()
! SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
! ENDIF()
!
! # Remove superfluous "debug" / "optimized" keywords from
! # Boost_LIBRARY_DIRS
! FOREACH(_boost_my_lib ${Boost_${basename}_LIBRARY})
! GET_FILENAME_COMPONENT(_boost_my_lib_path "${_boost_my_lib}" PATH)
! LIST(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path})
! ENDFOREACH()
! LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
!
! IF(WIN32)
! # Workaround issue #8378.
! SET(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE STRING "Boost library directory")
! ELSE()
! SET(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
! ENDIF()
SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
ENDIF (Boost_${basename}_LIBRARY)
***************
*** 188,191 ****
--- 266,286 ----
ENDMACRO (_Boost_ADJUST_LIB_VARS)
+ #
+ # Runs compiler with "-dumpversion" and parses major/minor
+ # version with a regex.
+ #
+ FUNCTION(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION)
+
+ EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
+ ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+ OUTPUT_VARIABLE _boost_COMPILER_VERSION
+ )
+ STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
+ _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
+
+ SET(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION} PARENT_SCOPE)
+ ENDFUNCTION()
+
+
#-------------------------------------------------------------------------------
***************
*** 217,222 ****
--- 312,333 ----
MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
ENDIF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "boost ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} "
+ "is already in the cache. For debugging messages, please clear the cache.")
+ endif()
ELSE (_boost_IN_CACHE)
# Need to search for boost
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost not in cache")
+ # Output some of their choices
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost_USE_MULTITHREADED = ${Boost_USE_MULTITHREADED}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Boost_USE_STATIC_LIBS = ${Boost_USE_STATIC_LIBS}")
+ endif()
IF(WIN32)
***************
*** 244,261 ****
SET(_boost_INCLUDE_SEARCH_DIRS
C:/boost/include
! "C:/boost"
! "$ENV{ProgramFiles}/boost/boost_${Boost_FIND_VERSION_MAJOR}_${Boost_FIND_VERSION_MINOR}_${Boost_FIND_VERSION_PATCH}"
! "$ENV{ProgramFiles}/Boost"
/sw/local/include
)
- SET(_boost_LIBRARIES_SEARCH_DIRS
- C:/boost/lib
- "C:/boost"
- "$ENV{ProgramFiles}/boost/boost_${Boost_FIND_VERSION_MAJOR}_${Boost_FIND_VERSION_MINOR}_${Boost_FIND_VERSION_PATCH}/lib"
- "$ENV{ProgramFiles}/Boost"
- /sw/local/lib
- )
-
# If BOOST_ROOT was defined in the environment, use it.
if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
--- 355,363 ----
SET(_boost_INCLUDE_SEARCH_DIRS
C:/boost/include
! C:/boost
! "$ENV{ProgramFiles}/boost"
/sw/local/include
)
# If BOOST_ROOT was defined in the environment, use it.
if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
***************
*** 272,291 ****
set(BOOST_INCLUDEDIR $ENV{BOOST_INCLUDEDIR})
ENDIF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
!
# If BOOST_LIBRARYDIR was defined in the environment, use it.
IF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
set(BOOST_LIBRARYDIR $ENV{BOOST_LIBRARYDIR})
ENDIF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
!
IF( BOOST_ROOT )
file(TO_CMAKE_PATH ${BOOST_ROOT} BOOST_ROOT)
SET(_boost_INCLUDE_SEARCH_DIRS
${BOOST_ROOT}/include
${BOOST_ROOT}
${_boost_INCLUDE_SEARCH_DIRS})
- SET(_boost_LIBRARIES_SEARCH_DIRS
- ${BOOST_ROOT}/lib
- ${BOOST_ROOT}/stage/lib
- ${_boost_LIBRARIES_SEARCH_DIRS})
ENDIF( BOOST_ROOT )
--- 374,405 ----
set(BOOST_INCLUDEDIR $ENV{BOOST_INCLUDEDIR})
ENDIF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
!
# If BOOST_LIBRARYDIR was defined in the environment, use it.
IF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
set(BOOST_LIBRARYDIR $ENV{BOOST_LIBRARYDIR})
ENDIF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
!
IF( BOOST_ROOT )
file(TO_CMAKE_PATH ${BOOST_ROOT} BOOST_ROOT)
+ ENDIF( BOOST_ROOT )
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Declared as CMake or Environmental Variables:")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " BOOST_ROOT = ${BOOST_ROOT}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " BOOST_INCLUDEDIR = ${BOOST_INCLUDEDIR}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " BOOST_LIBRARYDIR = ${BOOST_LIBRARYDIR}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
+ endif()
+
+ IF( BOOST_ROOT )
SET(_boost_INCLUDE_SEARCH_DIRS
${BOOST_ROOT}/include
${BOOST_ROOT}
${_boost_INCLUDE_SEARCH_DIRS})
ENDIF( BOOST_ROOT )
***************
*** 296,305 ****
ENDIF( BOOST_INCLUDEDIR )
! IF( BOOST_LIBRARYDIR )
! file(TO_CMAKE_PATH ${BOOST_LIBRARYDIR} BOOST_LIBRARYDIR)
! SET(_boost_LIBRARIES_SEARCH_DIRS
! ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS})
! ENDIF( BOOST_LIBRARYDIR )
!
# Try to find Boost by stepping backwards through the Boost versions
# we know about.
--- 410,416 ----
ENDIF( BOOST_INCLUDEDIR )
! # ------------------------------------------------------------------------
! # Search for Boost include DIR
! # ------------------------------------------------------------------------
# Try to find Boost by stepping backwards through the Boost versions
# we know about.
***************
*** 311,329 ****
# we could read this from version.hpp, but for that to work we'd
# need to know the include dir already
! if (WIN32 AND NOT CYGWIN)
! set(_boost_PATH_SUFFIX boost_${_boost_VER})
! else (WIN32 AND NOT CYGWIN)
! set(_boost_PATH_SUFFIX boost-${_boost_VER})
! endif (WIN32 AND NOT CYGWIN)
! IF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3"
! _boost_PATH_SUFFIX ${_boost_PATH_SUFFIX})
! ELSEIF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+")
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2"
! _boost_PATH_SUFFIX ${_boost_PATH_SUFFIX})
! ENDIF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
! LIST(APPEND _boost_PATH_SUFFIXES "${_boost_PATH_SUFFIX}")
ENDFOREACH(_boost_VER)
# Look for a standard boost header file.
--- 422,452 ----
# we could read this from version.hpp, but for that to work we'd
# need to know the include dir already
! set(_boost_BOOSTIFIED_VERSION)
! # Transform 1.35 => 1_35 and 1.36.0 => 1_36_0
! IF(_boost_VER MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3"
! _boost_BOOSTIFIED_VERSION ${_boost_VER})
! ELSEIF(_boost_VER MATCHES "[0-9]+\\.[0-9]+")
STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2"
! _boost_BOOSTIFIED_VERSION ${_boost_VER})
! ENDIF()
!
! LIST(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
! IF(WIN32)
! # Yay Boost Pro! We dig your underscores.
! LIST(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
! ENDIF()
!
ENDFOREACH(_boost_VER)
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "Include debugging info:")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " _boost_INCLUDE_SEARCH_DIRS = ${_boost_INCLUDE_SEARCH_DIRS}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ " _boost_PATH_SUFFIXES = ${_boost_PATH_SUFFIXES}")
+ endif()
# Look for a standard boost header file.
***************
*** 334,337 ****
--- 457,464 ----
)
ENDIF( NOT Boost_INCLUDE_DIR )
+
+ # ------------------------------------------------------------------------
+ # Extract version information from version.hpp
+ # ------------------------------------------------------------------------
IF(Boost_INCLUDE_DIR)
***************
*** 342,345 ****
--- 469,476 ----
SET(BOOST_LIB_VERSION "")
FILE(READ "${Boost_INCLUDE_DIR}/boost/version.hpp" _boost_VERSION_HPP_CONTENTS)
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "location of version.hpp: ${Boost_INCLUDE_DIR}/boost/version.hpp")
+ endif()
STRING(REGEX REPLACE ".*#define BOOST_VERSION ([0-9]+).*" "\\1" Boost_VERSION "${_boost_VERSION_HPP_CONTENTS}")
***************
*** 357,428 ****
"${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")
ENDIF(NOT "${Boost_VERSION}" STREQUAL "0")
ELSE(Boost_INCLUDE_DIR)
set(Boost_ERROR_REASON
"${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")
ENDIF(Boost_INCLUDE_DIR)
# Setting some more suffixes for the library
SET (Boost_LIB_PREFIX "")
! IF ( WIN32 AND Boost_USE_STATIC_LIBS )
SET (Boost_LIB_PREFIX "lib")
! ENDIF ( WIN32 AND Boost_USE_STATIC_LIBS )
! SET (_boost_COMPILER "-gcc")
! IF (MSVC90)
! SET (_boost_COMPILER "-vc90")
! ELSEIF (MSVC80)
! SET (_boost_COMPILER "-vc80")
! ELSEIF (MSVC71)
! SET (_boost_COMPILER "-vc71")
! ENDIF(MSVC90)
! IF (MINGW)
! EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
! ARGS -dumpversion
! OUTPUT_VARIABLE _boost_COMPILER_VERSION
! )
! STRING(REGEX REPLACE "([0-9])\\.([0-9])\\.[0-9]" "\\1\\2"
! _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
! SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
! ENDIF(MINGW)
! IF (UNIX)
! IF (NOT CMAKE_COMPILER_IS_GNUCC)
! # We assume that we have the Intel compiler.
! SET (_boost_COMPILER "-il")
! ELSE (NOT CMAKE_COMPILER_IS_GNUCC)
! # Determine which version of GCC we have.
! EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
! ARGS -dumpversion
! OUTPUT_VARIABLE _boost_COMPILER_VERSION
! )
! STRING(REGEX REPLACE "([0-9])\\.([0-9])\\.[0-9]" "\\1\\2"
! _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
! IF(APPLE)
! IF(Boost_MINOR_VERSION)
! IF(${Boost_MINOR_VERSION} GREATER 35)
! # In Boost 1.36.0 and newer, the mangled compiler name used
! # on Mac OS X/Darwin is "xgcc".
! SET(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
! ELSE(${Boost_MINOR_VERSION} GREATER 35)
! # In Boost <= 1.35.0, there is no mangled compiler name for
! # the Mac OS X/Darwin version of GCC.
! SET(_boost_COMPILER "")
! ENDIF(${Boost_MINOR_VERSION} GREATER 35)
! ELSE(Boost_MINOR_VERSION)
! # We don't know the Boost version, so assume it's
! # pre-1.36.0.
! SET(_boost_COMPILER "")
! ENDIF(Boost_MINOR_VERSION)
! ELSE()
! SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
! ENDIF()
! ENDIF (NOT CMAKE_COMPILER_IS_GNUCC)
! ENDIF(UNIX)
! SET (_boost_MULTITHREADED "-mt")
! IF( NOT Boost_USE_MULTITHREADED )
! SET (_boost_MULTITHREADED "")
! ENDIF( NOT Boost_USE_MULTITHREADED )
SET( _boost_STATIC_TAG "")
IF (WIN32)
IF(MSVC)
--- 488,594 ----
"${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")
ENDIF(NOT "${Boost_VERSION}" STREQUAL "0")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "version.hpp reveals boost "
+ "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+ endif()
ELSE(Boost_INCLUDE_DIR)
set(Boost_ERROR_REASON
"${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")
ENDIF(Boost_INCLUDE_DIR)
+
+ # ------------------------------------------------------------------------
+ # Suffix initialization and compiler suffix detection.
+ # ------------------------------------------------------------------------
# Setting some more suffixes for the library
SET (Boost_LIB_PREFIX "")
! if ( MSVC AND Boost_USE_STATIC_LIBS )
SET (Boost_LIB_PREFIX "lib")
! endif()
! if (Boost_COMPILER)
! set(_boost_COMPILER ${Boost_COMPILER})
! if(Boost_DEBUG)
! message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
! "using user-specified Boost_COMPILER = ${_boost_COMPILER}")
! endif()
! else(Boost_COMPILER)
! # Attempt to guess the compiler suffix
! # NOTE: this is not perfect yet, if you experience any issues
! # please report them and use the Boost_COMPILER variable
! # to work around the problems.
! if (MSVC90)
! SET (_boost_COMPILER "-vc90")
! elseif (MSVC80)
! SET (_boost_COMPILER "-vc80")
! elseif (MSVC71)
! SET (_boost_COMPILER "-vc71")
! elseif (MSVC70) # Good luck!
! SET (_boost_COMPILER "-vc7") # yes, this is correct
! elseif (MSVC60) # Good luck!
! SET (_boost_COMPILER "-vc6") # yes, this is correct
! elseif (BORLAND)
! SET (_boost_COMPILER "-bcb")
! elseif("${CMAKE_CXX_COMPILER}" MATCHES "icl"
! OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
! if(WIN32)
! set (_boost_COMPILER "-iw")
! else()
! set (_boost_COMPILER "-il")
! endif()
! elseif (MINGW)
! if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
! SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
! else()
! _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
! SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
! endif()
! elseif (UNIX)
! if (CMAKE_COMPILER_IS_GNUCXX)
! if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
! SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
! else()
! _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
! # Determine which version of GCC we have.
! IF(APPLE)
! IF(Boost_MINOR_VERSION)
! IF(${Boost_MINOR_VERSION} GREATER 35)
! # In Boost 1.36.0 and newer, the mangled compiler name used
! # on Mac OS X/Darwin is "xgcc".
! SET(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
! ELSE(${Boost_MINOR_VERSION} GREATER 35)
! # In Boost <= 1.35.0, there is no mangled compiler name for
! # the Mac OS X/Darwin version of GCC.
! SET(_boost_COMPILER "")
! ENDIF(${Boost_MINOR_VERSION} GREATER 35)
! ELSE(Boost_MINOR_VERSION)
! # We don't know the Boost version, so assume it's
! # pre-1.36.0.
! SET(_boost_COMPILER "")
! ENDIF(Boost_MINOR_VERSION)
! ELSE()
! SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
! ENDIF()
! endif()
! endif (CMAKE_COMPILER_IS_GNUCXX)
! endif()
! if(Boost_DEBUG)
! message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
! "guessed _boost_COMPILER = ${_boost_COMPILER}")
! endif()
! endif(Boost_COMPILER)
! SET (_boost_MULTITHREADED "-mt")
! if( NOT Boost_USE_MULTITHREADED )
! set (_boost_MULTITHREADED "")
! endif()
! if(Boost_DEBUG)
! message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
! "_boost_MULTITHREADED = ${_boost_MULTITHREADED}")
! endif()
SET( _boost_STATIC_TAG "")
+ set( _boost_ABI_TAG "")
IF (WIN32)
IF(MSVC)
***************
*** 434,441 ****
--- 600,639 ----
ENDIF(WIN32)
SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_STATIC_TAG = ${_boost_STATIC_TAG}")
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_ABI_TAG = ${_boost_ABI_TAG}")
+ endif()
# ------------------------------------------------------------------------
# Begin finding boost libraries
# ------------------------------------------------------------------------
+
+ SET(_boost_LIBRARIES_SEARCH_DIRS
+ C:/boost/lib
+ C:/boost
+ "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib"
+ "$ENV{ProgramFiles}/boost"
+ /sw/local/lib
+ )
+ IF( BOOST_ROOT )
+ SET(_boost_LIBRARIES_SEARCH_DIRS
+ ${BOOST_ROOT}/lib
+ ${BOOST_ROOT}/stage/lib
+ ${_boost_LIBRARIES_SEARCH_DIRS})
+ ENDIF( BOOST_ROOT )
+
+ IF( BOOST_LIBRARYDIR )
+ file(TO_CMAKE_PATH ${BOOST_LIBRARYDIR} BOOST_LIBRARYDIR)
+ SET(_boost_LIBRARIES_SEARCH_DIRS
+ ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS})
+ ENDIF( BOOST_LIBRARYDIR )
+
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+ "_boost_LIBRARIES_SEARCH_DIRS = ${_boost_LIBRARIES_SEARCH_DIRS}")
+ endif()
+
FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
***************
*** 457,460 ****
--- 655,660 ----
NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}
***************
*** 466,469 ****
--- 666,671 ----
NAMES ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}
${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}
***************
*** 558,561 ****
--- 760,767 ----
endif (Boost_FOUND)
+ if(Boost_DEBUG)
+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] Boost_FOUND = ${Boost_FOUND}")
+ endif()
+
if (_Boost_MISSING_COMPONENTS)
# We were unable to find some libraries, so generate a sensible
***************
*** 639,654 ****
ENDIF(Boost_FOUND)
- # Under Windows, automatic linking is performed, so no need to specify the libraries.
- IF (WIN32)
- IF (NOT MINGW)
- SET(Boost_LIBRARIES "")
- ENDIF (NOT MINGW)
- ENDIF(WIN32)
-
# show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view
MARK_AS_ADVANCED(Boost_INCLUDE_DIR
Boost_INCLUDE_DIRS
Boost_LIBRARY_DIRS
- Boost_USE_MULTITHREADED
)
ENDIF(_boost_IN_CACHE)
--- 845,852 ----
Index: FindFLTK.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindFLTK.cmake,v
retrieving revision 1.36.14.1
retrieving revision 1.36.14.2
diff -C 2 -d -r1.36.14.1 -r1.36.14.2
*** FindFLTK.cmake 25 Jun 2008 13:51:31 -0000 1.36.14.1
--- FindFLTK.cmake 4 Feb 2009 16:44:01 -0000 1.36.14.2
***************
*** 1,19 ****
# - Find the native FLTK includes and library
! # The following settings are defined
! # FLTK_FLUID_EXECUTABLE, where to find the Fluid tool
! # FLTK_WRAP_UI, This enables the FLTK_WRAP_UI command
! # FLTK_INCLUDE_DIR, where to find include files
! # FLTK_LIBRARIES, list of fltk libraries
! # FLTK_FOUND, Don't use FLTK if false.
! # The following settings should not be used in general.
! # FLTK_BASE_LIBRARY = the full path to fltk.lib
! # FLTK_GL_LIBRARY = the full path to fltk_gl.lib
! # FLTK_FORMS_LIBRARY = the full path to fltk_forms.lib
! # FLTK_IMAGES_LIBRARY = the full path to fltk_images.lib
! IF (FLTK_INCLUDE_DIR)
! # Already in cache, be silent
! SET(FLTK_FIND_QUIETLY TRUE)
! ENDIF (FLTK_INCLUDE_DIR)
# Platform dependent libraries required by FLTK
--- 1,36 ----
# - Find the native FLTK includes and library
! #
! # By default FindFLTK.cmake will search for all of the FLTK components and
! # add them to the FLTK_LIBRARIES variable.
! #
! # You can limit the components which get placed in FLTK_LIBRARIES by
! # defining one or more of the following three options:
! #
! # FLTK_SKIP_OPENGL, set to true to disable searching for opengl and
! # the FLTK GL library
! # FLTK_SKIP_FORMS, set to true to disable searching for fltk_forms
! # FLTK_SKIP_IMAGES, set to true to disable searching for fltk_images
! #
! # FLTK_SKIP_FLUID, set to true if the fluid binary need not be present
! # at build time
! #
! # The following variables will be defined:
! # FLTK_FOUND, True if all components not skipped were found
! # FLTK_INCLUDE_DIR, where to find include files
! # FLTK_LIBRARIES, list of fltk libraries you should link against
! # FLTK_FLUID_EXECUTABLE, where to find the Fluid tool
! # FLTK_WRAP_UI, This enables the FLTK_WRAP_UI command
! #
! # The following cache variables are assigned but should not be used.
! # See the FLTK_LIBRARIES variable instead.
! #
! # FLTK_BASE_LIBRARY = the full path to fltk.lib
! # FLTK_GL_LIBRARY = the full path to fltk_gl.lib
! # FLTK_FORMS_LIBRARY = the full path to fltk_forms.lib
! # FLTK_IMAGES_LIBRARY = the full path to fltk_images.lib
! IF(NOT FLTK_SKIP_OPENGL)
! FIND_PACKAGE(OpenGL)
! ENDIF()
# Platform dependent libraries required by FLTK
***************
*** 88,91 ****
--- 105,110 ----
# Read from the CMakeSetup registry entries. It is likely that
# FLTK will have been recently built.
+ # TODO: Is this really a good idea? I can already hear the user screaming, "But
+ # it worked when I configured the build LAST week!"
[HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild1]
[HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\Settings\\StartPath;WhereBuild2]
***************
*** 114,118 ****
# Fluid
! IF(FLUID_COMMAND)
SET(FLTK_FLUID_EXECUTABLE ${FLUID_COMMAND} CACHE FILEPATH "Fluid executable")
ELSE(FLUID_COMMAND)
--- 133,137 ----
# Fluid
! IF(FLUID_COMMAND)
SET(FLTK_FLUID_EXECUTABLE ${FLUID_COMMAND} CACHE FILEPATH "Fluid executable")
ELSE(FLUID_COMMAND)
***************
*** 173,182 ****
ENDIF(FLTK_FLUID_EXECUTABLE)
SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH}
/usr/local/fltk
/usr/X11R6/include
)
! FIND_PATH(FLTK_INCLUDE_DIR FL/Fl.h ${FLTK_INCLUDE_SEARCH_PATH})
SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH}
--- 192,236 ----
ENDIF(FLTK_FLUID_EXECUTABLE)
+ #
+ # Try to find FLTK include dir using fltk-config
+ #
+ IF(UNIX)
+ # Use fltk-config to generate a list of possible include directories
+ FIND_PROGRAM(FLTK_CONFIG_SCRIPT fltk-config PATHS ${FLTK_BIN_DIR})
+ IF(FLTK_CONFIG_SCRIPT)
+ IF(NOT FLTK_INCLUDE_DIR)
+ EXEC_PROGRAM(${FLTK_CONFIG_SCRIPT} ARGS --cxxflags OUTPUT_VARIABLE FLTK_CXXFLAGS)
+ IF(FLTK_CXXFLAGS)
+ STRING(REGEX MATCHALL "-I[^ ]*" _fltk_temp_dirs ${FLTK_CXXFLAGS})
+ STRING(REPLACE "-I" "" _fltk_temp_dirs "${_fltk_temp_dirs}")
+ FOREACH(_dir ${_fltk_temp_dirs})
+ STRING(STRIP ${_dir} _output)
+ LIST(APPEND _FLTK_POSSIBLE_INCLUDE_DIRS ${_output})
+ ENDFOREACH()
+ ENDIF(FLTK_CXXFLAGS)
+ ENDIF()
+ ENDIF()
+ ENDIF()
+
SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH}
/usr/local/fltk
/usr/X11R6/include
+ ${_FLTK_POSSIBLE_INCLUDE_DIRS}
)
! FIND_PATH(FLTK_INCLUDE_DIR
! NAMES FL/Fl.h FL/Fl.H # fltk 1.1.9 has Fl.H (#8376)
! PATHS ${FLTK_INCLUDE_SEARCH_PATH})
!
! #
! # Try to find FLTK library
! IF(UNIX)
! IF(FLTK_CONFIG_SCRIPT)
! EXEC_PROGRAM(${FLTK_CONFIG_SCRIPT} ARGS --libs OUTPUT_VARIABLE _FLTK_POSSIBLE_LIBS)
! IF(_FLTK_POSSIBLE_LIBS)
! GET_FILENAME_COMPONENT(_FLTK_POSSIBLE_LIBRARY_DIR ${_FLTK_POSSIBLE_LIBS} PATH)
! ENDIF()
! ENDIF()
! ENDIF()
SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH}
***************
*** 184,187 ****
--- 238,242 ----
/usr/X11R6/lib
${FLTK_INCLUDE_DIR}/lib
+ ${_FLTK_POSSIBLE_LIBRARY_DIR}
)
***************
*** 197,201 ****
# Find the extra libraries needed for the fltk_images library.
IF(UNIX)
- FIND_PROGRAM(FLTK_CONFIG_SCRIPT fltk-config PATHS ${FLTK_BIN_DIR})
IF(FLTK_CONFIG_SCRIPT)
EXEC_PROGRAM(${FLTK_CONFIG_SCRIPT} ARGS --use-images --ldflags
--- 252,255 ----
***************
*** 216,232 ****
ENDIF(FLTK_BUILT_WITH_CMAKE)
! SET(FLTK_FOUND 1)
! FOREACH(var FLTK_FLUID_EXECUTABLE FLTK_INCLUDE_DIR
! FLTK_BASE_LIBRARY FLTK_GL_LIBRARY
! FLTK_FORMS_LIBRARY FLTK_IMAGES_LIBRARY)
! IF(NOT ${var})
! SET(FLTK_FOUND 0)
! ENDIF(NOT ${var})
! ENDFOREACH(var)
IF(FLTK_FOUND)
- SET(FLTK_LIBRARIES ${FLTK_IMAGES_LIBRARY} ${FLTK_IMAGES_LIBS} ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY}
- ${FLTK_FORMS_LIBRARY} )
IF(APPLE)
SET(FLTK_LIBRARIES ${FLTK_PLATFORM_DEPENDENT_LIBS} ${FLTK_LIBRARIES})
--- 270,296 ----
ENDIF(FLTK_BUILT_WITH_CMAKE)
+ # Append all of the required libraries together (by default, everything)
+ SET(FLTK_LIBRARIES)
+ IF(NOT FLTK_SKIP_IMAGES)
+ LIST(APPEND FLTK_LIBRARIES ${FLTK_IMAGES_LIBRARY})
+ ENDIF()
+ IF(NOT FLTK_SKIP_FORMS)
+ LIST(APPEND FLTK_LIBRARIES ${FLTK_FORMS_LIBRARY})
+ ENDIF()
+ IF(NOT FLTK_SKIP_OPENGL)
+ LIST(APPEND FLTK_LIBRARIES ${FLTK_GL_LIBRARY} ${OPENGL_gl_LIBRARY})
+ LIST(APPEND FLTK_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
+ LIST(REMOVE_DUPLICATES FLTK_INCLUDE_DIR)
+ ENDIF()
+ LIST(APPEND FLTK_LIBRARIES ${FLTK_BASE_LIBRARY})
! INCLUDE(FindPackageHandleStandardArgs)
! IF(FLTK_SKIP_FLUID)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR)
! ELSE()
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR FLTK_FLUID_EXECUTABLE)
! ENDIF()
IF(FLTK_FOUND)
IF(APPLE)
SET(FLTK_LIBRARIES ${FLTK_PLATFORM_DEPENDENT_LIBS} ${FLTK_LIBRARIES})
***************
*** 242,245 ****
ENDIF(FLTK_FOUND)
- INCLUDE(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR)
--- 306,307 ----
Index: FindosgViewer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgViewer.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgViewer.cmake 13 Jun 2008 12:55:16 -0000 1.2.2.1
--- FindosgViewer.cmake 4 Feb 2009 16:44:16 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osgViewer
# This module defines
! # OSGVIEWER_LIBRARY
! # OSGVIEWER_FOUND, if false, do not try to link to osgViewer
! # OSGVIEWER_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osgViewer
# This module defines
! #
! # OSGVIEWER_FOUND - Was osgViewer found?
! # OSGVIEWER_INCLUDE_DIR - Where to find the headers
! # OSGVIEWER_LIBRARIES - The libraries to link for osgViewer (use this)
! #
! # OSGVIEWER_LIBRARY - The osgViewer library
! # OSGVIEWER_LIBRARY_DEBUG - The osgViewer debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgViewer/Viewer>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGVIEWER_INCLUDE_DIR osgViewer/Viewer
! HINTS
! $ENV{OSGVIEWER_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGVIEWER_LIBRARY
! NAMES osgViewer
! HINTS
! $ENV{OSGVIEWER_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGVIEWER_FOUND "NO")
! IF(OSGVIEWER_LIBRARY AND OSGVIEWER_INCLUDE_DIR)
! SET(OSGVIEWER_FOUND "YES")
! ENDIF(OSGVIEWER_LIBRARY AND OSGVIEWER_INCLUDE_DIR)
--- 30,38 ----
# #include <osgViewer/Viewer>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGVIEWER osgViewer/Viewer)
! OSG_FIND_LIBRARY(OSGVIEWER osgViewer)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGVIEWER DEFAULT_MSG
+ OSGVIEWER_LIBRARY OSGVIEWER_INCLUDE_DIR)
Index: FindosgIntrospection.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgIntrospection.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgIntrospection.cmake 13 Jun 2008 12:55:16 -0000 1.2.2.1
--- FindosgIntrospection.cmake 4 Feb 2009 16:44:13 -0000 1.2.2.2
***************
*** 10,18 ****
# use the FindOpenSceneGraph.cmake instead of the Findosg*.cmake modules.
#
! # Locate osgIntrospection
# This module defines
! # OSGINTROSPECTION_LIBRARY
! # OSGINTROSPECTION_FOUND, if false, do not try to link to osgIntrospection
! # OSGINTROSPECTION_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 10,22 ----
# use the FindOpenSceneGraph.cmake instead of the Findosg*.cmake modules.
#
! # Locate osgINTROSPECTION
# This module defines
! #
! # OSGINTROSPECTION_FOUND - Was osgIntrospection found?
! # OSGINTROSPECTION_INCLUDE_DIR - Where to find the headers
! # OSGINTROSPECTION_LIBRARIES - The libraries to link for osgIntrospection (use this)
! #
! # OSGINTROSPECTION_LIBRARY - The osgIntrospection library
! # OSGINTROSPECTION_LIBRARY_DEBUG - The osgIntrospection debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgIntrospection/Reflection>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGINTROSPECTION_INCLUDE_DIR osgIntrospection/Reflection
! HINTS
! $ENV{OSGINTROSPECTION_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGINTROSPECTION_LIBRARY
! NAMES osgIntrospection
! HINTS
! $ENV{OSGINTROSPECTION_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGINTROSPECTION_FOUND "NO")
! IF(OSGINTROSPECTION_LIBRARY AND OSGINTROSPECTION_INCLUDE_DIR)
! SET(OSGINTROSPECTION_FOUND "YES")
! ENDIF(OSGINTROSPECTION_LIBRARY AND OSGINTROSPECTION_INCLUDE_DIR)
--- 30,38 ----
# #include <osgIntrospection/Reflection>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGINTROSPECTION osgIntrospection/Reflection)
! OSG_FIND_LIBRARY(OSGINTROSPECTION osgIntrospection)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGINTROSPECTION DEFAULT_MSG
+ OSGINTROSPECTION_LIBRARY OSGINTROSPECTION_INCLUDE_DIR)
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96.2.18
retrieving revision 1.96.2.19
diff -C 2 -d -r1.96.2.18 -r1.96.2.19
*** FindQt4.cmake 31 Dec 2008 15:14:19 -0000 1.96.2.18
--- FindQt4.cmake 4 Feb 2009 16:44:02 -0000 1.96.2.19
***************
*** 528,532 ****
FIND_PATH(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR QDesignerComponents
PATHS
! ${QT_INCLUDE_DIR}/QtDesigner
${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
NO_DEFAULT_PATH
--- 528,532 ----
FIND_PATH(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR QDesignerComponents
PATHS
! ${QT_HEADERS_DIR}/QtDesigner
${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
NO_DEFAULT_PATH
***************
*** 536,540 ****
FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QAssistantClient
PATHS
! ${QT_INCLUDE_DIR}/QtAssistant
${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
NO_DEFAULT_PATH
--- 536,540 ----
FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QAssistantClient
PATHS
! ${QT_HEADERS_DIR}/QtAssistant
${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
NO_DEFAULT_PATH
***************
*** 544,548 ****
FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
PATHS
! ${QT_INCLUDE_DIR}/QtAssistant
${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
NO_DEFAULT_PATH
--- 544,548 ----
FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
PATHS
! ${QT_HEADERS_DIR}/QtAssistant
${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
NO_DEFAULT_PATH
***************
*** 592,595 ****
--- 592,598 ----
CHECK_SYMBOL_EXISTS(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS)
CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC)
+ IF(Q_WS_MAC)
+ CHECK_SYMBOL_EXISTS(QT_MAC_USE_COCOA "QtCore/qconfig.h" QT_MAC_USE_COCOA)
+ ENDIF(Q_WS_MAC)
IF (QT_QTCOPY_REQUIRED)
Index: FindosgManipulator.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgManipulator.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgManipulator.cmake 13 Jun 2008 12:55:16 -0000 1.2.2.1
--- FindosgManipulator.cmake 4 Feb 2009 16:44:13 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osgManipulator
# This module defines
! # OSG_LIBRARY
! # OSGMANIPULATOR_FOUND, if false, do not try to link to osgManipulator
! # OSGMANIPULATOR_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osgManipulator
# This module defines
! #
! # OSGMANIPULATOR_FOUND - Was osgManipulator found?
! # OSGMANIPULATOR_INCLUDE_DIR - Where to find the headers
! # OSGMANIPULATOR_LIBRARIES - The libraries to link for osgManipulator (use this)
! #
! # OSGMANIPULATOR_LIBRARY - The osgManipulator library
! # OSGMANIPULATOR_LIBRARY_DEBUG - The osgManipulator debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgManipulator/TrackballDragger>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGMANIPULATOR_INCLUDE_DIR osgManipulator/TrackballDragger
! HINTS
! $ENV{OSGMANIPULATOR_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGMANIPULATOR_LIBRARY
! NAMES osgManipulator
! HINTS
! $ENV{OSGMANIPULATOR_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGMANIPULATOR_FOUND "NO")
! IF(OSGMANIPULATOR_LIBRARY AND OSGMANIPULATOR_INCLUDE_DIR)
! SET(OSGMANIPULATOR_FOUND "YES")
! ENDIF(OSGMANIPULATOR_LIBRARY AND OSGMANIPULATOR_INCLUDE_DIR)
--- 30,38 ----
# #include <osgManipulator/TrackballDragger>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGMANIPULATOR osgManipulator/TrackballDragger)
! OSG_FIND_LIBRARY(OSGMANIPULATOR osgManipulator)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGMANIPULATOR DEFAULT_MSG
+ OSGMANIPULATOR_LIBRARY OSGMANIPULATOR_INCLUDE_DIR)
Index: FindosgSim.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindosgSim.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** FindosgSim.cmake 13 Jun 2008 12:55:16 -0000 1.2.2.1
--- FindosgSim.cmake 4 Feb 2009 16:44:13 -0000 1.2.2.2
***************
*** 12,18 ****
# Locate osgSim
# This module defines
! # OSGSIM_LIBRARY
! # OSGSIM_FOUND, if false, do not try to link to osgSim
! # OSGSIM_INCLUDE_DIR, where to find the headers
#
# $OSGDIR is an environment variable that would
--- 12,22 ----
# Locate osgSim
# This module defines
! #
! # OSGSIM_FOUND - Was osgSim found?
! # OSGSIM_INCLUDE_DIR - Where to find the headers
! # OSGSIM_LIBRARIES - The libraries to link for osgSim (use this)
! #
! # OSGSIM_LIBRARY - The osgSim library
! # OSGSIM_LIBRARY_DEBUG - The osgSim debug library
#
# $OSGDIR is an environment variable that would
***************
*** 26,70 ****
# #include <osgSim/ImpostorSprite>
! # Try the user's environment request before anything else.
! FIND_PATH(OSGSIM_INCLUDE_DIR osgSim/ImpostorSprite
! HINTS
! $ENV{OSGSIM_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES include
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw # Fink
! /opt/local # DarwinPorts
! /opt/csw # Blastwave
! /opt
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
! [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
! )
!
! FIND_LIBRARY(OSGSIM_LIBRARY
! NAMES osgSim
! HINTS
! $ENV{OSGSIM_DIR}
! $ENV{OSG_DIR}
! $ENV{OSGDIR}
! PATH_SUFFIXES lib64 lib
! PATHS
! ~/Library/Frameworks
! /Library/Frameworks
! /usr/local
! /usr
! /sw
! /opt/local
! /opt/csw
! /opt
! )
!
! SET(OSGSIM_FOUND "NO")
! IF(OSGSIM_LIBRARY AND OSGSIM_INCLUDE_DIR)
! SET(OSGSIM_FOUND "YES")
! ENDIF(OSGSIM_LIBRARY AND OSGSIM_INCLUDE_DIR)
--- 30,38 ----
# #include <osgSim/ImpostorSprite>
! include(Findosg_functions)
! OSG_FIND_PATH (OSGSIM osgSim/ImpostorSprite)
! OSG_FIND_LIBRARY(OSGSIM osgSim)
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGSIM DEFAULT_MSG
+ OSGSIM_LIBRARY OSGSIM_INCLUDE_DIR)
--- NEW FILE: FindosgWidget.cmake ---
# This is part of the Findosg* suite used to find OpenSceneGraph components.
# Each component is separate and you must opt in to each module. You must
# also opt into OpenGL and OpenThreads (and Producer if needed) as these
# modules won't do it for you. This is to allow you control over your own
# system piece by piece in case you need to opt out of certain components
# or change the Find behavior for a particular module (perhaps because the
# default FindOpenGL.cmake module doesn't work with your system as an
# example).
# If you want to use a more convenient module that includes everything,
# use the FindOpenSceneGraph.cmake instead of the Findosg*.cmake modules.
#
# Locate osgWidget
# This module defines
#
# OSGWIDGET_FOUND - Was osgWidget found?
# OSGWIDGET_INCLUDE_DIR - Where to find the headers
# OSGWIDGET_LIBRARIES - The libraries to link for osgWidget (use this)
#
# OSGWIDGET_LIBRARY - The osgWidget library
# OSGWIDGET_LIBRARY_DEBUG - The osgWidget debug library
#
# $OSGDIR is an environment variable that would
# correspond to the ./configure --prefix=$OSGDIR
# used in building osg.
#
# FindosgWidget.cmake tweaked from Findosg* suite as created by Eric Wing.
# Header files are presumed to be included like
# #include <osg/PositionAttitudeTransform>
# #include <osgWidget/Widget>
include(Findosg_functions)
OSG_FIND_PATH (OSGWIDGET osgWidget/Widget)
OSG_FIND_LIBRARY(OSGWIDGET osgWidget)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGWIDGET DEFAULT_MSG
OSGWIDGET_LIBRARY OSGWIDGET_INCLUDE_DIR)
--- NEW FILE: FindosgAnimation.cmake ---
# This is part of the Findosg* suite used to find OpenSceneGraph components.
# Each component is separate and you must opt in to each module. You must
# also opt into OpenGL and OpenThreads (and Producer if needed) as these
# modules won't do it for you. This is to allow you control over your own
# system piece by piece in case you need to opt out of certain components
# or change the Find behavior for a particular module (perhaps because the
# default FindOpenGL.cmake module doesn't work with your system as an
# example).
# If you want to use a more convenient module that includes everything,
# use the FindOpenSceneGraph.cmake instead of the Findosg*.cmake modules.
#
# Locate osgAnimation
# This module defines
#
# OSGANIMATION_FOUND - Was osgAnimation found?
# OSGANIMATION_INCLUDE_DIR - Where to find the headers
# OSGANIMATION_LIBRARIES - The libraries to link against for the OSG (use this)
#
# OSGANIMATION_LIBRARY - The OSG library
# OSGANIMATION_LIBRARY_DEBUG - The OSG debug library
#
# $OSGDIR is an environment variable that would
# correspond to the ./configure --prefix=$OSGDIR
# used in building osg.
#
# Created by Eric Wing.
# Header files are presumed to be included like
# #include <osg/PositionAttitudeTransform>
# #include <osgAnimation/Animation>
include(Findosg_functions)
OSG_FIND_PATH (OSGANIMATION osgAnimation/Animation)
OSG_FIND_LIBRARY(OSGANIMATION osgAnimation)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSGANIMATION DEFAULT_MSG
OSGANIMATION_LIBRARY OSGANIMATION_INCLUDE_DIR)
More information about the Cmake-commits
mailing list