Menu
▾
▴
[Gearbox-commit] SF.net SVN: gearbox:[417] gearbox/trunk
|
From: <gb...@us...> - 2009-06-08 07:49:01
|
Revision: 417
http://gearbox.svn.sourceforge.net/gearbox/?rev=417&view=rev
Author: gbiggs
Date: 2009-06-08 07:48:51 +0000 (Mon, 08 Jun 2009)
Log Message:
-----------
Fixed bug #2802501: All libraries now have their own individual API versions which can be incremented independently of the Gearbox version. Libraries all start at 1.0.0.
Modified Paths:
--------------
gearbox/trunk/cmake/TargetUtils.cmake
gearbox/trunk/cmake/pkgconfig.in
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/gbxnovatelacfr/CMakeLists.txt
gearbox/trunk/src/gbxnovatelacfr/gbxnovatelutilacfr/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
Modified: gearbox/trunk/cmake/TargetUtils.cmake
===================================================================
--- gearbox/trunk/cmake/TargetUtils.cmake 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/cmake/TargetUtils.cmake 2009-06-08 07:48:51 UTC (rev 417)
@@ -57,9 +57,12 @@
# 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).
+# The soversion parameter sets the library's API version. This will typically be
+# distinct from the Gearbox distribution version, as each library will change its
+# API independently.
# All extra parameters are passed to ADD_LIBRARY as source files.
#
-macro( GBX_ADD_LIBRARY name type )
+macro( GBX_ADD_LIBRARY name type soversion )
if( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif( COMMAND cmake_policy )
@@ -73,7 +76,9 @@
endif( ${type} STREQUAL SHARED )
add_library( ${name} ${libType} ${ARGN} )
-# SET_TARGET_PROPERTIES( ${name} PROPERTIES
+ SET_TARGET_PROPERTIES( ${name} PROPERTIES
+ VERSION ${soversion}
+ SOVERSION ${soversion} )
# INSTALL_RPATH "${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}"
# BUILD_WITH_INSTALL_RPATH TRUE )
install( TARGETS ${name}
@@ -81,7 +86,7 @@
EXPORT ${PROJECT_NAME}-targets )
set( templist ${LIB_LIST} )
- list( APPEND templist ${name} )
+ list( APPEND templist ${name}-${soversion} )
set( LIB_LIST ${templist} CACHE INTERNAL "Global list of libraries to build" FORCE )
if( libType STREQUAL SHARED )
@@ -89,7 +94,7 @@
else( libType STREQUAL SHARED )
set( libTypeDesc "static" )
endif( libType STREQUAL SHARED )
- message( STATUS "Planning to build ${libTypeDesc} library: ${name}" )
+ message( STATUS "Planning to build ${libTypeDesc} library: ${name}-${soversion}" )
endmacro( GBX_ADD_LIBRARY name )
#
@@ -140,15 +145,17 @@
# int_deps is a list containing all the internal libraries this library depends on (pass by reference).
# cflags is appended to the "Cflags" value.
# libflags is appended to the "Libs" value.
+# version is the soversion of the library.
# that should be linked with at the same time as linking to this library.
#
-macro( GBX_ADD_PKGCONFIG name desc ext_deps int_deps cflags libflags )
+macro( GBX_ADD_PKGCONFIG name desc ext_deps int_deps cflags libflags version )
set( PKG_NAME ${name} )
set( PKG_DESC ${desc} )
set( PKG_CFLAGS ${cflags} )
set( PKG_LIBFLAGS ${libflags} )
set( PKG_EXTERNAL_DEPS ${${ext_deps}} )
set( PKG_INTERNAL_DEPS "" )
+ set( PKG_VERSION ${version} )
if( ${int_deps} )
foreach( item ${${int_deps}} )
set( PKG_INTERNAL_DEPS "${PKG_INTERNAL_DEPS} -l${item}" )
Modified: gearbox/trunk/cmake/pkgconfig.in
===================================================================
--- gearbox/trunk/cmake/pkgconfig.in 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/cmake/pkgconfig.in 2009-06-08 07:48:51 UTC (rev 417)
@@ -2,7 +2,7 @@
Name: @PKG_NAME@
Description: @PKG_DESC@
-Version: @GBX_PROJECT_VERSION@
+Version: @PKG_VERSION@
Requires: @PKG_EXTERNAL_DEPS@
Libs: -L@CMAKE_INSTALL_PREFIX@/lib/gearbox @PKG_LIBFLAGS@ -l@PKG_NAME@ @PKG_INTERNAL_DEPS@
-Cflags: -I@CMAKE_INSTALL_PREFIX@/include/gearbox @PKG_CFLAGS@
\ No newline at end of file
+Cflags: -I@CMAKE_INSTALL_PREFIX@/include/gearbox @PKG_CFLAGS@
Modified: gearbox/trunk/src/basicexample/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/basicexample/CMakeLists.txt 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/basicexample/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,4 +1,5 @@
set( lib_name basicexample )
+set( libVersion 1.0.0 )
GBX_ADD_LICENSE( LGPL )
set( build TRUE )
@@ -11,7 +12,7 @@
file( GLOB hdrs *.h )
file( GLOB srcs *.cpp )
- GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
+ GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${libVersion} ${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 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/flexiport/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,69 +1,71 @@
-SET (libName flexiport)
+set (libName flexiport)
+set (libDesc "FlexiPort generic comms library")
+set (libVersion 1.0.0)
GBX_ADD_LICENSE (LGPL)
-SET (build TRUE)
+set (build TRUE)
GBX_REQUIRE_OPTION (build LIB ${libName} ON)
-if(build)
- INCLUDE (${GBX_CMAKE_DIR}/UseBasicRules.cmake)
+if (build)
+ include (${GBX_CMAKE_DIR}/UseBasicRules.cmake)
- OPTION (FLEXIPORT_INCLUDE_SERIAL "Include the serial port in FlexiPort" ON)
- OPTION (FLEXIPORT_INCLUDE_TCP "Include the TCP network port in FlexiPort" ON)
- OPTION (FLEXIPORT_INCLUDE_UDP "Include the UDP network port in FlexiPort" ON)
- OPTION (FLEXIPORT_INCLUDE_LOGGING "Include the log reader/writer ports in FlexiPort" ON)
- MARK_AS_ADVANCED (FLEXIPORT_INCLUDE_SERIAL FLEXIPORT_INCLUDE_TCP FLEXIPORT_INCLUDE_UDP)
+ option (FLEXIPORT_INCLUDE_SERIAL "Include the serial port in FlexiPort" ON)
+ option (FLEXIPORT_INCLUDE_TCP "Include the TCP network port in FlexiPort" ON)
+ option (FLEXIPORT_INCLUDE_UDP "Include the UDP network port in FlexiPort" ON)
+ option (FLEXIPORT_INCLUDE_LOGGING "Include the log reader/writer ports in FlexiPort" ON)
+ mark_as_advanced (FLEXIPORT_INCLUDE_SERIAL FLEXIPORT_INCLUDE_TCP FLEXIPORT_INCLUDE_UDP)
- if(GBX_OS_QNX)
- SET (CMAKE_REQUIRED_LIBRARIES socket)
- endif(GBX_OS_QNX)
- CHECK_FUNCTION_EXISTS (getaddrinfo FLEXIPORT_HAVE_GETADDRINFO)
- SET (CMAKE_REQUIRED_LIBRARIES)
+ if (GBX_OS_QNX)
+ set (CMAKE_REQUIRED_LIBRARIES socket)
+ endif (GBX_OS_QNX)
+ check_function_exists (getaddrinfo FLEXIPORT_HAVE_GETADDRINFO)
+ set (CMAKE_REQUIRED_LIBRARIES)
- SET (flexiport_config_h_in ${CMAKE_CURRENT_SOURCE_DIR}/flexiport_config.h.in)
- SET (flexiport_config_h ${CMAKE_CURRENT_BINARY_DIR}/flexiport_config.h)
- CONFIGURE_FILE (${flexiport_config_h_in} ${flexiport_config_h})
- INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR})
+ set (flexiport_config_h_in ${CMAKE_CURRENT_SOURCE_DIR}/flexiport_config.h.in)
+ set (flexiport_config_h ${CMAKE_CURRENT_BINARY_DIR}/flexiport_config.h)
+ configure_file (${flexiport_config_h_in} ${flexiport_config_h})
+ include_directories (${CMAKE_CURRENT_BINARY_DIR})
- SET (hdrs flexiport.h port.h timeout.h flexiport_types.h ${flexiport_config_h})
- SET (srcs flexiport.cpp port.cpp timeout.cpp ${flexiport_config_h})
- if(FLEXIPORT_INCLUDE_SERIAL)
- SET (hdrs ${hdrs} serialport.h)
- SET (srcs ${srcs} serialport.cpp)
- endif(FLEXIPORT_INCLUDE_SERIAL)
- if(FLEXIPORT_INCLUDE_TCP)
- SET (hdrs ${hdrs} tcpport.h)
- SET (srcs ${srcs} tcpport.cpp)
- endif(FLEXIPORT_INCLUDE_TCP)
- if(FLEXIPORT_INCLUDE_UDP)
- SET (hdrs ${hdrs} udpport.h)
- SET (srcs ${srcs} udpport.cpp)
- endif(FLEXIPORT_INCLUDE_UDP)
- if(FLEXIPORT_INCLUDE_LOGGING)
- SET (hdrs ${hdrs} logwriterport.h logreaderport.h)
- SET (srcs ${srcs} logwriterport.cpp logreaderport.cpp logfile.cpp)
- endif(FLEXIPORT_INCLUDE_LOGGING)
+ set (hdrs flexiport.h port.h timeout.h flexiport_types.h ${flexiport_config_h})
+ set (srcs flexiport.cpp port.cpp timeout.cpp ${flexiport_config_h})
+ if (FLEXIPORT_INCLUDE_SERIAL)
+ set (hdrs ${hdrs} serialport.h)
+ set (srcs ${srcs} serialport.cpp)
+ endif (FLEXIPORT_INCLUDE_SERIAL)
+ if (FLEXIPORT_INCLUDE_TCP)
+ set (hdrs ${hdrs} tcpport.h)
+ set (srcs ${srcs} tcpport.cpp)
+ endif (FLEXIPORT_INCLUDE_TCP)
+ if (FLEXIPORT_INCLUDE_UDP)
+ set (hdrs ${hdrs} udpport.h)
+ set (srcs ${srcs} udpport.cpp)
+ endif (FLEXIPORT_INCLUDE_UDP)
+ if (FLEXIPORT_INCLUDE_LOGGING)
+ set (hdrs ${hdrs} logwriterport.h logreaderport.h)
+ set (srcs ${srcs} logwriterport.cpp logreaderport.cpp logfile.cpp)
+ endif (FLEXIPORT_INCLUDE_LOGGING)
- if(WIN32)
- if(GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
- ADD_DEFINITIONS (-DFLEXIPORT_EXPORTS)
- else(GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
- ADD_DEFINITIONS (-DFLEXIPORT_STATIC)
- endif(GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
- endif(WIN32)
- GBX_ADD_LIBRARY(${libName} DEFAULT ${srcs})
- GBX_ADD_PKGCONFIG (${libName} "FlexiPort generic comms library" "" "" "" "")
+ if (WIN32)
+ if (GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
+ add_definitions (-DFLEXIPORT_EXPORTS)
+ else (GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
+ add_definitions (-DFLEXIPORT_STATIC)
+ endif (GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
+ endif (WIN32)
+ GBX_ADD_LIBRARY (${libName} DEFAULT ${libVersion} ${srcs})
+ GBX_ADD_PKGCONFIG (${libName} ${libDesc} "" "" "" "" ${libVersion})
GBX_ADD_HEADERS (${libName} ${hdrs})
- if(WIN32)
- TARGET_LINK_LIBRARIES (${libName} Ws2_32)
- endif(WIN32)
+ if (WIN32)
+ target_link_libraries (${libName} Ws2_32)
+ endif (WIN32)
- ADD_SUBDIRECTORY (utils)
- if(GBX_BUILD_TESTS)
- ADD_SUBDIRECTORY (test)
- endif(GBX_BUILD_TESTS)
+ add_subdirectory (utils)
+ if (GBX_BUILD_TESTS)
+ add_subdirectory (test)
+ endif (GBX_BUILD_TESTS)
- OPTION (FLEXIPORT_BUILD_BINDINGS "Build the Python bindings for Flexiport" OFF)
- if(FLEXIPORT_BUILD_BINDINGS)
- ADD_SUBDIRECTORY (python)
- endif(FLEXIPORT_BUILD_BINDINGS)
-endif(build)
+ option (FLEXIPORT_BUILD_BINDINGS "Build the Python bindings for Flexiport" OFF)
+ 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 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/gbxadvancedexample/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,4 +1,5 @@
set( lib_name GbxAdvancedExample )
+set( libVersion 1.0.0 )
GBX_ADD_LICENSE( GPL )
set( build TRUE )
@@ -15,7 +16,7 @@
file( GLOB hdrs *.h )
file( GLOB srcs *.cpp )
- GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
+ GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${libVersion} ${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 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/gbxgarminacfr/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,4 +1,5 @@
set( lib_name GbxGarminAcfr )
+set( lib_version 1.0.0 )
GBX_ADD_LICENSE( LGPL )
set( build TRUE )
@@ -15,9 +16,9 @@
file( GLOB hdrs *.h )
file( GLOB srcs *.cpp )
- GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
+ GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
- GBX_ADD_PKGCONFIG( ${lib_name} "Garmin GPS driver" "" dep_libs "" "" )
+ GBX_ADD_PKGCONFIG( ${lib_name} "Garmin GPS driver" "" dep_libs "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxgarminacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxnovatelacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxnovatelacfr/CMakeLists.txt 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/gbxnovatelacfr/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,4 +1,5 @@
set( lib_name GbxNovatelAcfr )
+set( lib_version 1.0.0 )
GBX_ADD_LICENSE( LGPL )
set( build TRUE )
@@ -19,9 +20,9 @@
file( GLOB hdrs *.h )
file( GLOB srcs *.cpp )
- GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
+ GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
- GBX_ADD_PKGCONFIG( ${lib_name} "Drives NOVATEL hardware, directly connected to the computer." proj_libs dep_libs "" "" )
+ GBX_ADD_PKGCONFIG( ${lib_name} "Drives NOVATEL hardware, directly connected to the computer." proj_libs dep_libs "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxnovatelacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxnovatelacfr/gbxnovatelutilacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxnovatelacfr/gbxnovatelutilacfr/CMakeLists.txt 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/gbxnovatelacfr/gbxnovatelutilacfr/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,4 +1,5 @@
set( lib_name GbxNovatelUtilAcfr )
+set( lib_version 1.0.0 )
GBX_ADD_LICENSE( LGPL )
set( build TRUE )
@@ -25,7 +26,7 @@
# for config.h
include_directories( ${PROJECT_BINARY_DIR} )
- GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
+ GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
GBX_ADD_HEADERS( gbxnovatelacfr/gbxnovatelutilacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxserialacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxserialacfr/CMakeLists.txt 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/gbxserialacfr/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,4 +1,5 @@
set( lib_name GbxSerialAcfr )
+set( lib_version 1.0.0 )
GBX_ADD_LICENSE( LGPL )
set( build TRUE )
@@ -21,9 +22,9 @@
file( GLOB hdrs *.h )
file( GLOB srcs *.cpp )
- GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
+ GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
- GBX_ADD_PKGCONFIG( ${lib_name} "C++ class wrapping a serial port." "" dep_libs "" "" )
+ GBX_ADD_PKGCONFIG( ${lib_name} "C++ class wrapping a serial port." "" dep_libs "" "" ${lib_version})
GBX_ADD_HEADERS( gbxserialacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,4 +1,5 @@
set( lib_name GbxLockFileAcfr )
+set( lib_version 1.0.0 )
GBX_ADD_LICENSE( LGPL )
set( build TRUE )
@@ -14,7 +15,7 @@
file( GLOB hdrs *.h )
file( GLOB srcs *.cpp )
- GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
+ GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${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 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/gbxsickacfr/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,4 +1,5 @@
set( lib_name GbxSickAcfr )
+set( lib_version 1.0.0 )
GBX_ADD_LICENSE( LGPL )
set( build TRUE )
@@ -23,9 +24,9 @@
file( GLOB hdrs *.h )
file( GLOB srcs *.cpp )
- GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
+ GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
- GBX_ADD_PKGCONFIG( ${lib_name} "Drives SICK hardware, directly connected to the computer." proj_libs dep_libs "" "" )
+ GBX_ADD_PKGCONFIG( ${lib_name} "Drives SICK hardware, directly connected to the computer." proj_libs dep_libs "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxsickacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,4 +1,5 @@
set( lib_name GbxIceUtilAcfr )
+set( lib_version 1.0.0 )
GBX_ADD_LICENSE( LGPL )
set( build TRUE )
@@ -23,7 +24,7 @@
# for config.h
include_directories( ${PROJECT_BINARY_DIR} )
- GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
+ GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${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 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,4 +1,5 @@
set( lib_name GbxSerialDeviceAcfr )
+set( lib_version 1.0.0 )
GBX_ADD_LICENSE( LGPL )
set( build TRUE )
@@ -17,7 +18,7 @@
file( GLOB hdrs *.h )
file( GLOB srcs *.cpp )
- GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
+ GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${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 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,4 +1,5 @@
set( lib_name GbxSmartBatteryAcfr )
+set( lib_version 1.0.0 )
GBX_ADD_LICENSE( LGPL )
set( build TRUE )
@@ -15,9 +16,9 @@
file( GLOB hdrs *.h )
file( GLOB srcs *.cpp )
- GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
+ GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
- GBX_ADD_PKGCONFIG( ${lib_name} "Interface library for Ocean Server battery systems" proj_libs dep_libs "" "" )
+ GBX_ADD_PKGCONFIG( ${lib_name} "Interface library for Ocean Server battery systems" proj_libs dep_libs "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxsmartbatteryacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxutilacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxutilacfr/CMakeLists.txt 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/gbxutilacfr/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,4 +1,5 @@
set( lib_name GbxUtilAcfr )
+set( lib_version 1.0.0 )
GBX_ADD_LICENSE( LGPL )
set( build TRUE )
@@ -14,7 +15,7 @@
# for config.h
include_directories( ${PROJECT_BINARY_DIR} )
- GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${srcs} )
+ GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
GBX_ADD_HEADERS( gbxutilacfr ${hdrs} )
Modified: gearbox/trunk/src/hokuyo_aist/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/hokuyo_aist/CMakeLists.txt 2009-06-08 06:36:54 UTC (rev 416)
+++ gearbox/trunk/src/hokuyo_aist/CMakeLists.txt 2009-06-08 07:48:51 UTC (rev 417)
@@ -1,38 +1,39 @@
-SET (libName hokuyo_aist)
+set (libName hokuyo_aist)
set (libDesc "Hokuyo laser scanner driver")
+set (libVersion 1.0.0)
GBX_ADD_LICENSE (LGPL)
-SET (build TRUE)
+set (build TRUE)
GBX_REQUIRE_OPTION (build LIB ${libName} ON)
-SET (reqLibs flexiport)
+set (reqLibs flexiport)
GBX_REQUIRE_LIBS (build LIB ${libName} ${reqLibs})
-if(build)
- INCLUDE (${GBX_CMAKE_DIR}/UseBasicRules.cmake)
+if (build)
+ include (${GBX_CMAKE_DIR}/UseBasicRules.cmake)
- SET (hdrs hokuyo_aist.h)
- SET (srcs hokuyo_aist.cpp)
+ set (hdrs hokuyo_aist.h)
+ set (srcs hokuyo_aist.cpp)
- if(WIN32)
- if(GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
- ADD_DEFINITIONS (-DHOKUYO_AIST_EXPORTS)
- else(GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
- ADD_DEFINITIONS (-DHOKUYO_AIST_STATIC -DFLEXIPORT_STATIC)
- endif(GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
- endif(WIN32)
- GBX_ADD_LIBRARY(${libName} DEFAULT ${srcs})
- TARGET_LINK_LIBRARIES (${libName} ${reqLibs})
- GBX_ADD_PKGCONFIG (${libName} ${libDesc} ${reqLibs} "" "" "")
+ if (WIN32)
+ if (GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
+ add_definitions (-DHOKUYO_AIST_EXPORTS)
+ else (GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
+ add_definitions (-DHOKUYO_AIST_STATIC -DFLEXIPORT_STATIC)
+ endif (GBX_DEFAULT_LIB_TYPE STREQUAL SHARED)
+ endif (WIN32)
+ GBX_ADD_LIBRARY (${libName} DEFAULT ${libVersion} ${srcs})
+ target_link_libraries (${libName} ${reqLibs})
+ GBX_ADD_PKGCONFIG (${libName} ${libDesc} ${reqLibs} "" "" "" ${libVersion})
GBX_ADD_HEADERS (${libName} ${hdrs})
- if(GBX_BUILD_TESTS)
- ADD_SUBDIRECTORY (test)
- endif(GBX_BUILD_TESTS)
+ if (GBX_BUILD_TESTS)
+ add_subdirectory (test)
+ endif (GBX_BUILD_TESTS)
- OPTION (HOKUYO_AIST_BUILD_BINDINGS "Build the Python bindings for Hokuyo_aist" ON)
- if(HOKUYO_AIST_BUILD_BINDINGS)
- ADD_SUBDIRECTORY (python)
- endif(HOKUYO_AIST_BUILD_BINDINGS)
-endif(build)
+ option (HOKUYO_AIST_BUILD_BINDINGS "Build the Python bindings for Hokuyo_aist" ON)
+ if (HOKUYO_AIST_BUILD_BINDINGS)
+ add_subdirectory (python)
+ endif (HOKUYO_AIST_BUILD_BINDINGS)
+endif (build)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|