Changeset 183 for osgVisual/trunk/CMakeLists.txt

Timestamp:

Jan 7, 2011, 5:41:45 PM (13 years ago)

Author:

Torben Dannhauer

Message:

XML configuration now works also with dataIO cluster

File:

• osgVisual/trunk/CMakeLists.txt (modified) (6 diffs)

osgVisual/trunk/CMakeLists.txt

@@ -195 +195 @@
 
 # Module cluster
+SET(SOURCES
+        ${SOURCES}
+        include/cluster/dataIO_cluster.h
+        include/cluster/dataIO_clusterDummy.h
+        src/cluster/dataIO_clusterDummy.cpp
+)
 SET(USE_CLUSTER_ASIO_TCP_IOSTREAM OFF CACHE BOOL "Enable to use the Boost ASIO TCP iostream implementation for the cluster interface")
 SET(USE_CLUSTER_ENET ON CACHE BOOL "Enable to use the ENet reliable UDP library implementation for the cluster interface")
@@ -200 +206 @@
                 SET(SOURCES
                         ${SOURCES}
-                        include/cluster/dataIO_cluster.h
                         include/cluster/dataIO_clusterAsioTcpIostream.h
                         src/cluster/dataIO_clusterAsioTcpIostream.cpp
@@ -218 +223 @@
                 SET(SOURCES
                         ${SOURCES}
-                        include/cluster/dataIO_cluster.h
                         include/cluster/dataIO_clusterENet.h
                         src/cluster/dataIO_clusterENet.cpp
@@ -242 +246 @@
                         include/cluster/enet/win32.h
                 )
-                ADD_DEFINITIONS( "-DUSE_CLUSTER_ENET" )
-                
-ENDIF()
-
-IF(NOT USE_CLUSTER_ASIO_TCP_IOSTREAM AND NOT USE_CLUSTER_ENET)
-                SET(SOURCES
-                        ${SOURCES}
-                        include/cluster/dataIO_cluster.h
-                        include/cluster/dataIO_clusterDummy.h
-                        src/cluster/dataIO_clusterDummy.cpp
-                )
-                ADD_DEFINITIONS( "-DUSE_CLUSTER_DUMMY" )
-ENDIF()
+                ADD_DEFINITIONS( "-DUSE_CLUSTER_ENET" ) 
+ENDIF()
+
+
 
 
@@ -260 +255 @@
 SET(SOURCES
         ${SOURCES}
+        include/extLink/dataIO_extLinkDummy.h
+        src/extLink/dataIO_extLinkDummy.cpp
         include/extLink/dataIO_extLink.h
         include/extLink/manip_extLink.h
@@ -277 +274 @@
                 #Linking: VCL uses #pragma to link, no need for linking configuration in CMAKE
         ELSE(USE_EXTLINK_VCL)
-                SET(SOURCES
-                        ${SOURCES}
-                        include/extLink/dataIO_extLinkDummy.h
-                        src/extLink/dataIO_extLinkDummy.cpp
-                )
                 UNSET(EXTLINK_VCL_INCLUDE_DIR CACHE)
-                ADD_DEFINITIONS( "-DUSE_EXTLINK_DUMMY" )
         ENDIF(USE_EXTLINK_VCL)
 ELSE(WIN32)
         UNSET(EXTLINK_VCL_INCLUDE_DIR CACHE)
-        SET(SOURCES
-                ${SOURCES}
-                include/extLink/dataIO_extLinkDummy.h
-                src/extLink/dataIO_extLinkDummy.cpp
-        )
-        ADD_DEFINITIONS( "-DUSE_EXTLINK_DUMMY" )
+
+
 ENDIF(WIN32)