[Gearbox-commit] SF.net SVN: gearbox: [201] gearbox/trunk

[<rus...@us...>]

Revision: 201
          http://gearbox.svn.sourceforge.net/gearbox/?rev=201&view=rev
Author:   russo2503v
Date:     2008-06-21 21:19:00 -0700 (Sat, 21 Jun 2008)

Log Message:
-----------
applied john yamakoski os-x patch

Modified Paths:
--------------
    gearbox/trunk/cmake/SetupOs.cmake
    gearbox/trunk/doc/contributors.dox
    gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt

Modified: gearbox/trunk/cmake/SetupOs.cmake
===================================================================
--- gearbox/trunk/cmake/SetupOs.cmake	2008-06-20 05:25:30 UTC (rev 200)
+++ gearbox/trunk/cmake/SetupOs.cmake	2008-06-22 04:19:00 UTC (rev 201)
@@ -39,3 +39,7 @@
     SET( GBX_EXE_EXTENSION ".exe" )
     MESSAGE( STATUS "Running on Windows" )
 ENDIF( GBX_OS_WIN )
+
+IF( GBX_OS_MAC )
+    MESSAGE( STATUS "Running on OS-X" )
+ENDIF( GBX_OS_MAC )

Modified: gearbox/trunk/doc/contributors.dox
===================================================================
--- gearbox/trunk/doc/contributors.dox	2008-06-20 05:25:30 UTC (rev 200)
+++ gearbox/trunk/doc/contributors.dox	2008-06-22 04:19:00 UTC (rev 201)
@@ -22,6 +22,7 @@
 - <a href="http://www.cas.edu.au/content.php/232.html?personid=9">Alex Brooks</a>
 - <a href="http://www.cas.edu.au/content.php/232.html?personid=45">Tobias Kaupp</a>
 - <a href="http://www.cas.edu.au/content.php/232.html?personid=69">Michael Moser</a>
+- John Yamokoski
 
 @par Past contributors
 

Modified: gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt	2008-06-20 05:25:30 UTC (rev 200)
+++ gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt	2008-06-22 04:19:00 UTC (rev 201)
@@ -6,14 +6,7 @@
 # GBX_REQUIRE_OPTION( build LIB ${lib_name} ON )
 
 # this was already tested in the dir above
-# GBX_REQUIRE_VAR( build LIB ${lib_name} GBX_OS_LINUX "only Linux OS is supported" )
-
-# this was already tested in the dir above
-# INCLUDE( ${GBX_CMAKE_DIR}/FindIceUtil.cmake )
-# GBX_REQUIRE_VAR( build LIB ${lib_name} ICEUTIL_FOUND "libIceUtil not found" )
-
-# this was already tested in the dir above
-SET( proj_libs GbxSerialAcfr )
+SET( int_libs GbxSerialAcfr GbxIceUtilAcfr )
 # GBX_REQUIRE_TARGETS( build LIB ${lib_name} ${proj_libs} )
 
 IF( build )
@@ -23,18 +16,11 @@
 
     FILE( GLOB hdrs *.h )
     FILE( GLOB srcs *.cpp )
-    SET( dep_libs ${proj_libs} )
+    SET( dep_libs ${int_libs} )
 
-    # for config.h
-    INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR} )
-
     GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
 
     GBX_ADD_HEADERS( gbxsickacfr/gbxserialdeviceacfr ${hdrs} )
 
-#     IF( GBX_BUILD_TESTS )
-#         ADD_SUBDIRECTORY( test )
-#     ENDIF( GBX_BUILD_TESTS )
-
 ENDIF( build )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.