From c989b98f2e6784c80b92d394155684fc32a30014 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 15 Jul 2008 19:02:20 +0000 Subject: [PATCH] From Gino van den Bergen, "The VRML plugin in the current 2.5.4 release will not compile under VC8.0 when the project file is generated using CMake 2.6. The attached CMakeLists.txt will fix this problem. The file replaces the CMakeLists.txt file in src/osgPlugins/vrml. NB: It is assumed that the antlr and regex libs are located in $(OPENVRML_DIR)/lib. " --- src/osgPlugins/vrml/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osgPlugins/vrml/CMakeLists.txt b/src/osgPlugins/vrml/CMakeLists.txt index a57ce6ca6..b83c437bc 100644 --- a/src/osgPlugins/vrml/CMakeLists.txt +++ b/src/osgPlugins/vrml/CMakeLists.txt @@ -1,9 +1,9 @@ IF (WIN32) INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) - 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) + FIND_LIBRARY(OPENVRML_ANTLR_LIBRARY NAMES antlr.lib PATHS $ENV{OPENVRML_DIR}/lib) + FIND_LIBRARY(OPENVRML_ANTLR_LIBRARY_DEBUG NAMES antlrd.lib PATHS $ENV{OPENVRML_DIR}/lib) + FIND_LIBRARY(OPENVRML_REGEX_LIBRARY NAMES regex.lib PATHS $ENV{OPENVRML_DIR}/lib) + FIND_LIBRARY(OPENVRML_REGEX_LIBRARY_DEBUG NAMES regexd.lib PATHS $ENV{OPENVRML_DIR}/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)