From c4c165099c1922151c9b86faa97b0c4e9441c17f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 6 Jul 2007 14:07:59 +0000 Subject: [PATCH] From Jea-Sebastien Guay and Robert Osfield, build fixes for Windows --- src/osgPlugins/vrml/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/vrml/CMakeLists.txt b/src/osgPlugins/vrml/CMakeLists.txt index fbcf43711..7e2b1a7be 100644 --- a/src/osgPlugins/vrml/CMakeLists.txt +++ b/src/osgPlugins/vrml/CMakeLists.txt @@ -1,8 +1,13 @@ -INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml ) +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) +ELSE(WIN32) + INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml) + SET(TARGET_LIBRARIES_VARS OPENVRML_LIBRARY) +ENDIF(WIN32) SET(TARGET_SRC ReaderWriterVRML2.cpp ) -SET(TARGET_LIBRARIES_VARS OPENVRML_LIBRARY ) - #### end var setup ### SETUP_PLUGIN(vrml)