Changeset 8591

Show
Ignore:
Timestamp:
07/15/08 21:02:20
Author:
robert
Message:

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.

"

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/src/osgPlugins/vrml/CMakeLists.txt

    r8363 r8591  
    11IF (WIN32) 
    22    INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) 
    3     SET(OPENVRML_ANTLR_LIBRARY       antlr.lib) 
    4     SET(OPENVRML_ANTLR_LIBRARY_DEBUG antlrd.lib) 
    5     SET(OPENVRML_REGEX_LIBRARY       regex.lib) 
    6     SET(OPENVRML_REGEX_LIBRARY_DEBUG regexd.lib) 
     3    FIND_LIBRARY(OPENVRML_ANTLR_LIBRARY NAMES antlr.lib PATHS $ENV{OPENVRML_DIR}/lib) 
     4    FIND_LIBRARY(OPENVRML_ANTLR_LIBRARY_DEBUG NAMES antlrd.lib PATHS $ENV{OPENVRML_DIR}/lib) 
     5    FIND_LIBRARY(OPENVRML_REGEX_LIBRARY NAMES regex.lib PATHS $ENV{OPENVRML_DIR}/lib) 
     6    FIND_LIBRARY(OPENVRML_REGEX_LIBRARY_DEBUG NAMES regexd.lib PATHS $ENV{OPENVRML_DIR}/lib) 
    77    SET(TARGET_LIBRARIES_VARS OPENVRML_ANTLR_LIBRARY OPENVRML_REGEX_LIBRARY OPENVRML_LIBRARY JPEG_LIBRARY PNG_LIBRARY ZLIB_LIBRARY) 
    88    SET(TARGET_EXTERNAL_LIBRARIES Ws2_32.lib)