Menu
▾
▴
[Gearbox-commit] SF.net SVN: gearbox: [109] gearbox/trunk
|
From: <rus...@us...> - 2008-03-26 02:32:59
|
Revision: 109
http://gearbox.svn.sourceforge.net/gearbox/?rev=109&view=rev
Author: russo2503v
Date: 2008-03-25 19:32:57 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
cosmetic changes only: remove extra spaces after cmake commands
Modified Paths:
--------------
gearbox/trunk/DartConfig.cmake
gearbox/trunk/cmake/Assert.cmake
gearbox/trunk/cmake/CheckCompiler.cmake
gearbox/trunk/cmake/DependencyUtils.cmake
gearbox/trunk/cmake/FindGearbox.cmake
gearbox/trunk/cmake/FindIceUtil.cmake
gearbox/trunk/cmake/SetupBuildType.cmake
gearbox/trunk/cmake/SetupDirectories.cmake
gearbox/trunk/cmake/SetupOs.cmake
gearbox/trunk/cmake/TargetUtils.cmake
gearbox/trunk/cmake/UseBasicRules.cmake
gearbox/trunk/cmake/WriteConfigH.cmake
gearbox/trunk/cmake/dart/gearbox-nightly-linux-gcc42.cmake
gearbox/trunk/cmake/internal/Setup.cmake
gearbox/trunk/src/CMakeLists.txt
gearbox/trunk/src/basicexample/CMakeLists.txt
gearbox/trunk/src/gbxadvancedexample/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/gbxsickacfr/gbxutilacfr/CMakeLists.txt
gearbox/trunk/src/urg_nz/CMakeLists.txt
gearbox/trunk/submitted/CMakeLists.txt
Modified: gearbox/trunk/DartConfig.cmake
===================================================================
--- gearbox/trunk/DartConfig.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/DartConfig.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,12 +1,12 @@
-SET (DROP_METHOD "xmlrpc")
-SET (DROP_SITE "http://opium.acfr.usyd.edu.au:8081")
-SET (DROP_LOCATION "gearbox")
-SET (COMPRESS_SUBMISSION ON)
+SET(DROP_METHOD "xmlrpc")
+SET(DROP_SITE "http://opium.acfr.usyd.edu.au:8081")
+SET(DROP_LOCATION "gearbox")
+SET(COMPRESS_SUBMISSION ON)
# Dashboard is opened for submissions for a 24 hour period starting at
# the specified NIGHLY_START_TIME. Time is specified in 24 hour format.
-SET (NIGHTLY_START_TIME "04:00:00 EAST")
+SET(NIGHTLY_START_TIME "04:00:00 EAST")
# Set up valgrind
FIND_PROGRAM(MEMORYCHECK_COMMAND
Modified: gearbox/trunk/cmake/Assert.cmake
===================================================================
--- gearbox/trunk/cmake/Assert.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/Assert.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -3,30 +3,30 @@
#
MACRO( GBX_ASSERT TEST COMMENT_FAIL )
- IF ( ${TEST} )
+ IF( ${TEST} )
# MESSAGE( STATUS "DEBUG: assertion passed : ${TEST}" )
# ARG2 holds COMMENT_PASS
- IF ( ${ARGC} GREATER 2 )
+ IF( ${ARGC} GREATER 2 )
MESSAGE( STATUS ${ARGV2} )
- ENDIF ( ${ARGC} GREATER 2 )
+ ENDIF( ${ARGC} GREATER 2 )
ELSE ( ${TEST} )
# MESSAGE( STATUS "DEBUG: assertion failed : ${TEST}" )
SET( IS_FATAL 0 )
- IF ( ${ARGC} GREATER 3 )
+ IF( ${ARGC} GREATER 3 )
SET( IS_FATAL ${ARGV3} )
- ENDIF ( ${ARGC} GREATER 3 )
+ ENDIF( ${ARGC} GREATER 3 )
- IF ( ${IS_FATAL} )
+ IF( ${IS_FATAL} )
# MESSAGE( STATUS "DEBUG: failure is fatal : ${IS_FATAL}" )
MESSAGE( FATAL_ERROR ${COMMENT_FAIL} )
ELSE ( ${IS_FATAL} )
# MESSAGE( STATUS "DEBUG: failure is NOT fatal : ${IS_FATAL}" )
MESSAGE( STATUS ${COMMENT_FAIL} )
- ENDIF ( ${IS_FATAL} )
+ ENDIF( ${IS_FATAL} )
- ENDIF ( ${TEST} )
+ ENDIF( ${TEST} )
ENDMACRO( GBX_ASSERT )
Modified: gearbox/trunk/cmake/CheckCompiler.cmake
===================================================================
--- gearbox/trunk/cmake/CheckCompiler.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/CheckCompiler.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,28 +1,28 @@
#
# If we're using gcc, make sure the version is OK.
#
-IF ( ${CMAKE_C_COMPILER} MATCHES gcc )
+IF( ${CMAKE_C_COMPILER} MATCHES gcc )
EXEC_PROGRAM ( ${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE gcc_version )
- MESSAGE ( STATUS "gcc version: ${gcc_version}")
+ MESSAGE( STATUS "gcc version: ${gcc_version}")
# Why doesn't this work?
#STRING( REGEX MATCHALL "gcc\.*" VERSION_STRING ${CMAKE_C_COMPILER} )
- IF ( gcc_version MATCHES ".*4\\.[0-9]\\.[0-9]" )
+ IF( gcc_version MATCHES ".*4\\.[0-9]\\.[0-9]" )
SET( GCC_VERSION_OK 1 )
- ENDIF ( gcc_version MATCHES ".*4\\.[0-9]\\.[0-9]")
+ ENDIF( gcc_version MATCHES ".*4\\.[0-9]\\.[0-9]")
GBX_ASSERT ( GCC_VERSION_OK
"Checking gcc version - failed. ${PROJECT_NAME} requires gcc v. 4.x"
"Checking gcc version - ok"
1 )
- IF ( gcc_version MATCHES ".*4\\.0.*" )
+ IF( gcc_version MATCHES ".*4\\.0.*" )
# gcc 4.0.x
- ENDIF ( gcc_version MATCHES ".*4\\.0.*" )
+ ENDIF( gcc_version MATCHES ".*4\\.0.*" )
- IF ( gcc_version MATCHES ".*4\\.1.*" )
+ IF( gcc_version MATCHES ".*4\\.1.*" )
# gcc 4.1.x
# gcc-4.1 adds stack protection, which makes code robust to buffer-overrun attacks
# (see: http://www.trl.ibm.com/projects/security/ssp/)
@@ -31,7 +31,7 @@
# Tobi: it looks like stack protection is off by default from version gcc 4.1.2, so we don't need this any more.
# Will keep it for now, it doesn't hurt.
ADD_DEFINITIONS( -fno-stack-protector )
- ENDIF ( gcc_version MATCHES ".*4\\.1.*" )
+ ENDIF( gcc_version MATCHES ".*4\\.1.*" )
-ENDIF ( ${CMAKE_C_COMPILER} MATCHES gcc )
+ENDIF( ${CMAKE_C_COMPILER} MATCHES gcc )
Modified: gearbox/trunk/cmake/DependencyUtils.cmake
===================================================================
--- gearbox/trunk/cmake/DependencyUtils.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/DependencyUtils.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,20 +1,20 @@
MACRO( GBX_MAKE_OPTION_NAME option_name module_type module_name )
- STRING ( COMPARE EQUAL ${module_type} "EXE" is_exe )
- STRING ( COMPARE EQUAL ${module_type} "LIB" is_lib )
- IF ( NOT is_exe AND NOT is_lib )
- MESSAGE ( FATAL_ERROR "In macro GBX_MAKE_OPTION_NAME, module_type must be either 'EXE' or 'LIB'" )
- ENDIF ( NOT is_exe AND NOT is_lib )
- IF ( is_exe AND is_lib )
- MESSAGE ( FATAL_ERROR "In macro GBX_MAKE_OPTION_NAME, module_type must be either 'EXE' or 'LIB'" )
- ENDIF ( is_exe AND is_lib )
+ STRING( COMPARE EQUAL ${module_type} "EXE" is_exe )
+ STRING( COMPARE EQUAL ${module_type} "LIB" is_lib )
+ IF( NOT is_exe AND NOT is_lib )
+ MESSAGE( FATAL_ERROR "In macro GBX_MAKE_OPTION_NAME, module_type must be either 'EXE' or 'LIB'" )
+ ENDIF( NOT is_exe AND NOT is_lib )
+ IF( is_exe AND is_lib )
+ MESSAGE( FATAL_ERROR "In macro GBX_MAKE_OPTION_NAME, module_type must be either 'EXE' or 'LIB'" )
+ ENDIF( is_exe AND is_lib )
STRING( TOUPPER ${module_name} module_name_upper )
- IF ( is_exe )
+ IF( is_exe )
SET( option_name "ENABLE_${module_name_upper}" )
ELSE ( is_exe )
SET( option_name "ENABLE_LIB_${module_name_upper}" )
- ENDIF ( is_exe )
+ ENDIF( is_exe )
ENDMACRO( GBX_MAKE_OPTION_NAME option_name module_name )
@@ -31,52 +31,52 @@
#
MACRO( GBX_REQUIRE_OPTION cumulative_var module_type module_name default_option_value )
- STRING ( COMPARE EQUAL ${module_type} "EXE" is_exe )
- STRING ( COMPARE EQUAL ${module_type} "LIB" is_lib )
- IF ( NOT is_exe AND NOT is_lib )
- MESSAGE ( FATAL_ERROR "In macro GBX_REQUIRE_OPTION, module_type must be either 'EXE' or 'LIB'" )
- ENDIF ( NOT is_exe AND NOT is_lib )
- IF ( is_exe AND is_lib )
- MESSAGE ( FATAL_ERROR "In macro GBX_REQUIRE_OPTION, module_type must be either 'EXE' or 'LIB'" )
- ENDIF ( is_exe AND is_lib )
+ STRING( COMPARE EQUAL ${module_type} "EXE" is_exe )
+ STRING( COMPARE EQUAL ${module_type} "LIB" is_lib )
+ IF( NOT is_exe AND NOT is_lib )
+ MESSAGE( FATAL_ERROR "In macro GBX_REQUIRE_OPTION, module_type must be either 'EXE' or 'LIB'" )
+ ENDIF( NOT is_exe AND NOT is_lib )
+ IF( is_exe AND is_lib )
+ MESSAGE( FATAL_ERROR "In macro GBX_REQUIRE_OPTION, module_type must be either 'EXE' or 'LIB'" )
+ ENDIF( is_exe AND is_lib )
- IF ( ${ARGC} GREATER 5 )
+ IF( ${ARGC} GREATER 5 )
SET( option_name ${ARGV6} )
ELSE ( ${ARGC} GREATER 5 )
STRING( TOUPPER ${module_name} module_name_upper )
- IF ( is_exe )
+ IF( is_exe )
SET( option_name "ENABLE_${module_name_upper}" )
ELSE ( is_exe )
SET( option_name "ENABLE_LIB_${module_name_upper}" )
- ENDIF ( is_exe )
- ENDIF ( ${ARGC} GREATER 5 )
+ ENDIF( is_exe )
+ ENDIF( ${ARGC} GREATER 5 )
- IF ( ${ARGC} GREATER 6 )
+ IF( ${ARGC} GREATER 6 )
SET( option_descr ${ARGV7} )
ELSE ( ${ARGC} GREATER 6 )
SET( option_descr "disabled by user, use ccmake to enable" )
- ENDIF ( ${ARGC} GREATER 6 )
+ ENDIF( ${ARGC} GREATER 6 )
# debug
# MESSAGE( STATUS
# "GBX_REQUIRE_OPTION (CUM_VAR=${cumulative_var}, MOD_TYPE=${module_type}, MOD_NAME=${module_name}, default_option_value=${default_option_value}, OPT_NAME=${option_name}, OPT_DESC=${option_descr})" )
# set up the option
- IF ( is_exe )
+ IF( is_exe )
OPTION( ${option_name} "Try to build ${module_name}" ${default_option_value} )
ELSE ( is_exe )
OPTION( ${option_name} "Try to build lib${module_name} library" ${default_option_value} )
- ENDIF ( is_exe )
+ ENDIF( is_exe )
# must dereference both var and option names once (!) and IF will evaluate their values
- IF ( ${cumulative_var} AND NOT ${option_name} )
+ IF( ${cumulative_var} AND NOT ${option_name} )
SET( ${cumulative_var} FALSE )
- IF ( is_exe )
+ IF( is_exe )
GBX_NOT_ADD_EXECUTABLE( ${module_name} ${option_descr} )
ELSE ( is_exe )
GBX_NOT_ADD_LIBRARY( ${module_name} ${option_descr} )
- ENDIF ( is_exe )
- ENDIF ( ${cumulative_var} AND NOT ${option_name} )
+ ENDIF( is_exe )
+ ENDIF( ${cumulative_var} AND NOT ${option_name} )
ENDMACRO( GBX_REQUIRE_OPTION cumulative_var module_type module_name default_option_value )
@@ -94,24 +94,24 @@
# debug
# MESSAGE( STATUS "GBX_REQUIRE_VAR [ CUM_VAR=${cumulative_var}, MOD_TYPE=${module_type}, MOD_NAME=${module_name}, test_var=${${test_var}}, reason=${reason} ]" )
- STRING ( COMPARE EQUAL ${module_type} "EXE" is_exe )
- STRING ( COMPARE EQUAL ${module_type} "LIB" is_lib )
- IF ( NOT is_exe AND NOT is_lib )
- MESSAGE ( FATAL_ERROR "In macro GBX_REQUIRE_VAR, module_type must be either 'EXE' or 'LIB'" )
- ENDIF ( NOT is_exe AND NOT is_lib )
- IF ( is_exe AND is_lib )
- MESSAGE ( FATAL_ERROR "In macro GBX_REQUIRE_VAR, module_type must be either 'EXE' or 'LIB'" )
- ENDIF ( is_exe AND is_lib )
+ STRING( COMPARE EQUAL ${module_type} "EXE" is_exe )
+ STRING( COMPARE EQUAL ${module_type} "LIB" is_lib )
+ IF( NOT is_exe AND NOT is_lib )
+ MESSAGE( FATAL_ERROR "In macro GBX_REQUIRE_VAR, module_type must be either 'EXE' or 'LIB'" )
+ ENDIF( NOT is_exe AND NOT is_lib )
+ IF( is_exe AND is_lib )
+ MESSAGE( FATAL_ERROR "In macro GBX_REQUIRE_VAR, module_type must be either 'EXE' or 'LIB'" )
+ ENDIF( is_exe AND is_lib )
# must dereference both var names once (!) and IF will evaluate their values
- IF ( ${cumulative_var} AND NOT ${test_var} )
+ IF( ${cumulative_var} AND NOT ${test_var} )
SET( ${cumulative_var} FALSE )
- IF ( is_exe )
+ IF( is_exe )
GBX_NOT_ADD_EXECUTABLE( ${module_name} ${reason} )
ELSE ( is_exe )
GBX_NOT_ADD_LIBRARY( ${module_name} ${reason} )
- ENDIF ( is_exe )
- ENDIF ( ${cumulative_var} AND NOT ${test_var} )
+ ENDIF( is_exe )
+ ENDIF( ${cumulative_var} AND NOT ${test_var} )
ENDMACRO( GBX_REQUIRE_VAR cumulative_var module_type module_name test_var reason )
@@ -122,7 +122,7 @@
# for the module with a name "installed_module".
# E.g.
# Initialize a variable first
-# SET ( BUILD TRUE )
+# SET( BUILD TRUE )
# Now test the variable value
# REQUIRE_INSTALL ( build LIB HydroStuff GbxStuff )
# will check if GBXSTUFF_INSTALLED is defined.
@@ -134,14 +134,14 @@
# debug
# MESSAGE( STATUS "REQUIRE_INSTALL [ CUM_VAR=${cumulative_var}, MOD_TYPE=${module_type}, MOD_NAME=${module_name}, installed_module=${installed_module} ]" )
- STRING ( TOUPPER ${installed_module} upper_installed_module )
+ STRING( TOUPPER ${installed_module} upper_installed_module )
SET( test_var ${upper_installed_module}_INSTALLED )
- IF ( ${ARGC} GREATER 5 )
+ IF( ${ARGC} GREATER 5 )
SET( reason ${ARGV6} )
ELSE ( ${ARGC} GREATER 5 )
SET( reason "${installed_module} was not installed" )
- ENDIF ( ${ARGC} GREATER 5 )
+ ENDIF( ${ARGC} GREATER 5 )
# must dereference both var names once (!)
GBX_REQUIRE_VAR( ${cumulative_var} ${module_type} ${module_name} ${test_var} ${reason} )
@@ -177,35 +177,35 @@
# debug
# MESSAGE( STATUS "GBX_REQUIRE_TARGET [ CUM_VAR=${${cumulative_var}}, MOD_TYPE=${module_type}, MOD_NAME=${module_name}, target_name=${target_name} ]" )
- STRING ( COMPARE EQUAL ${module_type} "EXE" is_exe )
- STRING ( COMPARE EQUAL ${module_type} "LIB" is_lib )
- IF ( NOT is_exe AND NOT is_lib )
- MESSAGE ( FATAL_ERROR "In macro GBX_REQUIRE_TARGET, module_type must be either 'EXE' or 'LIB'" )
- ENDIF ( NOT is_exe AND NOT is_lib )
- IF ( is_exe AND is_lib )
- MESSAGE ( FATAL_ERROR "In macro GBX_REQUIRE_TARGET, module_type must be either 'EXE' or 'LIB'" )
- ENDIF ( is_exe AND is_lib )
+ STRING( COMPARE EQUAL ${module_type} "EXE" is_exe )
+ STRING( COMPARE EQUAL ${module_type} "LIB" is_lib )
+ IF( NOT is_exe AND NOT is_lib )
+ MESSAGE( FATAL_ERROR "In macro GBX_REQUIRE_TARGET, module_type must be either 'EXE' or 'LIB'" )
+ ENDIF( NOT is_exe AND NOT is_lib )
+ IF( is_exe AND is_lib )
+ MESSAGE( FATAL_ERROR "In macro GBX_REQUIRE_TARGET, module_type must be either 'EXE' or 'LIB'" )
+ ENDIF( is_exe AND is_lib )
- IF ( ${ARGC} GREATER 5 )
+ IF( ${ARGC} GREATER 5 )
SET( reason ${ARGV6} )
ELSE ( ${ARGC} GREATER 5 )
SET( reason "lib${target_name} is not being built" )
- ENDIF ( ${ARGC} GREATER 5 )
+ ENDIF( ${ARGC} GREATER 5 )
GET_TARGET_PROPERTY( target_location ${target_name} LOCATION )
# must dereference both var and option names once (!) and IF will evaluate their values
- IF ( ${cumulative_var} AND NOT target_location )
+ IF( ${cumulative_var} AND NOT target_location )
SET( ${cumulative_var} FALSE )
GBX_MAKE_OPTION_NAME( option_name ${module_type} ${module_name} )
- IF ( is_exe )
+ IF( is_exe )
GBX_NOT_ADD_EXECUTABLE( ${module_name} ${reason} )
SET( ${option_name} OFF CACHE BOOL "Try to build ${module_name}" FORCE )
ELSE ( is_exe )
GBX_NOT_ADD_LIBRARY( ${module_name} ${reason} )
SET( ${option_name} OFF CACHE BOOL "Try to build lib${module_name} library" FORCE )
- ENDIF ( is_exe )
- ENDIF ( ${cumulative_var} AND NOT target_location )
+ ENDIF( is_exe )
+ ENDIF( ${cumulative_var} AND NOT target_location )
ENDMACRO( GBX_REQUIRE_TARGET cumulative_var module_type module_name target_name )
Modified: gearbox/trunk/cmake/FindGearbox.cmake
===================================================================
--- gearbox/trunk/cmake/FindGearbox.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/FindGearbox.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -19,6 +19,6 @@
# MESSAGE( STATUS "DEBUG: manifest.cmake is apparently found in : ${GEARBOX_HOME}" )
# NOTE: if GEARBOX_HOME is set to *-NOTFOUND it will evaluate to FALSE
-IF ( GEARBOX_HOME )
+IF( GEARBOX_HOME )
SET( GEARBOX_FOUND 1 CACHE BOOL "Do we have Gearbox?" FORCE )
-ENDIF ( GEARBOX_HOME )
+ENDIF( GEARBOX_HOME )
Modified: gearbox/trunk/cmake/FindIceUtil.cmake
===================================================================
--- gearbox/trunk/cmake/FindIceUtil.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/FindIceUtil.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -33,7 +33,7 @@
# MESSAGE( STATUS "DEBUG: Ice.h is apparently found in : ${ICEUTIL_HOME_INCLUDE_ICE}" )
# NOTE: if ICEUTIL_HOME_INCLUDE_ICE is set to *-NOTFOUND it will evaluate to FALSE
-IF ( ICEUTIL_HOME_INCLUDE_ICEUTIL )
+IF( ICEUTIL_HOME_INCLUDE_ICEUTIL )
SET( ICEUTIL_FOUND 1 CACHE BOOL "Do we have Ice?" FORCE )
@@ -44,10 +44,10 @@
GET_FILENAME_COMPONENT( ICEUTIL_HOME ${ICEUTIL_HOME_INCLUDE} PATH CACHE )
# MESSAGE( STATUS "Setting ICEUTIL_HOME to ${ICEUTIL_HOME}" )
-ENDIF ( ICEUTIL_HOME_INCLUDE_ICEUTIL )
+ENDIF( ICEUTIL_HOME_INCLUDE_ICEUTIL )
-IF ( ICEUTIL_FOUND )
+IF( ICEUTIL_FOUND )
MESSAGE( STATUS "Looking for libIceUtil - found in ${ICEUTIL_HOME}")
ELSE ( ICEUTIL_FOUND )
MESSAGE( STATUS "Looking for libIceUtil - not found")
-ENDIF ( ICEUTIL_FOUND )
+ENDIF( ICEUTIL_FOUND )
Modified: gearbox/trunk/cmake/SetupBuildType.cmake
===================================================================
--- gearbox/trunk/cmake/SetupBuildType.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/SetupBuildType.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,13 +1,13 @@
-IF ( NOT CMAKE_BUILD_TYPE )
+IF( NOT CMAKE_BUILD_TYPE )
- IF ( NOT GBX_OS_WIN )
+ IF( NOT GBX_OS_WIN )
# For gcc, RelWithDebInfo gives '-O2 -g'
SET( CMAKE_BUILD_TYPE RelWithDebInfo )
ELSE ( NOT GBX_OS_WIN )
# windows... a temp hack: VCC does not seem to respect the cmake
# setting and always defaults to debug, we have to match it here.
SET( CMAKE_BUILD_TYPE Debug )
- ENDIF ( NOT GBX_OS_WIN )
+ ENDIF( NOT GBX_OS_WIN )
MESSAGE( STATUS "Setting build type to '${CMAKE_BUILD_TYPE}'" )
@@ -15,4 +15,4 @@
MESSAGE( STATUS "Build type set to '${CMAKE_BUILD_TYPE}' by user." )
-ENDIF ( NOT CMAKE_BUILD_TYPE )
+ENDIF( NOT CMAKE_BUILD_TYPE )
Modified: gearbox/trunk/cmake/SetupDirectories.cmake
===================================================================
--- gearbox/trunk/cmake/SetupDirectories.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/SetupDirectories.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -21,11 +21,11 @@
# 1. using custom defaults (effective only the very first time CMake runs, or after CMakeCache is deleted)
IF( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
MESSAGE( STATUS "Setting default installation directory..." )
- IF ( NOT GBX_OS_WIN )
+ IF( NOT GBX_OS_WIN )
SET( CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "Installation directory" FORCE )
ELSE ( NOT GBX_OS_WIN )
SET( CMAKE_INSTALL_PREFIX "C:\Program Files\${PROJECT_NAME}\Include" CACHE PATH "Installation directory" FORCE )
- ENDIF ( NOT GBX_OS_WIN )
+ ENDIF( NOT GBX_OS_WIN )
ENDIF( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT )
# the name of the variable controlling install directory for this project
Modified: gearbox/trunk/cmake/SetupOs.cmake
===================================================================
--- gearbox/trunk/cmake/SetupOs.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/SetupOs.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -8,34 +8,34 @@
STRING( REGEX MATCH Linux GBX_OS_LINUX ${CMAKE_SYSTEM_NAME})
# Rename CMake's variable to something which makes more sense.
-IF ( QNXNTO )
+IF( QNXNTO )
SET( GBX_OS_QNX TRUE BOOL INTERNAL )
-ENDIF ( QNXNTO )
+ENDIF( QNXNTO )
# In windows we just mirror CMake's own variable
-IF ( WIN32 )
+IF( WIN32 )
SET( GBX_OS_WIN TRUE BOOL INTERNAL )
-ENDIF ( WIN32 )
+ENDIF( WIN32 )
# In MacOS X we just mirror CMake's own variable
-IF ( APPLE )
+IF( APPLE )
SET( GBX_OS_MAC TRUE BOOL INTERNAL )
-ENDIF ( APPLE )
+ENDIF( APPLE )
# From now on, use our own OS flags
-IF ( GBX_OS_LINUX )
- MESSAGE ( STATUS "Running on Linux" )
-ENDIF ( GBX_OS_LINUX )
+IF( GBX_OS_LINUX )
+ MESSAGE( STATUS "Running on Linux" )
+ENDIF( GBX_OS_LINUX )
-IF ( GBX_OS_QNX )
- MESSAGE ( STATUS "Running on QNX" )
+IF( GBX_OS_QNX )
+ MESSAGE( STATUS "Running on QNX" )
ADD_DEFINITIONS( -shared -fexceptions )
-ENDIF ( GBX_OS_QNX )
+ENDIF( GBX_OS_QNX )
-IF ( GBX_OS_WIN )
+IF( GBX_OS_WIN )
# CMake seems not to set this property correctly for some reason
SET( GBX_EXE_EXTENSION ".exe" )
- MESSAGE ( STATUS "Running on Windows" )
-ENDIF ( GBX_OS_WIN )
+ MESSAGE( STATUS "Running on Windows" )
+ENDIF( GBX_OS_WIN )
Modified: gearbox/trunk/cmake/TargetUtils.cmake
===================================================================
--- gearbox/trunk/cmake/TargetUtils.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/TargetUtils.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -10,8 +10,8 @@
# BUILD_WITH_INSTALL_RPATH TRUE )
INSTALL( TARGETS ${name} RUNTIME DESTINATION bin )
SET( templist ${COMPONENT_LIST} )
- LIST ( APPEND templist ${name} )
-# MESSAGE ( STATUS "DEBUG: ${templist}" )
+ LIST( APPEND templist ${name} )
+# MESSAGE( STATUS "DEBUG: ${templist}" )
SET( COMPONENT_LIST ${templist} CACHE INTERNAL "Global list of components to build" FORCE )
MESSAGE( STATUS "Planning to Build Executable: ${name}" )
ENDMACRO( GBX_ADD_EXECUTABLE name )
@@ -28,7 +28,7 @@
# BUILD_WITH_INSTALL_RPATH TRUE )
INSTALL( TARGETS ${name} LIBRARY DESTINATION lib/${PROJECT_NAME} )
SET( templist ${LIBRARY_LIST} )
- LIST ( APPEND templist ${name} )
+ LIST( APPEND templist ${name} )
SET( LIBRARY_LIST ${templist} CACHE INTERNAL "Global list of libraries to build" FORCE )
MESSAGE( STATUS "Planning to Build Library : ${name}" )
ENDMACRO( GBX_ADD_LIBRARY name )
@@ -103,7 +103,7 @@
#
MACRO( GBX_ADD_ITEM name )
SET( templist ${ITEM_LIST} )
- LIST ( APPEND templist ${name} )
+ 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}" )
ENDMACRO( GBX_ADD_ITEM name )
@@ -116,21 +116,21 @@
SET( templist ${LICENSE_LIST} )
# get relative path to the current source dir
- STRING ( LENGTH ${GBX_PROJECT_SOURCE_DIR} proj_src_dir_length )
- STRING ( LENGTH ${CMAKE_CURRENT_SOURCE_DIR} current_src_dir_length )
- MATH ( EXPR relative_path_length "${current_src_dir_length} - ${proj_src_dir_length} - 1" )
- MATH ( EXPR relative_path_start "${proj_src_dir_length} + 1" )
- STRING ( SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR}
+ STRING( LENGTH ${GBX_PROJECT_SOURCE_DIR} proj_src_dir_length )
+ STRING( LENGTH ${CMAKE_CURRENT_SOURCE_DIR} current_src_dir_length )
+ MATH( EXPR relative_path_length "${current_src_dir_length} - ${proj_src_dir_length} - 1" )
+ MATH( EXPR relative_path_start "${proj_src_dir_length} + 1" )
+ STRING( SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR}
${relative_path_start} ${relative_path_length} current_src_dir_relative )
# format the string to line up properly
SET( spaces "A Z" )
- STRING ( LENGTH ${current_src_dir_relative} current_src_dir_relative_length )
- MATH ( EXPR white_space_length "60 - ${current_src_dir_relative_length}" )
- STRING ( SUBSTRING ${spaces} 1 ${white_space_length} white_space )
+ STRING( LENGTH ${current_src_dir_relative} current_src_dir_relative_length )
+ MATH( EXPR white_space_length "60 - ${current_src_dir_relative_length}" )
+ STRING( SUBSTRING ${spaces} 1 ${white_space_length} white_space )
SET( line_item "${current_src_dir_relative}${white_space}${license}" )
- LIST ( APPEND templist ${line_item} )
+ LIST( APPEND templist ${line_item} )
SET( LICENSE_LIST ${templist} CACHE INTERNAL "Global list of directories and their licenses" FORCE )
# MESSAGE( STATUS ${line_item} )
ENDMACRO( GBX_ADD_LICENSE license )
@@ -142,7 +142,7 @@
MACRO( GBX_ADD_TEST name executable )
ADD_TEST( ${name} ${executable} ${ARGN} )
SET( templist ${TEST_LIST} )
- LIST ( APPEND templist ${name} )
+ 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}" )
ENDMACRO( GBX_ADD_TEST name executable )
@@ -152,8 +152,8 @@
#
MACRO( GBX_NOT_ADD_EXECUTABLE name reason )
SET( templist ${COMPONENT_NOT_LIST} )
- LIST ( APPEND templist ${name} )
-# MESSAGE ( STATUS "DEBUG: ${templist}" )
+ LIST( APPEND templist ${name} )
+# MESSAGE( STATUS "DEBUG: ${templist}" )
SET( COMPONENT_NOT_LIST ${templist} CACHE INTERNAL "Global list of components NOT to build" FORCE )
MESSAGE( STATUS "Not planning to Build Executable : ${name} because ${reason}" )
ENDMACRO( GBX_NOT_ADD_EXECUTABLE name reason )
@@ -163,8 +163,8 @@
#
MACRO( GBX_NOT_ADD_LIBRARY name reason )
SET( templist ${LIBRARY_NOT_LIST} )
- LIST ( APPEND templist ${name} )
-# MESSAGE ( STATUS "DEBUG: ${templist}" )
+ LIST( APPEND templist ${name} )
+# MESSAGE( STATUS "DEBUG: ${templist}" )
SET( LIBRARY_NOT_LIST ${templist} CACHE INTERNAL "Global list of libraries NOT to build" FORCE )
MESSAGE( STATUS "Not planning to Build Library : ${name} because ${reason}" )
ENDMACRO( GBX_NOT_ADD_LIBRARY name reason )
@@ -177,21 +177,21 @@
# Tricky list stuff.
# see http://www.cmake.org/Wiki/CMakeMacroMerge for an example
#
-MACRO ( LIST_REPORT ACTION ITEM_NAME note L )
+MACRO( LIST_REPORT ACTION ITEM_NAME note L )
SET( templist ${L} )
- LIST ( LENGTH templist templist_length )
+ LIST( LENGTH templist templist_length )
SET( report_file ${GBX_PROJECT_BINARY_DIR}/cmake_config_report.txt )
- IF ( templist_length GREATER 0 )
- LIST ( SORT templist )
+ IF( templist_length GREATER 0 )
+ LIST( SORT templist )
- MESSAGE ( STATUS "${ACTION} ${templist_length} ${ITEM_NAME} ${note}:" )
- MESSAGE ( STATUS " ${templist}" )
+ MESSAGE( STATUS "${ACTION} ${templist_length} ${ITEM_NAME} ${note}:" )
+ MESSAGE( STATUS " ${templist}" )
- WRITE_FILE ( ${report_file} "${ACTION} ${templist_length} ${ITEM_NAME}:" APPEND )
- WRITE_FILE ( ${report_file} " ${templist}" APPEND )
- ENDIF ( templist_length GREATER 0 )
-ENDMACRO ( LIST_REPORT ACTION ITEM_NAME note L )
+ WRITE_FILE( ${report_file} "${ACTION} ${templist_length} ${ITEM_NAME}:" APPEND )
+ WRITE_FILE( ${report_file} " ${templist}" APPEND )
+ ENDIF( templist_length GREATER 0 )
+ENDMACRO( LIST_REPORT ACTION ITEM_NAME note L )
#
# Puts messages on the screen.
@@ -203,76 +203,76 @@
# write configuration results to file (this line clears existing contents)
SET( report_file ${GBX_PROJECT_BINARY_DIR}/cmake_config_report.txt )
- WRITE_FILE ( ${report_file} "Autogenerated by CMake for ${PROJECT_NAME} project" )
-# WRITE_FILE ( ${report_file} "Using Ice version ${ICE_VERSION}" )
+ WRITE_FILE( ${report_file} "Autogenerated by CMake for ${PROJECT_NAME} project" )
+# WRITE_FILE( ${report_file} "Using Ice version ${ICE_VERSION}" )
#
# Print some results
#
- MESSAGE ( STATUS "Project name ${PROJECT_NAME}")
- MESSAGE ( STATUS "Project version ${GBX_PROJECT_VERSION}")
+ MESSAGE( STATUS "Project name ${PROJECT_NAME}")
+ MESSAGE( STATUS "Project version ${GBX_PROJECT_VERSION}")
# would be nice to print out Orca version for satellite projects
# for this we need an executable which is guaranteed to be installed.
# then we can run it with --version flag.
- # 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}")
+ # 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}")
SET( note " " )
- LIST_REPORT ( "Will build" "executables" ${note} "${COMPONENT_LIST}" )
- LIST_REPORT ( "Will build" "libraries" ${note} "${LIBRARY_LIST}" )
- LIST_REPORT ( "Will build" "CTest tests" ${note} "${TEST_LIST}" )
- LIST_REPORT ( "Will build" "special items" ${note} "${ITEM_LIST}" )
+ LIST_REPORT( "Will build" "executables" ${note} "${COMPONENT_LIST}" )
+ LIST_REPORT( "Will build" "libraries" ${note} "${LIBRARY_LIST}" )
+ LIST_REPORT( "Will build" "CTest tests" ${note} "${TEST_LIST}" )
+ LIST_REPORT( "Will build" "special items" ${note} "${ITEM_LIST}" )
SET( note "(see above for reasons)" )
- LIST_REPORT ( "Will NOT build" "executables" ${note} "${COMPONENT_NOT_LIST}" )
- LIST_REPORT ( "Will NOT build" "libraries" ${note} "${LIBRARY_NOT_LIST}" )
+ LIST_REPORT( "Will NOT build" "executables" ${note} "${COMPONENT_NOT_LIST}" )
+ LIST_REPORT( "Will NOT build" "libraries" ${note} "${LIBRARY_NOT_LIST}" )
ENDMACRO( GBX_CONFIG_REPORT )
-MACRO ( GBX_WRITE_MANIFEST )
+MACRO( GBX_WRITE_MANIFEST )
SET( manifest_file ${GBX_PROJECT_BINARY_DIR}/${PROJECT_NAME}_manifest.cmake )
- WRITE_FILE ( ${manifest_file} "\# Autogenerated by CMake for ${PROJECT_NAME} project" )
+ WRITE_FILE( ${manifest_file} "\# Autogenerated by CMake for ${PROJECT_NAME} project" )
FOREACH( A ${LIBRARY_LIST} )
- STRING ( TOUPPER ${A} UPPERA )
- WRITE_FILE ( ${manifest_file} "SET( ${UPPERA}_INSTALLED 1)" APPEND )
+ STRING( TOUPPER ${A} UPPERA )
+ WRITE_FILE( ${manifest_file} "SET( ${UPPERA}_INSTALLED 1)" APPEND )
ENDFOREACH( A ${LIBRARY_LIST} )
FOREACH( A ${LIBRARY_NOT_LIST} )
- STRING ( TOUPPER ${A} UPPERA )
- WRITE_FILE ( ${manifest_file} "SET( ${UPPERA}_INSTALLED 0)" APPEND )
+ STRING( TOUPPER ${A} UPPERA )
+ WRITE_FILE( ${manifest_file} "SET( ${UPPERA}_INSTALLED 0)" APPEND )
ENDFOREACH( A ${LIBRARY_NOT_LIST} )
- WRITE_FILE ( ${manifest_file} " " APPEND )
+ WRITE_FILE( ${manifest_file} " " APPEND )
- STRING ( TOUPPER ${PROJECT_NAME} upper_project_name )
- WRITE_FILE ( ${manifest_file} "SET( ${upper_project_name}_MANIFEST_LOADED 1)" APPEND )
+ STRING( TOUPPER ${PROJECT_NAME} upper_project_name )
+ WRITE_FILE( ${manifest_file} "SET( ${upper_project_name}_MANIFEST_LOADED 1)" APPEND )
INSTALL( FILES ${manifest_file} DESTINATION . )
-ENDMACRO ( GBX_WRITE_MANIFEST )
+ENDMACRO( GBX_WRITE_MANIFEST )
-MACRO ( GBX_WRITE_LICENSE )
+MACRO( GBX_WRITE_LICENSE )
SET( license_file ${GBX_PROJECT_SOURCE_DIR}/LICENSE )
- WRITE_FILE ( ${license_file} "Autogenerated by CMake for ${PROJECT_NAME} project" )
- WRITE_FILE ( ${license_file} "----------------------------------------------------------------------" APPEND )
- WRITE_FILE ( ${license_file} "DIRECTORY license" APPEND )
- WRITE_FILE ( ${license_file} "----------------------------------------------------------------------" APPEND )
+ WRITE_FILE( ${license_file} "Autogenerated by CMake for ${PROJECT_NAME} project" )
+ WRITE_FILE( ${license_file} "----------------------------------------------------------------------" APPEND )
+ WRITE_FILE( ${license_file} "DIRECTORY license" APPEND )
+ WRITE_FILE( ${license_file} "----------------------------------------------------------------------" APPEND )
FOREACH( A ${LICENSE_LIST} )
- WRITE_FILE ( ${license_file} ${A} APPEND )
+ WRITE_FILE( ${license_file} ${A} APPEND )
ENDFOREACH( A ${LICENSE_LIST} )
-ENDMACRO ( GBX_WRITE_LICENSE )
+ENDMACRO( GBX_WRITE_LICENSE )
#
# Reset global lists of components, libraries, etc.
#
-MACRO ( GBX_RESET_ALL_LISTS )
- # MESSAGE ( STATUS "DEBUG: Resetting global component and library lists" )
+MACRO( GBX_RESET_ALL_LISTS )
+ # MESSAGE( STATUS "DEBUG: Resetting global component and library lists" )
SET( COMPONENT_LIST "" CACHE INTERNAL "Global list of components to build" FORCE )
SET( LIBRARY_LIST "" CACHE INTERNAL "Global list of libraries to build" FORCE )
SET( TEST_LIST "" CACHE INTERNAL "Global list of CTest tests to build" FORCE )
@@ -282,4 +282,4 @@
SET( LIBRARY_NOT_LIST "" CACHE INTERNAL "Global list of libraries NOT to build" FORCE )
SET( LICENSE_LIST "" CACHE INTERNAL "Global list of directories and their licenses" FORCE )
-ENDMACRO ( GBX_RESET_ALL_LISTS )
+ENDMACRO( GBX_RESET_ALL_LISTS )
Modified: gearbox/trunk/cmake/UseBasicRules.cmake
===================================================================
--- gearbox/trunk/cmake/UseBasicRules.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/UseBasicRules.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -8,15 +8,15 @@
# Do the same for the submitted directory when its compilation
# is enabled.
#
-IF ( GBX_BUILD_SUBMITTED )
+IF( GBX_BUILD_SUBMITTED )
INCLUDE_DIRECTORIES( ${GBX_PROJECT_SOURCE_DIR}/submitted )
-ENDIF ( GBX_BUILD_SUBMITTED )
+ENDIF( GBX_BUILD_SUBMITTED )
#
# Platform-specific compiler and linker flags
#
-IF ( NOT GBX_OS_WIN )
+IF( NOT GBX_OS_WIN )
ADD_DEFINITIONS( "-Wall" )
ELSE ( NOT GBX_OS_WIN )
ADD_DEFINITIONS( "-Wall -D_CRT_SECURE_NO_DEPRECATE" )
-ENDIF ( NOT GBX_OS_WIN )
+ENDIF( NOT GBX_OS_WIN )
Modified: gearbox/trunk/cmake/WriteConfigH.cmake
===================================================================
--- gearbox/trunk/cmake/WriteConfigH.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/WriteConfigH.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -10,7 +10,7 @@
SET( CONFIG_H ${PROJECT_BINARY_DIR}/config.h )
# Only write config.h once
-IF ( WROTE_CONFIG_H )
+IF( WROTE_CONFIG_H )
MESSAGE( STATUS "Not writing config.h -- wrote it previously" )
ELSE ( WROTE_CONFIG_H )
MESSAGE( STATUS "Writing config.h" )
@@ -18,7 +18,7 @@
FILE( WRITE ${CONFIG_H} "/* config.h. Generated by CMakeLists.txt */\n\n" )
- IF ( WIN32 )
+ IF( WIN32 )
#
# define some stuff to make MSVC look a bit more like gcc
@@ -167,4 +167,4 @@
ENDIF( WIN32 )
-ENDIF ( WROTE_CONFIG_H )
+ENDIF( WROTE_CONFIG_H )
Modified: gearbox/trunk/cmake/dart/gearbox-nightly-linux-gcc42.cmake
===================================================================
--- gearbox/trunk/cmake/dart/gearbox-nightly-linux-gcc42.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/dart/gearbox-nightly-linux-gcc42.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -2,19 +2,19 @@
# Edit this to match your configuration, then set a cron job
# to run it regularly (with 'ctest -S <script_name>').
#
-SET (DASHBOARD_ROOT "/home/users/dart/ctests/gearbox/gearbox-nightly")
-SET (CTEST_SOURCE_DIRECTORY "${DASHBOARD_ROOT}/gearbox")
-SET (CTEST_BINARY_DIRECTORY "${DASHBOARD_ROOT}/build-gearbox")
+SET(DASHBOARD_ROOT "/home/users/dart/ctests/gearbox/gearbox-nightly")
+SET(CTEST_SOURCE_DIRECTORY "${DASHBOARD_ROOT}/gearbox")
+SET(CTEST_BINARY_DIRECTORY "${DASHBOARD_ROOT}/build-gearbox")
-SET (CTEST_CVS_COMMAND "svn")
+SET(CTEST_CVS_COMMAND "svn")
# which command to use for running the dashboard
#
-#SET (CTEST_COMMAND "ctest -D Nightly -A \"${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}\"" )
-SET (CTEST_COMMAND "ctest -D Nightly -A \"${CTEST_BINARY_DIRECTORY}/cmake_config_report.txt\"" )
+#SET(CTEST_COMMAND "ctest -D Nightly -A \"${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}\"" )
+SET(CTEST_COMMAND "ctest -D Nightly -A \"${CTEST_BINARY_DIRECTORY}/cmake_config_report.txt\"" )
# what cmake command to use for configuring this dashboard
-SET (CTEST_CMAKE_COMMAND "cmake" )
+SET(CTEST_CMAKE_COMMAND "cmake" )
####################################################################
@@ -23,11 +23,11 @@
####################################################################
# should ctest wipe the binary tree before running
-SET (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
+SET(CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
# this is the initial cache to use for the binary tree, be careful to escape
# any quotes inside of this string if you use it
-SET (CTEST_INITIAL_CACHE "
+SET(CTEST_INITIAL_CACHE "
MAKECOMMAND:STRING=make
BUILDNAME:STRING=Debian-gcc42
SITE:STRING=devdebian.acfr.usyd.edu.au
@@ -35,7 +35,7 @@
")
# set any extra envionment variables here
-SET (CTEST_ENVIRONMENT
+SET(CTEST_ENVIRONMENT
CC=gcc-4.2
CXX=g++-4.2
CXXFLAGS=-fprofile-arcs -ftest-coverage
Modified: gearbox/trunk/cmake/internal/Setup.cmake
===================================================================
--- gearbox/trunk/cmake/internal/Setup.cmake 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/cmake/internal/Setup.cmake 2008-03-26 02:32:57 UTC (rev 109)
@@ -76,18 +76,18 @@
# Enable testing by including the Dart module
# (must be done *before* entering source directories )
-INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
+INCLUDE(${CMAKE_ROOT}/Modules/Dart.cmake)
ENABLE_TESTING()
#
# Enter the source tree
#
-ADD_SUBDIRECTORY ( src )
-ADD_SUBDIRECTORY ( submitted )
-# ADD_SUBDIRECTORY ( retired )
+ADD_SUBDIRECTORY( src )
+ADD_SUBDIRECTORY( submitted )
+# ADD_SUBDIRECTORY( retired )
# Some cmake and shell scripts need to be installed
-ADD_SUBDIRECTORY ( cmake )
+ADD_SUBDIRECTORY( cmake )
#
# Print results of CMake activity
@@ -97,9 +97,9 @@
#
# Print license information to a file
#
-IF ( GBX_BUILD_LICENSE )
+IF( GBX_BUILD_LICENSE )
GBX_WRITE_LICENSE()
-ENDIF ( GBX_BUILD_LICENSE )
+ENDIF( GBX_BUILD_LICENSE )
GBX_CONFIG_REPORT( "Nothing special" )
Modified: gearbox/trunk/src/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/CMakeLists.txt 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/src/CMakeLists.txt 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,6 +1,6 @@
# A place for well-tested and well-documented libraries.
-MESSAGE ( STATUS "== SRC ==" )
+MESSAGE( STATUS "== SRC ==" )
# When adding new directories, please maintain order of inter-dependencies.
# Otherwise, maintain alphabetical order.
Modified: gearbox/trunk/src/basicexample/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/basicexample/CMakeLists.txt 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/src/basicexample/CMakeLists.txt 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,10 +1,10 @@
-SET ( lib_name basicexample )
+SET( lib_name basicexample )
GBX_ADD_LICENSE( LGPL )
-SET ( build TRUE )
+SET( build TRUE )
GBX_REQUIRE_OPTION( build LIB ${lib_name} OFF )
-IF ( build )
+IF( build )
INCLUDE( ${GBX_CMAKE_DIR}/UseBasicRules.cmake )
@@ -17,8 +17,8 @@
# the custom command above is equivalent to this
# INSTALL( FILES ${hdrs} DESTINATION include/gearbox/basicexample )
-# IF ( GBX_BUILD_TESTS )
-# ADD_SUBDIRECTORY ( test )
-# ENDIF ( GBX_BUILD_TESTS )
+# IF( GBX_BUILD_TESTS )
+# ADD_SUBDIRECTORY( test )
+# ENDIF( GBX_BUILD_TESTS )
-ENDIF ( build )
+ENDIF( build )
Modified: gearbox/trunk/src/gbxadvancedexample/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxadvancedexample/CMakeLists.txt 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/src/gbxadvancedexample/CMakeLists.txt 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,14 +1,14 @@
-SET ( lib_name GbxAdvancedExample )
+SET( lib_name GbxAdvancedExample )
GBX_ADD_LICENSE( GPL )
-SET ( build TRUE )
+SET( build TRUE )
GBX_REQUIRE_OPTION( build LIB ${lib_name} OFF )
GBX_REQUIRE_VAR( build LIB ${lib_name} GBX_OS_LINUX "only Linux OS is supported" )
SET( dep_libs basicexample )
GBX_REQUIRE_TARGETS( build LIB ${lib_name} ${dep_libs} )
-IF ( build )
+IF( build )
INCLUDE( ${GBX_CMAKE_DIR}/UseBasicRules.cmake )
@@ -20,4 +20,4 @@
GBX_ADD_HEADERS( gbxadvancedexample ${hdrs} )
-ENDIF ( build )
+ENDIF( build )
Modified: gearbox/trunk/src/gbxserialacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxserialacfr/CMakeLists.txt 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/src/gbxserialacfr/CMakeLists.txt 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,7 +1,7 @@
-SET ( lib_name GbxSerialAcfr )
+SET( lib_name GbxSerialAcfr )
GBX_ADD_LICENSE( LGPL )
-SET ( build TRUE )
+SET( build TRUE )
GBX_REQUIRE_OPTION( build LIB ${lib_name} ON )
GBX_REQUIRE_VAR( build LIB ${lib_name} GBX_OS_LINUX "only Linux OS is supported" )
@@ -9,7 +9,7 @@
# this is currently internal, so we don't have to check it
# GBX_REQUIRE_TARGETS( build LIB ${lib_name} ${dep_libs} )
-IF ( build )
+IF( build )
ADD_SUBDIRECTORY( lockfile )
@@ -27,9 +27,9 @@
GBX_ADD_HEADERS( gbxserialacfr ${hdrs} )
- IF ( GBX_BUILD_TESTS )
- ADD_SUBDIRECTORY ( test )
- ENDIF ( GBX_BUILD_TESTS )
+ IF( GBX_BUILD_TESTS )
+ ADD_SUBDIRECTORY( test )
+ ENDIF( GBX_BUILD_TESTS )
-ENDIF ( build )
+ENDIF( build )
Modified: gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,13 +1,13 @@
-SET ( lib_name GbxLockFileAcfr )
+SET( lib_name GbxLockFileAcfr )
GBX_ADD_LICENSE( LGPL )
-SET ( build TRUE )
+SET( build TRUE )
# don't give user an option
# 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" )
-IF ( build )
+IF( build )
INCLUDE( ${GBX_CMAKE_DIR}/UseBasicRules.cmake )
@@ -19,8 +19,8 @@
GBX_ADD_HEADERS( gbxserialacfr/lockfile ${hdrs} )
- IF ( GBX_BUILD_TESTS )
- ADD_SUBDIRECTORY ( test )
- ENDIF ( GBX_BUILD_TESTS )
+ IF( GBX_BUILD_TESTS )
+ ADD_SUBDIRECTORY( test )
+ ENDIF( GBX_BUILD_TESTS )
-ENDIF ( build )
+ENDIF( build )
Modified: gearbox/trunk/src/gbxsickacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsickacfr/CMakeLists.txt 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/src/gbxsickacfr/CMakeLists.txt 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,7 +1,7 @@
-SET ( lib_name GbxSickAcfr )
+SET( lib_name GbxSickAcfr )
GBX_ADD_LICENSE( LGPL )
-SET ( build TRUE )
+SET( build TRUE )
GBX_REQUIRE_OPTION( build LIB ${lib_name} ON )
GBX_REQUIRE_VAR( build LIB ${lib_name} GBX_OS_LINUX "only Linux OS is supported" )
@@ -14,7 +14,7 @@
# these are built internally
SET( int_libs GbxUtilAcfr GbxIceUtilAcfr GbxSerialDeviceAcfr )
-IF ( build )
+IF( build )
ADD_SUBDIRECTORY( gbxutilacfr )
ADD_SUBDIRECTORY( gbxiceutilacfr )
@@ -33,8 +33,8 @@
GBX_ADD_HEADERS( gbxsickacfr ${hdrs} )
- IF ( GBX_BUILD_TESTS )
- ADD_SUBDIRECTORY ( test )
- ENDIF ( GBX_BUILD_TESTS )
+ IF( GBX_BUILD_TESTS )
+ ADD_SUBDIRECTORY( test )
+ ENDIF( GBX_BUILD_TESTS )
-ENDIF ( build )
+ENDIF( build )
Modified: gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,7 +1,7 @@
-SET ( lib_name GbxIceUtilAcfr )
+SET( lib_name GbxIceUtilAcfr )
GBX_ADD_LICENSE( LGPL )
-SET ( build TRUE )
+SET( build TRUE )
# don't give user an option
# GBX_REQUIRE_OPTION( build LIB ${lib_name} ON )
@@ -16,7 +16,7 @@
SET( proj_libs GbxUtilAcfr )
# GBX_REQUIRE_TARGETS( build LIB ${lib_name} ${proj_libs} )
-IF ( build )
+IF( build )
INCLUDE( ${GBX_CMAKE_DIR}/UseBasicRules.cmake )
INCLUDE( ${GBX_CMAKE_DIR}/UseIceUtil.cmake )
@@ -33,8 +33,8 @@
GBX_ADD_HEADERS( gbxsickacfr/gbxiceutilacfr ${hdrs} )
- IF ( GBX_BUILD_TESTS )
- ADD_SUBDIRECTORY ( test )
- ENDIF ( GBX_BUILD_TESTS )
+ IF( GBX_BUILD_TESTS )
+ ADD_SUBDIRECTORY( test )
+ ENDIF( GBX_BUILD_TESTS )
-ENDIF ( build )
+ENDIF( build )
Modified: gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,7 +1,7 @@
-SET ( lib_name GbxSerialDeviceAcfr )
+SET( lib_name GbxSerialDeviceAcfr )
GBX_ADD_LICENSE( LGPL )
-SET ( build TRUE )
+SET( build TRUE )
# don't give user an option
# GBX_REQUIRE_OPTION( build LIB ${lib_name} ON )
@@ -16,7 +16,7 @@
SET( proj_libs GbxSerialAcfr )
# GBX_REQUIRE_TARGETS( build LIB ${lib_name} ${proj_libs} )
-IF ( build )
+IF( build )
INCLUDE( ${GBX_CMAKE_DIR}/UseBasicRules.cmake )
INCLUDE( ${GBX_CMAKE_DIR}/UseIceUtil.cmake )
@@ -33,8 +33,8 @@
GBX_ADD_HEADERS( gbxsickacfr/gbxserialdeviceacfr ${hdrs} )
-# IF ( GBX_BUILD_TESTS )
-# ADD_SUBDIRECTORY ( test )
-# ENDIF ( GBX_BUILD_TESTS )
+# IF( GBX_BUILD_TESTS )
+# ADD_SUBDIRECTORY( test )
+# ENDIF( GBX_BUILD_TESTS )
-ENDIF ( build )
+ENDIF( build )
Modified: gearbox/trunk/src/gbxsickacfr/gbxutilacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsickacfr/gbxutilacfr/CMakeLists.txt 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/src/gbxsickacfr/gbxutilacfr/CMakeLists.txt 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,11 +1,11 @@
-SET ( lib_name GbxUtilAcfr )
+SET( lib_name GbxUtilAcfr )
GBX_ADD_LICENSE( LGPL )
-SET ( build TRUE )
+SET( build TRUE )
# don't give user an option
# GBX_REQUIRE_OPTION( build LIB ${lib_name} ON )
-IF ( build )
+IF( build )
INCLUDE( ${GBX_CMAKE_DIR}/UseBasicRules.cmake )
@@ -19,8 +19,8 @@
GBX_ADD_HEADERS( gbxsickacfr/gbxutilacfr ${hdrs} )
- IF ( GBX_BUILD_TESTS )
- ADD_SUBDIRECTORY ( test )
- ENDIF ( GBX_BUILD_TESTS )
+ IF( GBX_BUILD_TESTS )
+ ADD_SUBDIRECTORY( test )
+ ENDIF( GBX_BUILD_TESTS )
-ENDIF ( build )
+ENDIF( build )
Modified: gearbox/trunk/src/urg_nz/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/urg_nz/CMakeLists.txt 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/src/urg_nz/CMakeLists.txt 2008-03-26 02:32:57 UTC (rev 109)
@@ -1,12 +1,12 @@
-SET ( lib_name urg_nz )
+SET( lib_name urg_nz )
set ( lib_desc "Hokuyo URG laser scanner driver" )
GBX_ADD_LICENSE( GPL )
-SET ( build TRUE )
+SET( build TRUE )
GBX_REQUIRE_OPTION( build LIB ${lib_name} ON )
GBX_REQUIRE_VAR( build LIB ${lib_name} GBX_OS_LINUX "Only Linux OS is supported" )
-IF ( build )
+IF( build )
INCLUDE( ${GBX_CMAKE_DIR}/UseBasicRules.cmake )
@@ -20,4 +20,4 @@
GBX_ADD_EXAMPLE( ${lib_name} example.cmake.in example.cmake example.cpp example.readme )
-ENDIF ( build )
+ENDIF( build )
Modified: gearbox/trunk/submitted/CMakeLists.txt
===================================================================
--- gearbox/trunk/submitted/CMakeLists.txt 2008-03-26 01:52:08 UTC (rev 108)
+++ gearbox/trunk/submitted/CMakeLists.txt 2008-03-26 02:32:57 UTC (rev 109)
@@ -3,11 +3,11 @@
OPTION ( GBX_BUILD_SUBMITTED "Build submitted libraries" OFF )
MARK_AS_ADVANCED ( FORCE GBX_BUILD_SUBMITTED )
-IF ( GBX_BUILD_SUBMITTED )
+IF( GBX_BUILD_SUBMITTED )
- MESSAGE ( STATUS "== SUBMITTED ==" )
+ MESSAGE( STATUS "== SUBMITTED ==" )
# When adding new directories, please maintain order of inter-dependencies.
# Otherwise, maintain alphabetical order.
-ENDIF ( GBX_BUILD_SUBMITTED )
\ No newline at end of file
+ENDIF( GBX_BUILD_SUBMITTED )
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|