Changeset 103

Timestamp:

Jul 29, 2010, 9:39:24 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

File:

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

osgVisual/CMakeLists.txt

@@ -24 +24 @@
 #SET(CMAKE_MODULE_PATH "${osgVisual_SOURCE_DIR}/../CMakeModules;${CMAKE_MODULE_PATH}")
 
-#INCLUDE( CheckTypeSize )
-#CHECK_TYPE_SIZE( "void*" SIZE_OF_VOID_P )
+# Check Architecture
 IF( CMAKE_SIZEOF_VOID_P EQUAL 4 )
     MESSAGE( STATUS "32 bit architecture detected" )
@@ -36 +35 @@
 
 
-# Get OSG Settings
+# Get requiered packages
 IF(DESTINATION_ARCH STREQUAL "x64")
         SET(OSG_ROOT_BKP $ENV{OSG_ROOT})        # BACKUP old OSG_ROOT
@@ -45 +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)
+
+
+
 
 IF(DESTINATION_ARCH STREQUAL "x64")
@@ -122 +127 @@
                 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)
+                INCLUDE_DIRECTORIES(${SILVERLINING_INCLUDE_DIR} "include/sky_Silverlining" ${PTHREAD_INCLUDE_DIR} )
                 ADD_DEFINITIONS( "-DUSE_SKY_SILVERLINING" )
                 ADD_DEFINITIONS( "-DSILVERLINING_LICENSEE=\"${SILVERLINING_LICENSEE}\"" )
@@ -348 +353 @@
 
 # Linking
-#IF(WIN32)
-#       TARGET_LINK_LIBRARIES(osgVisual ${OPENSCENEGRAPH_LIBRARIES} "OpenGL32.lib")
-#ENDIF(WIN32)
-#IF(UNIX)
-#       TARGET_LINK_LIBRARIES(osgVisual ${OPENSCENEGRAPH_LIBRARIES} "libGL.so")
-#ENDIF(UNIX)
 TARGET_LINK_LIBRARIES(osgVisual ${OPENSCENEGRAPH_LIBRARIES} ${OPENGL_LIBRARIES})
 
 
 IF(USE_SKY_SILVERLINING )
-        TARGET_LINK_LIBRARIES(osgVisual "winmm.lib" debug ${SILVERLINING_LIBRARY_DEBUG} optimized ${SILVERLINING_LIBRARY_RELEASE})
+        IF(WIN32)
+                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)