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

From Guillaume Millet, "Please find in attachment a small improvement to the pfb plugin

Browse Source 
CmakeLists.txt and to the FindPerformer.cmake module.

Under Windows libs are: libpf.lib (we need to add the lib prefix) and
libpfdu-util.lib (libpfdu and libpfutil are compiled into one lib)
We need to add PFROOT to the search path for libs and includes (default
environment variable for Performer path)
And at last we need to put PFROOT/include and PFROOT/include/Performer
as include dir for compiling."
This commit is contained in:
Robert Osfield 2007-09-07 10:15:39 +00:00
parent 9704ded891
commit 00e00f4e00
2 changed files with 57 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
CMakeModules/FindPerformer.cmake
View File

@ -10,6 +10,8 @@
# Created by Robert Osfield. # Created by Robert Osfield.
FIND_PATH(PERFORMER_INCLUDE_DIR Performer/pfdu.h FIND_PATH(PERFORMER_INCLUDE_DIR Performer/pfdu.h
$ENV{PFROOT}/include
$ENV{PFROOT}
$ENV{PERFORMER_DIR}/include $ENV{PERFORMER_DIR}/include
$ENV{PERFORMER_DIR} $ENV{PERFORMER_DIR}
$ENV{OSGDIR}/include $ENV{OSGDIR}/include
@ -27,9 +29,12 @@ FIND_PATH(PERFORMER_INCLUDE_DIR Performer/pfdu.h
/usr/freeware/include /usr/freeware/include
) )
FIND_LIBRARY(PERFORMER_LIBRARY IF(MSVC)
NAMES pf FIND_LIBRARY(PERFORMER_LIBRARY
NAMES libpf
PATHS PATHS
$ENV{PFROOT}/lib
$ENV{PFROOT}
$ENV{PERFORMER_DIR}/lib $ENV{PERFORMER_DIR}/lib
$ENV{PERFORMER_DIR} $ENV{PERFORMER_DIR}
$ENV{OSGDIR}/lib $ENV{OSGDIR}/lib
@ -45,7 +50,30 @@ FIND_LIBRARY(PERFORMER_LIBRARY
/opt/lib /opt/lib
[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
) )
ELSE(MSVC)
FIND_LIBRARY(PERFORMER_LIBRARY
NAMES pf
PATHS
$ENV{PFROOT}/lib
$ENV{PFROOT}
$ENV{PERFORMER_DIR}/lib
$ENV{PERFORMER_DIR}
$ENV{OSGDIR}/lib
$ENV{OSGDIR}
$ENV{OSG_ROOT}/lib
~/Library/Frameworks
/Library/Frameworks
/usr/local/lib
/usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
/opt/lib
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
/usr/freeware/lib64
)
ENDIF(MSVC)
SET(PERFORMER_FOUND "NO") SET(PERFORMER_FOUND "NO")
IF(PERFORMER_LIBRARY AND PERFORMER_INCLUDE_DIR) IF(PERFORMER_LIBRARY AND PERFORMER_INCLUDE_DIR)

12
src/osgPlugins/pfb/CMakeLists.txt
View File

@ -1,4 +1,4 @@
INCLUDE_DIRECTORIES( ${PERFORMER_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${PERFORMER_INCLUDE_DIR} ${PERFORMER_INCLUDE_DIR}/Performer )
SET(TARGET_SRC SET(TARGET_SRC
ReaderWriterPFB.cpp ReaderWriterPFB.cpp
@ -9,9 +9,15 @@ SET(TARGET_H
ConvertFromPerformer.h ConvertFromPerformer.h
) )
SET(TARGET_EXTERNAL_LIBRARIES IF(MSVC)
SET(TARGET_EXTERNAL_LIBRARIES
libpfdu-util
)
ELSE(MSVC)
SET(TARGET_EXTERNAL_LIBRARIES
pfdu pfutil pfdu pfutil
) )
ENDIF(MSVC)
SET(TARGET_LIBRARIES_VARS PERFORMER_LIBRARY ) SET(TARGET_LIBRARIES_VARS PERFORMER_LIBRARY )