Changeset 10336 for OpenSceneGraph/trunk/src/osgPlugins/dae/CMakeLists.txt

Timestamp:

06/12/09 11:41:10 (4 years ago)

Author:

robert

Message:

From Roger James and Robert Osfield, clean up of COLLADA CMake support

Files:

• OpenSceneGraph/trunk/src/osgPlugins/dae/CMakeLists.txt (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgPlugins/dae/CMakeLists.txt

@@ -1 @@
-IF (WIN32)
-    INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4 ${COLLADA_BOOST_INCLUDE_DIR} )
-ELSE ()
-    INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4)
-ENDIF ()
+INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4)
 
 SET(TARGET_SRC
@@ -36 +32 @@
 ENDIF()
 
+ADD_DEFINITIONS(-DNO_BOOST)
+
 IF(COLLADA_USE_STATIC)
     IF(WIN32)
@@ -55 +53 @@
             COLLADA_PCRE_LIBRARY
             COLLADA_BOOST_FILESYSTEM_LIBRARY
-            COLLADA_BOOST_SYSTEM_LIBRARY)    
+            COLLADA_BOOST_SYSTEM_LIBRARY)
     ENDIF()
 ELSE()
     IF(WIN32)
-        ADD_DEFINITIONS(-DDOM_DYNAMIC -DBOOST_ALL_NO_LIB)
-        SET(TARGET_LIBRARIES_VARS
-            COLLADA_DYNAMIC_LIBRARY
-            COLLADA_BOOST_SYSTEM_LIBRARY)
+        ADD_DEFINITIONS(-DDOM_DYNAMIC)
+        SET(TARGET_LIBRARIES_VARS COLLADA_DYNAMIC_LIBRARY)
     ELSE()
         SET(TARGET_LIBRARIES_VARS
-            COLLADA_PCRECPP_LIBRARY
-            COLLADA_PCRE_LIBRARY
-            COLLADA_DYNAMIC_LIBRARY
-            COLLADA_BOOST_FILESYSTEM_LIBRARY
-            COLLADA_BOOST_SYSTEM_LIBRARY)
-    ENDIF() 
+                    COLLADA_DYNAMIC_LIBRARY
+                    COLLADA_BOOST_FILESYSTEM_LIBRARY)
+    ENDIF()
+
 ENDIF()