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

From Jean-Sebastien Guay, "Attached you will find an expanded FindOpenVRML.cmake file, as well as a fixed CMakeLists.txt file for the VRML plugin ."

Browse Source
This commit is contained in:
Robert Osfield
2007-09-26 14:44:22 +00:00
parent af498b6e1f
commit 5c007029ae
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeModules/FindOpenVRML.cmake
View File

@@ -8,6 +8,7 @@
# correspond to the ./configure --prefix=$OPENVRML_DIR
#
# Created by Robert Osfield.
# Modified for the debug library by Jean-S<>bastien Guay.
FIND_PATH(OPENVRML_INCLUDE_DIR openvrml/openvrml/common.h
$ENV{OPENVRML_DIR}/include
@@ -47,6 +48,26 @@ FIND_LIBRARY(OPENVRML_LIBRARY
/usr/freeware/lib64
)
FIND_LIBRARY(OPENVRML_LIBRARY_DEBUG
NAMES openvrmld
PATHS
$ENV{OPENVRML_DIR}/lib
$ENV{OPENVRML_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
)
SET(OPENVRML_FOUND "NO")
IF(OPENVRML_LIBRARY AND OPENVRML_INCLUDE_DIR)
SET(OPENVRML_FOUND "YES")

8
src/osgPlugins/vrml/CMakeLists.txt
View File

@@ -1,7 +1,11 @@
IF (WIN32)
INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
SET(TARGET_LIBRARIES_VARS OPENVRML_LIBRARY JPEG_LIBRARY PNG_LIBRARY ZLIB_LIBRARY)
SET(TARGET_ADDED_LIBRARIES antlr.lib regex.lib Ws2_32.lib)
SET(OPENVRML_ANTLR_LIBRARY antlr.lib)
SET(OPENVRML_ANTLR_LIBRARY_DEBUG antlrd.lib)
SET(OPENVRML_REGEX_LIBRARY regex.lib)
SET(OPENVRML_REGEX_LIBRARY_DEBUG regexd.lib)
SET(TARGET_LIBRARIES_VARS OPENVRML_ANTLR_LIBRARY OPENVRML_REGEX_LIBRARY OPENVRML_LIBRARY JPEG_LIBRARY PNG_LIBRARY ZLIB_LIBRARY)
SET(TARGET_EXTERNAL_LIBRARIES Ws2_32.lib)
ELSE(WIN32)
INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml)
SET(TARGET_LIBRARIES_VARS OPENVRML_LIBRARY)