Changeset 120

Timestamp:

Aug 24, 2010, 9:23:08 PM (14 years ago)

Author:

Torben Dannhauer

Message:

Added dynamic channel processing on the extLinkVCL Mpdule. Added libxml2 to CMakeLists.txt.

File:

• osgVisual/CMakeLists.txt (modified) (5 diffs)

osgVisual/CMakeLists.txt

@@ -35 +35 @@
 
 
-# Get requiered packages
+# Get required packages
 IF(DESTINATION_ARCH STREQUAL "x64")
         SET(OSG_ROOT_BKP $ENV{OSG_ROOT})        # BACKUP old OSG_ROOT
@@ -42 +42 @@
 
 SET(OpenSceneGraph_MARK_AS_ADVANCED ON)
-FIND_PACKAGE(OpenSceneGraph 2.9.8 REQUIRED osgViewer OpenThreads osgDB osgTerrain osgGA osgText osgSim osgUtil)
+FIND_PACKAGE(OpenSceneGraph 2.9.9 REQUIRED osgViewer OpenThreads osgDB osgTerrain osgGA osgText osgSim osgUtil)
 FIND_PACKAGE(OpenGL REQUIRED)
-
 
 
@@ -52 +51 @@
 ENDIF ()
 
-
-
-# Module sky-silverlining - At the moment only for Win32, will be opened to Unix ASAP
+# LIBXML2
+SET(LIBXML2_LIBRARY ../../OpenSceneGraph/3rdParty_x86_x64/${DESTINATION_ARCH}/lib/libxml2 CACHE FILEPATH "Select the libxml2 library to link osgVisual against. REQUIRED!" )
+SET(LIBXML2_INCLUDE ../../OpenSceneGraph/3rdParty_x86_x64/${DESTINATION_ARCH}/include CACHE PATH "Select the libxml2 include path to link osgVisual against. REQUIRED!" )
+INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE} )       
+
+# Module sky-silverlining
 # OPTION( OPTION_VAR "description string" [initial value] )
 IF ( WIN32 )
@@ -97 +99 @@
 ENDIF(WIN32)
 IF(UNIX)
-        
         SET(USE_SKY_SILVERLINING ON CACHE BOOL "Enable to use Sundog-soft's Silverlining SDK for sky & weather")
         IF(USE_SKY_SILVERLINING )
@@ -349 +350 @@
 
 # Linking
-TARGET_LINK_LIBRARIES(osgVisual ${OPENSCENEGRAPH_LIBRARIES} ${OPENGL_LIBRARIES})
+TARGET_LINK_LIBRARIES(osgVisual ${OPENSCENEGRAPH_LIBRARIES} ${OPENGL_LIBRARIES} ${LIBXML2_LIBRARY})