From 5c007029ae87b302ff5286278978898574f6be33 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 26 Sep 2007 14:44:22 +0000
Subject: [PATCH] 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 ."

---
 CMakeModules/FindOpenVRML.cmake    | 21 +++++++++++++++++++++
 src/osgPlugins/vrml/CMakeLists.txt |  8 ++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/CMakeModules/FindOpenVRML.cmake b/CMakeModules/FindOpenVRML.cmake
index 8f9c3037a..df500b260 100644
--- a/CMakeModules/FindOpenVRML.cmake
+++ b/CMakeModules/FindOpenVRML.cmake
@@ -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")
diff --git a/src/osgPlugins/vrml/CMakeLists.txt b/src/osgPlugins/vrml/CMakeLists.txt
index 7e2b1a7be..10c885545 100644
--- a/src/osgPlugins/vrml/CMakeLists.txt
+++ b/src/osgPlugins/vrml/CMakeLists.txt
@@ -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)