diff options
Diffstat (limited to 'Modules/FindProducer.cmake')
| -rw-r--r-- | Modules/FindProducer.cmake | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/Modules/FindProducer.cmake b/Modules/FindProducer.cmake index 39a9436..3099062 100644 --- a/Modules/FindProducer.cmake +++ b/Modules/FindProducer.cmake @@ -1,18 +1,18 @@ # Though Producer isn't directly part of OpenSceneGraph, its primary user -# is OSG so I consider this part of the Findosg* suite used to find +# is OSG so I consider this part of the Findosg* suite used to find # OpenSceneGraph components. You'll notice that I accept OSGDIR as an # environment path. -# -# Each component is separate and you must opt in to each module. You must -# also opt into OpenGL (and OpenThreads?) as these -# modules won't do it for you. This is to allow you control over your own +# +# Each component is separate and you must opt in to each module. You must +# also opt into OpenGL (and OpenThreads?) 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 Producer # This module defines # PRODUCER_LIBRARY @@ -42,17 +42,15 @@ # #include <Producer/CameraGroup> # Try the user's environment request before anything else. -FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup +find_path(PRODUCER_INCLUDE_DIR Producer/CameraGroup HINTS - $ENV{PRODUCER_DIR} - $ENV{OSG_DIR} - $ENV{OSGDIR} + ENV PRODUCER_DIR + ENV OSG_DIR + ENV OSGDIR PATH_SUFFIXES include PATHS ~/Library/Frameworks /Library/Frameworks - /usr/local/include - /usr/include /sw/include # Fink /opt/local/include # DarwinPorts /opt/csw/include # Blastwave @@ -61,16 +59,14 @@ FIND_PATH(PRODUCER_INCLUDE_DIR Producer/CameraGroup [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include ) -FIND_LIBRARY(PRODUCER_LIBRARY +find_library(PRODUCER_LIBRARY NAMES Producer HINTS - $ENV{PRODUCER_DIR} - $ENV{OSG_DIR} - $ENV{OSGDIR} - PATH_SUFFIXES lib64 lib + ENV PRODUCER_DIR + ENV OSG_DIR + ENV OSGDIR + PATH_SUFFIXES lib PATHS - /usr/local - /usr /sw /opt/local /opt/csw |