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

[<gb...@us...>]

Revision: 309
          http://gearbox.svn.sourceforge.net/gearbox/?rev=309&view=rev
Author:   gbiggs
Date:     2008-09-30 03:40:31 +0000 (Tue, 30 Sep 2008)

Log Message:
-----------
Added an option to switch between building shared or static libraries.

Modified Paths:
--------------
    gearbox/trunk/cmake/FindIceUtil.cmake
    gearbox/trunk/cmake/TargetUtils.cmake
    gearbox/trunk/cmake/internal/Setup.cmake
    gearbox/trunk/doc/buildsys.dox
    gearbox/trunk/retired/urg_nz/CMakeLists.txt
    gearbox/trunk/src/basicexample/CMakeLists.txt
    gearbox/trunk/src/flexiport/CMakeLists.txt
    gearbox/trunk/src/gbxadvancedexample/CMakeLists.txt
    gearbox/trunk/src/gbxgarminacfr/CMakeLists.txt
    gearbox/trunk/src/gbxserialacfr/CMakeLists.txt
    gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt
    gearbox/trunk/src/gbxsickacfr/CMakeLists.txt
    gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt
    gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt
    gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt
    gearbox/trunk/src/gbxutilacfr/CMakeLists.txt
    gearbox/trunk/src/hokuyo_aist/CMakeLists.txt
    gearbox/trunk/src/hokuyo_aist/doc.dox
    gearbox/trunk/src/hokuyo_aist/hokuyo_aist.h
    gearbox/trunk/src/hokuyo_aist/python/CMakeLists.txt
    gearbox/trunk/submitted/gbxnovatelacfr/CMakeLists.txt
    gearbox/trunk/submitted/gbxnovatelacfr/gbxnovatelutilacfr/CMakeLists.txt

Modified: gearbox/trunk/cmake/FindIceUtil.cmake
===================================================================
--- gearbox/trunk/cmake/FindIceUtil.cmake	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/cmake/FindIceUtil.cmake	2008-09-30 03:40:31 UTC (rev 309)
@@ -27,6 +27,7 @@
   # some people may manually choose to install Ice here
   /usr/local/include/IceUtil
   # windows
+  C:/Ice-3.3.0-VC90/include/IceUtil
   C:/Ice-3.3.0-VC80/include/IceUtil
   C:/Ice-3.3.0/include/IceUtil
   C:/Ice-3.2.1-VC80/include/IceUtil

Modified: gearbox/trunk/cmake/TargetUtils.cmake
===================================================================
--- gearbox/trunk/cmake/TargetUtils.cmake	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/cmake/TargetUtils.cmake	2008-09-30 03:40:31 UTC (rev 309)
@@ -4,9 +4,9 @@
 # Usage is the same as ADD_EXECUTABLE, all parameters are passed to ADD_EXECUTABLE.
 #
 MACRO( GBX_ADD_EXECUTABLE name )
-    if(COMMAND cmake_policy)
-      cmake_policy(SET CMP0003 NEW)
-    endif(COMMAND cmake_policy)
+    IF( COMMAND cmake_policy )
+        CMAKE_POLICY( SET CMP0003 NEW )
+    ENDIF( COMMAND cmake_policy )
 
     ADD_EXECUTABLE( ${name} ${ARGN} )
 #     SET_TARGET_PROPERTIES( ${name} PROPERTIES
@@ -17,28 +17,46 @@
     LIST( APPEND templist ${name} )
 #   MESSAGE( STATUS "DEBUG: ${templist}" )
     SET( EXE_LIST ${templist} CACHE INTERNAL "Global list of executables to build" FORCE )
-    MESSAGE( STATUS "Planning to Build Executable: ${name}" )
+    MESSAGE( STATUS "Planning to build executable:      ${name}" )
 ENDMACRO( GBX_ADD_EXECUTABLE name )
 
 #
 # Libraries should add themselves by calling 'GBX_ADD_LIBRARY'
 # instead of 'ADD_LIBRARY' in CMakeLists.txt.
-# Usage is the same as ADD_LIBRARY, all parameters are passed to ADD_LIBRARY.
+# The second parameter specifies the library type to build: SHARED, STATIC, or DEFAULT.
+# If the default is used, the library type will depend on the gearbox-wide value as set
+# by the user (or SHARED if the user hasn't changed it from the original setting).
+# All extra parameters are passed to ADD_LIBRARY as source files.
 #
-MACRO( GBX_ADD_LIBRARY name )
-    if(COMMAND cmake_policy)
-      cmake_policy(SET CMP0003 NEW)
-    endif(COMMAND cmake_policy)
+MACRO( GBX_ADD_LIBRARY name type )
+    IF( COMMAND cmake_policy )
+        CMAKE_POLICY( SET CMP0003 NEW )
+    ENDIF( COMMAND cmake_policy )
 
-    ADD_LIBRARY( ${name} ${ARGN} )
+    IF( type STREQUAL SHARED )
+        SET( libType SHARED )
+    ELSEIF( type STREQUAL STATIC )
+        SET( libType STATIC )
+    ELSE( type STREQUAL SHARED )
+        SET( libType ${GBX_DEFAULT_LIB_TYPE} )
+    ENDIF( type STREQUAL SHARED )
+
+    ADD_LIBRARY( ${name} ${libType} ${ARGN} )
 #     SET_TARGET_PROPERTIES( ${name} PROPERTIES
 #         INSTALL_RPATH "${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}"
 #         BUILD_WITH_INSTALL_RPATH TRUE )
-    INSTALL( TARGETS ${name} LIBRARY DESTINATION lib/${PROJECT_NAME} )
+    INSTALL( TARGETS ${name} DESTINATION lib/${PROJECT_NAME} )
+
     SET( templist ${LIB_LIST} )
     LIST( APPEND templist ${name} )
     SET( LIB_LIST ${templist} CACHE INTERNAL "Global list of libraries to build" FORCE )
-    MESSAGE( STATUS "Planning to Build Library   : ${name}" )
+
+    IF( libType STREQUAL SHARED )
+        SET( libTypeDesc "shared" )
+    ELSE( libType STREQUAL SHARED )
+        SET( libTypeDesc "static" )
+    ENDIF( libType STREQUAL SHARED )
+    MESSAGE( STATUS "Planning to build ${libTypeDesc} library:  ${name}" )
 ENDMACRO( GBX_ADD_LIBRARY name )
 
 #
@@ -113,7 +131,7 @@
     SET( templist ${ITEM_LIST} )
     LIST( APPEND templist ${name} )
     SET( ITEM_LIST ${templist} CACHE INTERNAL "Global list of special items to build" FORCE )
-    MESSAGE( STATUS "Planning to Build Item      : ${name}" )
+    MESSAGE( STATUS "Planning to build item:            ${name}" )
 ENDMACRO( GBX_ADD_ITEM name )
 
 #
@@ -152,7 +170,7 @@
     SET( templist ${TEST_LIST} )
     LIST( APPEND templist ${name} )
     SET( TEST_LIST ${templist} CACHE INTERNAL "Global list of (CTest) tests to build" FORCE )
-#     MESSAGE( STATUS "Planning to Build Test      : ${name}" )
+#     MESSAGE( STATUS "Planning to build test:          ${name}" )
 ENDMACRO( GBX_ADD_TEST name executable )
 
 #
@@ -163,7 +181,7 @@
   LIST( APPEND templist ${name} )
 #  MESSAGE( STATUS "DEBUG: ${templist}" )
   SET( EXE_NOT_LIST ${templist} CACHE INTERNAL "Global list of executables NOT to build" FORCE )
-  MESSAGE( STATUS "Not planning to Build Executable : ${name} because ${reason}" )
+  MESSAGE( STATUS "Not planning to build executable:  ${name} because ${reason}" )
 ENDMACRO( GBX_NOT_ADD_EXECUTABLE name reason )
 
 #
@@ -174,7 +192,7 @@
   LIST( APPEND templist ${name} )
 #  MESSAGE( STATUS "DEBUG: ${templist}" )
   SET( LIB_NOT_LIST ${templist} CACHE INTERNAL "Global list of libraries NOT to build" FORCE )
-  MESSAGE( STATUS "Not planning to Build Library   : ${name} because ${reason}" )
+  MESSAGE( STATUS "Not planning to build library:     ${name} because ${reason}" )
 ENDMACRO( GBX_NOT_ADD_LIBRARY name reason )
 
 #
@@ -227,9 +245,10 @@
     # IF( NOT ORCA_MOTHERSHIP )
     #     MESSAGE( STATUS "Using Orca version ${ORCA_VERSION}")
     # ENDIF( NOT ORCA_MOTHERSHIP )
-    MESSAGE( STATUS "Platform          ${CMAKE_SYSTEM}")
-    MESSAGE( STATUS "CMake version     ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}-patch ${CMAKE_PATCH_VERSION}")
-    MESSAGE( STATUS "Install dir       ${CMAKE_INSTALL_PREFIX}")
+    MESSAGE( STATUS "Platform              ${CMAKE_SYSTEM}")
+    MESSAGE( STATUS "CMake version         ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}-patch ${CMAKE_PATCH_VERSION}")
+    MESSAGE( STATUS "Install dir           ${CMAKE_INSTALL_PREFIX}")
+    MESSAGE( STATUS "Default library type  ${GBX_DEFAULT_LIB_TYPE}")
 
     SET( note " " )
     LIST_REPORT( "Will build" "executables" ${note} "${EXE_LIST}" )

Modified: gearbox/trunk/cmake/internal/Setup.cmake
===================================================================
--- gearbox/trunk/cmake/internal/Setup.cmake	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/cmake/internal/Setup.cmake	2008-09-30 03:40:31 UTC (rev 309)
@@ -14,14 +14,14 @@
 INCLUDE( ${GBX_CMAKE_DIR}/SetupVersion.cmake )
 
 #
-# Project directories, including installation
+# Determine OS, and make os-specific choices
 #
-INCLUDE( ${GBX_CMAKE_DIR}/SetupDirectories.cmake )
+INCLUDE( ${GBX_CMAKE_DIR}/SetupOs.cmake )
 
 #
-# Determine OS, and make os-specefic choices
+# Project directories, including installation
 #
-INCLUDE( ${GBX_CMAKE_DIR}/SetupOs.cmake )
+INCLUDE( ${GBX_CMAKE_DIR}/SetupDirectories.cmake )
 
 #
 # Set the build type (affects debugging symbols and optimization)
@@ -41,6 +41,7 @@
 # (these are defaults. after the user modifies these in GUI they stay in cache)
 #
 OPTION( GBX_BUILD_LICENSE  "Enables writing LICENCE file. For admins only." OFF )
+MARK_AS_ADVANCED( GBX_BUILD_LICENSE )
 
 #
 # check compiler type and version
@@ -54,6 +55,12 @@
 OPTION( GBX_BUILD_TESTS    "Enables compilation of all tests" ON  )
 
 #
+# Default library type (shared or static).
+#
+SET( GBX_DEFAULT_LIB_TYPE "SHARED" CACHE STRING "Default library type (SHARED or STATIC)" )
+MARK_AS_ADVANCED( GBX_DEFAULT_LIB_TYPE )
+
+#
 # Look for low-level C headers, write defines to config.h
 #
 INCLUDE( ${GBX_CMAKE_DIR}/WriteConfigH.cmake )

Modified: gearbox/trunk/doc/buildsys.dox
===================================================================
--- gearbox/trunk/doc/buildsys.dox	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/doc/buildsys.dox	2008-09-30 03:40:31 UTC (rev 309)
@@ -55,7 +55,7 @@
     FILE( GLOB hdrs *.h )
     FILE( GLOB srcs *.cpp )
 
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
 
     GBX_ADD_HEADERS( gbxadvanced ${hdrs} )
@@ -160,13 +160,13 @@
 @endverbatim
 
 @verbatim
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
 @endverbatim
-Here we tell CMake to create rules for building a shared library and to specify dependencies. Now you can see why we bothered with defining variables. These commands are generic and can be easily used for other libraries.
+Here we tell CMake to create rules for building a library of the default type (shared or static) and to specify dependencies. Now you can see why we bothered with defining variables. These commands are generic and can be easily used for other libraries.
 
 @c GBX_ADD_LIBRARY is a custom GearBox macro. It does several things:
-- Actually defines a library target (with a standard command @c ADD_LIBRARY ). In Linux, this will produce @c libGbxAdvanced.so
+- Actually defines a library target (with a standard command @c ADD_LIBRARY ). In Linux, this will produce @c libGbxAdvanced.so or @c libGbxAdvanced.a
 - Specifies standard installation directory: @c [PREFIX]/lib/gearbox/
 - Adds the name of the library to the global list of libraries which will be built (for feedback).
 

Modified: gearbox/trunk/retired/urg_nz/CMakeLists.txt
===================================================================
--- gearbox/trunk/retired/urg_nz/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/retired/urg_nz/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -13,7 +13,7 @@
     SET( hdrs urg_nz.h )
     SET( srcs urg_nz.cpp )
 
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
     GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} "" "" "" "" )
 
     GBX_ADD_HEADERS( ${lib_name} ${hdrs} )

Modified: gearbox/trunk/src/basicexample/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/basicexample/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/basicexample/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -11,7 +11,7 @@
     FILE( GLOB hdrs *.h )
     FILE( GLOB srcs *.cpp )
 
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
 
     GBX_ADD_HEADERS( basicexample ${hdrs} )
     # the custom command above is equivalent to this

Modified: gearbox/trunk/src/flexiport/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/flexiport/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/flexiport/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -42,7 +42,7 @@
 		ADD_DEFINITIONS (-DFLEXIPORT_EXPORTS)
 	ENDIF (WIN32)
 	ADD_DEFINITIONS (-DFLEXIPORT_EXPORTS)
-	GBX_ADD_LIBRARY (${libName} SHARED ${srcs})
+	GBX_ADD_LIBRARY (${libName} DEFAULT ${srcs})
 	GBX_ADD_PKGCONFIG (${libName} "FlexiPort generic comms library" "" "" "" "")
 	GBX_ADD_HEADERS (${libName} ${hdrs})
 	IF (WIN32)
@@ -53,4 +53,9 @@
 	IF (GBX_BUILD_TESTS)
 		ADD_SUBDIRECTORY (test)
 	ENDIF (GBX_BUILD_TESTS)
+	
+	OPTION (FLEXIPORT_BUILD_BINDINGS "Build the Python bindings for Flexiport" ON)
+	IF (FLEXIPORT_BUILD_BINDINGS)
+		ADD_SUBDIRECTORY (python)
+	ENDIF (FLEXIPORT_BUILD_BINDINGS)
 ENDIF (build)

Modified: gearbox/trunk/src/gbxadvancedexample/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxadvancedexample/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/gbxadvancedexample/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -15,7 +15,7 @@
     FILE( GLOB hdrs *.h )
     FILE( GLOB srcs *.cpp )
 
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
 
     GBX_ADD_HEADERS( gbxadvancedexample ${hdrs} )

Modified: gearbox/trunk/src/gbxgarminacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxgarminacfr/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/gbxgarminacfr/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -17,7 +17,7 @@
     FILE( GLOB srcs *.cpp )
     SET( dep_libs ${int_libs} )
     
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
     GBX_ADD_PKGCONFIG( ${lib_name} "Garmin GPS driver" "" dep_libs "" "" )
 

Modified: gearbox/trunk/src/gbxserialacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxserialacfr/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/gbxserialacfr/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -21,7 +21,7 @@
     FILE( GLOB hdrs *.h )
     FILE( GLOB srcs *.cpp )
 
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
     GBX_ADD_PKGCONFIG( ${lib_name} "C++ class wrapping a serial port." "" dep_libs "" "" )
 

Modified: gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -14,7 +14,7 @@
     FILE( GLOB hdrs *.h )
     FILE( GLOB srcs *.cpp )
 
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
 
     GBX_ADD_HEADERS( gbxserialacfr/lockfile ${hdrs} )

Modified: gearbox/trunk/src/gbxsickacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsickacfr/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/gbxsickacfr/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -24,7 +24,7 @@
     FILE( GLOB srcs *.cpp )
     SET( dep_libs ${int_libs} ${private_libs} )
 
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
     GBX_ADD_PKGCONFIG( ${lib_name} "Drives SICK hardware, directly connected to the computer." proj_libs int_libs "" "" )
 

Modified: gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -23,7 +23,7 @@
     # for config.h
     INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR} )
 
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
 
     GBX_ADD_HEADERS( gbxsickacfr/gbxiceutilacfr ${hdrs} )

Modified: gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -18,7 +18,7 @@
     FILE( GLOB srcs *.cpp )
     SET( dep_libs ${int_libs} )
 
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
 
     GBX_ADD_HEADERS( gbxsickacfr/gbxserialdeviceacfr ${hdrs} )

Modified: gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -16,7 +16,7 @@
     FILE( GLOB srcs *.cpp )
     SET( dep_libs ${int_libs} )
     
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
     
     GBX_ADD_HEADERS( gbxsmartbatteryacfr ${hdrs} )

Modified: gearbox/trunk/src/gbxutilacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxutilacfr/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/gbxutilacfr/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -14,7 +14,7 @@
     # for config.h
     INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR} )
 
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
 
     GBX_ADD_HEADERS( gbxutilacfr ${hdrs} )
 

Modified: gearbox/trunk/src/hokuyo_aist/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/hokuyo_aist/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/hokuyo_aist/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -17,7 +17,7 @@
 	IF (WIN32)
 		ADD_DEFINITIONS (-DHOKUYO_AIST_EXPORTS)
 	ENDIF (WIN32)
-	GBX_ADD_LIBRARY (${libName} SHARED ${srcs})
+	GBX_ADD_LIBRARY (${libName} DEFAULT ${srcs})
 	TARGET_LINK_LIBRARIES (${libName} ${reqLibs})
 	GBX_ADD_PKGCONFIG (${libName} ${libDesc} ${reqLibs} "" "" "")
 

Modified: gearbox/trunk/src/hokuyo_aist/doc.dox
===================================================================
--- gearbox/trunk/src/hokuyo_aist/doc.dox	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/hokuyo_aist/doc.dox	2008-09-30 03:40:31 UTC (rev 309)
@@ -7,9 +7,9 @@
 @brief Hokuyo URG laser scanner driver.
 
 This library provides a driver for Hokuyo laser scanner devices using the SCIP protocol version 1 or
-2. It has been tested with the Hokuyo URG-04LX and UHG-08LX, but it should work with any scanner
-that conforms to these protocol versions, including the URG-04LX-F01 and UTM-30LX. For a full list
-of functions and classes, see @ref hokuyo_aist.
+2. It has been tested with the Hokuyo URG-04LX, UBG-04LX and UHG-08LX, but it should work with any
+scanner that conforms to these protocol versions, including the URG-04LX-F01 and UTM-30LX. For a
+full list of functions and classes, see @ref hokuyo_aist.
 
 For a full list of classes and functions, see @ref hokuyo_aist.
 

Modified: gearbox/trunk/src/hokuyo_aist/hokuyo_aist.h
===================================================================
--- gearbox/trunk/src/hokuyo_aist/hokuyo_aist.h	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/hokuyo_aist/hokuyo_aist.h	2008-09-30 03:40:31 UTC (rev 309)
@@ -358,8 +358,6 @@
 		without having to worry about allocating its data, whether it will change or not, while also
 		avoiding excessive allocations.
 
-		Not available with the SCIP v1 protocol.
-
 		@param data Pointer to a @ref HokuyoData object to store the range readings in.
 		@param clusterCount The number of readings to cluster together into a single reading. The
 		minimum value from a cluster is returned as the range for that cluster.
@@ -371,8 +369,6 @@
 
 		/** @brief Get the latest scan data from the scanner.
 
-		Not available with the SCIP v1 protocol.
-
 		@param data Pointer to a @ref HokuyoData object to store the range readings in.
 		@param startAngle The angle to get range readings from. Exclusive; if this falls between two
 		steps the step inside the angle will be returned, but the step outside won't.

Modified: gearbox/trunk/src/hokuyo_aist/python/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/hokuyo_aist/python/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/src/hokuyo_aist/python/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -52,7 +52,7 @@
 	ENDIF (Boost_FOUND)
 ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
 
-IF (PYTHON_LIBRARIES AND Boost_FOUND)
+IF (PYTHON_LIBRARIES AND Boost_FOUND AND GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
 	MESSAGE (STATUS "Hokuyo_aist Python bindings will be built.")
 	SET (srcs	hokuyo_aist.cpp)
 
@@ -64,4 +64,6 @@
 	INSTALL (TARGETS ${pyModuleTarget} LIBRARY DESTINATION lib/python/site-packages)
 
 	ADD_SUBDIRECTORY (test)
-ENDIF (PYTHON_LIBRARIES AND Boost_FOUND)
\ No newline at end of file
+ELSEIF (NOT GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
+	MESSAGE (STATUS "Hokuyo_aist Python bindings will not be built - must build hokuyo_aist as a shared library.")
+ENDIF (PYTHON_LIBRARIES AND Boost_FOUND AND GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
\ No newline at end of file

Modified: gearbox/trunk/submitted/gbxnovatelacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/submitted/gbxnovatelacfr/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/submitted/gbxnovatelacfr/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -24,7 +24,7 @@
     FILE( GLOB srcs *.cpp )
     SET( dep_libs ${int_libs} ${private_libs} )
 
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
     GBX_ADD_PKGCONFIG( ${lib_name} "Drives NOVATEL hardware, directly connected to the computer." proj_libs int_libs "" "" )
 

Modified: gearbox/trunk/submitted/gbxnovatelacfr/gbxnovatelutilacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/submitted/gbxnovatelacfr/gbxnovatelutilacfr/CMakeLists.txt	2008-09-23 11:22:20 UTC (rev 308)
+++ gearbox/trunk/submitted/gbxnovatelacfr/gbxnovatelutilacfr/CMakeLists.txt	2008-09-30 03:40:31 UTC (rev 309)
@@ -25,7 +25,7 @@
     # for config.h
     INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR} )
 
-    GBX_ADD_LIBRARY( ${lib_name} SHARED ${srcs} )
+    GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
     TARGET_LINK_LIBRARIES( ${lib_name} ${dep_libs} )
 
     GBX_ADD_HEADERS( gbxnovatelacfr/gbxnovatelutilacfr ${hdrs} )


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