Changeset 60 for osgVisual/CMakeLists.txt

Timestamp:

Jun 1, 2010, 4:00:07 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

File:

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

osgVisual/CMakeLists.txt

@@ -176 +176 @@
                 )
                 ADD_DEFINITIONS( "-DUSE_CLUSTER_ASIO_TCP_IOSTREAM" )
-                #SET(BOOST_ASIO_LIBRARY_RELEASE ../3rdParty_x86_x64/include/bo.lib CACHE FILEPATH "Select the release library of Boost ASIO to link against." )
-                #SET(BOOST_ASIO_LIBRARY_DEBUG ../3rdParty_x86_x64/lib\x86/adsda.lib CACHE FILEPATH "Select the debug library of Boost ASIO to link against." )
+                ADD_DEFINITIONS( "-D_WIN32_WINNT=0x0501" )
+                SET(BOOST_LIBRARY_PATH "../../3rdParty_x86_x64/lib/${DESTINATION_ARCH}/" CACHE PATH "Select the library folder of Boost libraries to link against." )
                 SET(BOOST_INCLUDE_DIR "../../3rdParty_x86_x64/include/boost-1.43.0/" CACHE PATH "Enter the path to the the include directory of Boost" )
+                INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIR})
+                LINK_DIRECTORIES(${BOOST_LIBRARY_PATH})
 ELSE()
-                #UNSET(BOOST_ASIO_LIBRARY_RELEASE CACHE)
-                #UNSET(BOOST_ASIO_LIBRARY_DEBUG CACHE)
+                UNSET(BOOST_LIBRARY_PATH CACHE)
                 UNSET(BOOST_ASIO_INCLUDE_DIR CACHE)     
 ENDIF()
@@ -277 +278 @@
 )
 
-INCLUDE_DIRECTORIES(include/core include/util include/draw2D include/draw3D include/object include/manip_ObjectMounted include/manip_Spacemouse)
+INCLUDE_DIRECTORIES(include/core include/util include/draw2D include/draw3D include/object include/manip_ObjectMounted)
 INCLUDE_DIRECTORIES(include/dataIO include/cluster include/extLink ${OPENSCENEGRAPH_INCLUDE_DIRS} .)