Changeset 104 for osgVisual

Timestamp:

Jul 29, 2010, 9:55:22 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

File:

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

osgVisual/CMakeLists.txt

@@ -44 +44 @@
 FIND_PACKAGE(OpenSceneGraph 2.9.8 REQUIRED osgViewer OpenThreads osgDB osgTerrain osgGA osgText osgSim osgUtil)
 FIND_PACKAGE(OpenGL REQUIRED)
-IF(UNIX)
-        FIND_PACKAGE(PTHREAD REQUIRED)
-ENDIF(UNIX)
-
 
 
@@ -127 +123 @@
                 SET(SILVERLINING_LICENSEE "Your user name" CACHE STRING "Enter your Silverlining licensee name. If you license available, osgVisual will work with silverlining as 5 minute demo with the default value." )
                 SET(SILVERLINING_LICENSE "Your license code" CACHE STRING "Enter your Silverlining license key. If you license available, osgVisual will work with silverlining as 5 minute demo with the default value." )
-                INCLUDE_DIRECTORIES(${SILVERLINING_INCLUDE_DIR} "include/sky_Silverlining" ${PTHREAD_INCLUDE_DIR} )
+                INCLUDE_DIRECTORIES(${SILVERLINING_INCLUDE_DIR} "include/sky_Silverlining" )
                 ADD_DEFINITIONS( "-DUSE_SKY_SILVERLINING" )
                 ADD_DEFINITIONS( "-DSILVERLINING_LICENSEE=\"${SILVERLINING_LICENSEE}\"" )
@@ -348 +344 @@
 
 # Executable Output 
-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)     # WIN32
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) # UNIX
 ADD_EXECUTABLE(osgVisual ${SOURCES})
 
@@ -360 +357 @@
                 TARGET_LINK_LIBRARIES(osgVisual "winmm.lib")
         ENDIF(WIN32)
-        IF(UNIX)
-                TARGET_LINK_LIBRARIES(osgVisual ${PTHREAD_LIBRARIES})
-        ENDIF(UNIX)
         TARGET_LINK_LIBRARIES(osgVisual debug ${SILVERLINING_LIBRARY_DEBUG} optimized ${SILVERLINING_LIBRARY_RELEASE})
 ENDIF(USE_SKY_SILVERLINING)
@@ -370 +364 @@
 ENDIF(USE_VISTA2D)
 
-IF(USE_CLUSTER_ENET)
+IF(USE_CLUSTER_ENET AND WIN32)
         TARGET_LINK_LIBRARIES(osgVisual "winmm.lib" "ws2_32.lib" )
-ENDIF(USE_CLUSTER_ENET)
+ENDIF(USE_CLUSTER_ENET AND WIN32)
 
 # CMAKE Fix for VS to not prepend build type to path.