FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed the OSGSIM cmake variable to OSGSIM_LIBRARY to be consistent with the rest of the variables.

Browse Source
This commit is contained in:
Robert Osfield
2014-01-06 10:23:31 +00:00
parent 3eddec871a
commit 485776bf18
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeModules/FindOSG.cmake
View File

@@ -1,13 +1,13 @@
# Locate gdal # Locate gdal
# This module defines # This module defines
# OSG_LIBRARY # OSG_LIBRARY
# OSG_FOUND, if false, do not try to link to gdal # OSG_FOUND, if false, do not try to link to gdal
# OSG_INCLUDE_DIR, where to find the headers # OSG_INCLUDE_DIR, where to find the headers
# #
# $OSG_DIR is an environment variable that would # $OSG_DIR is an environment variable that would
# correspond to the ./configure --prefix=$OSG_DIR # correspond to the ./configure --prefix=$OSG_DIR
# #
# Created by Robert Osfield. # Created by Robert Osfield.
FIND_PATH(OSG_INCLUDE_DIR osg/Node FIND_PATH(OSG_INCLUDE_DIR osg/Node
${OSG_DIR}/include ${OSG_DIR}/include
@@ -59,7 +59,7 @@ MACRO(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME)
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
/usr/freeware/lib64 /usr/freeware/lib64
) )
FIND_LIBRARY(${MYLIBRARY} FIND_LIBRARY(${MYLIBRARY}
NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}" NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
PATHS PATHS
@@ -107,7 +107,7 @@ MACRO(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME)
ENDIF(NOT MYLIBRARY) ENDIF(NOT MYLIBRARY)
ENDIF( NOT ${MYLIBRARY}_DEBUG ) ENDIF( NOT ${MYLIBRARY}_DEBUG )
ENDMACRO(FIND_OSG_LIBRARY LIBRARY LIBRARYNAME) ENDMACRO(FIND_OSG_LIBRARY LIBRARY LIBRARYNAME)
FIND_OSG_LIBRARY(OSG_LIBRARY osg) FIND_OSG_LIBRARY(OSG_LIBRARY osg)
@@ -126,7 +126,7 @@ FIND_OSG_LIBRARY(OSGANIMATION_LIBRARY osgAnimation)
FIND_OSG_LIBRARY(OSGPARTICLE_LIBRARY osgParticle) FIND_OSG_LIBRARY(OSGPARTICLE_LIBRARY osgParticle)
FIND_OSG_LIBRARY(OSGSHADOW_LIBRARY osgShadow) FIND_OSG_LIBRARY(OSGSHADOW_LIBRARY osgShadow)
FIND_OSG_LIBRARY(OSGPRESENTATION_LIBRARY osgPresentation) FIND_OSG_LIBRARY(OSGPRESENTATION_LIBRARY osgPresentation)
FIND_OSG_LIBRARY(OSGSIM osgSim) FIND_OSG_LIBRARY(OSGSIM_LIBRARY osgSim)
FIND_OSG_LIBRARY(OPENTHREADS_LIBRARY OpenThreads) FIND_OSG_LIBRARY(OPENTHREADS_LIBRARY OpenThreads)