diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03082d6dea9186946a940cf75c8856fd0de01bc1..927cb12b2ba83a1312e26919f94e11559fc36eab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,12 +2,12 @@ PROJECT(Simox)
cmake_minimum_required(VERSION 2.6)
MESSAGE(STATUS "******************** Configuring Simox ************************")
-set (SIMOX_BUILD_DIRECTORY ${CMAKE_BINARY_DIR} CACHE STRING "Simox build directory")
+set (Simox_BUILD_DIRECTORY ${CMAKE_BINARY_DIR} CACHE STRING "Simox build directory")
INCLUDE (config.cmake)
-MESSAGE(STATUS "\n** SETTING Simox target directory to: ${SIMOX_BUILD_DIRECTORY}")
+MESSAGE(STATUS "\n** SETTING Simox target directory to: ${Simox_BUILD_DIRECTORY}")
add_subdirectory(VirtualRobot)
add_subdirectory(MotionPlanning)
add_subdirectory(GraspPlanning)
@@ -21,16 +21,16 @@ add_subdirectory(doc)
############################################
MESSAGE (STATUS "\n ***** Simox: Generating CMake files for build and install setup")
-set(SIMOX_MAJOR_VERSION 2)
-set(SIMOX_MINOR_VERSION 1)
-set(SIMOX_PATCH_VERSION 3)
-set(SIMOX_VERSION
- ${SIMOX_MAJOR_VERSION}.${SIMOX_MINOR_VERSION}.${SIMOX_PATCH_VERSION})
+set(Simox_MAJOR_VERSION 2)
+set(Simox_MINOR_VERSION 1)
+set(Simox_PATCH_VERSION 3)
+set(Simox_VERSION
+ ${Simox_MAJOR_VERSION}.${Simox_MINOR_VERSION}.${Simox_PATCH_VERSION})
-MESSAGE (STATUS " ** Simox version: ${SIMOX_VERSION}")
+MESSAGE (STATUS " ** Simox version: ${Simox_VERSION}")
-set(SIMOX_LIBRARIES VirtualRobot Saba GraspStudio)
-set(SIMOX_EXECUTABLES "")
+set(Simox_LIBRARIES VirtualRobot Saba GraspStudio)
+set(Simox_EXECUTABLES "")
# Export the package for use from the build-tree
# (this registers the build-tree with a global CMake-registry)
@@ -46,91 +46,91 @@ EXPORT(PACKAGE Simox)
#message(STATUS "VirtualRobot_external_INCLUDE_DIRS: ${VirtualRobot_external_INCLUDE_DIRS}")
# import Virtual-Robot configs (build)
-SET (VIRTUAL_ROBOT_CONFIG_INBUILD "${SIMOX_BUILD_DIRECTORY}/VirtualRobotConfig.cmake")
-SET (VIRTUAL_ROBOT_CONFIG_INSTALL_LOCAL "${SIMOX_BUILD_DIRECTORY}/InstallFiles/VirtualRobotConfig.cmake")
-#MESSAGE ("VIRTUAL_ROBOT_CONFIG_INBUILD = ${VIRTUAL_ROBOT_CONFIG_INBUILD}")
-#MESSAGE ("VIRTUAL_ROBOT_CONFIG_INSTALL_LOCAL = ${VIRTUAL_ROBOT_CONFIG_INSTALL_LOCAL}")
-include ("${VIRTUAL_ROBOT_CONFIG_INBUILD}")
+SET (VirtualRobot_CONFIG_INBUILD "${Simox_BUILD_DIRECTORY}/VirtualRobotConfig.cmake")
+SET (VirtualRobot_CONFIG_INSTALL_LOCAL "${Simox_BUILD_DIRECTORY}/InstallFiles/VirtualRobotConfig.cmake")
+#MESSAGE ("VirtualRobot_CONFIG_INBUILD = ${VirtualRobot_CONFIG_INBUILD}")
+#MESSAGE ("VirtualRobot_CONFIG_INSTALL_LOCAL = ${VirtualRobot_CONFIG_INSTALL_LOCAL}")
+include ("${VirtualRobot_CONFIG_INBUILD}")
# Create an SimoxConfig.cmake file for the use from the build tree
-SET(SIMOX_LIBRARIES_ALL "${VIRTUAL_ROBOT_LIBRARIES}" "Saba" "GraspStudio")
-SET(SIMOX_BASE_DIR "${PROJECT_SOURCE_DIR}")
-SET(SIMOX_INCLUDE_DIRS "${VIRTUAL_ROBOT_INCLUDE_DIRS}" "${GRASP_STUDIO_INCLUDE_DIRS}" "${SABA_INCLUDE_DIRS}")
-SET(SIMOX_LIB_DIRS "${VIRTUAL_ROBOT_LIBRARY_DIRS}" "${GRASP_STUDIO_LIBRARY_DIRS}" "${SABA_LIBRARY_DIRS}")
-SET(SIMOX_LIB_FLAGS "${VIRTUAL_ROBOT_COMPILE_FLAGS} ${GRASP_STUDIO_COMPILE_FLAGS} ${SABA_COMPILE_FLAGS}")
-SET(SIMOX_CMAKE_DIR "${SIMOX_BUILD_DIRECTORY}/share/Simox/cmake")
-SET(VIRTUAL_ROBOT_CMAKE_DIR "${SIMOX_BUILD_DIRECTORY}/share/VirtualRobot/cmake")
-SET(SIMOX_LIBRARY_CMAKE_INCLUDE "${VIRTUAL_ROBOT_CMAKE_INCLUDE}")
-SET(SIMOX_DATA_PATH "${VIRTUAL_ROBOT_DATA_PATH}")
+SET(Simox_LIBRARIES_ALL "${VirtualRobot_LIBRARIES}" "Saba" "GraspStudio")
+SET(Simox_BASE_DIR "${PROJECT_SOURCE_DIR}")
+SET(Simox_INCLUDE_DIRS "${VirtualRobot_INCLUDE_DIRS}" "${GRASP_STUDIO_INCLUDE_DIRS}" "${SABA_INCLUDE_DIRS}")
+SET(Simox_LIB_DIRS "${VirtualRobot_LIBRARY_DIRS}" "${GRASP_STUDIO_LIBRARY_DIRS}" "${SABA_LIBRARY_DIRS}")
+SET(Simox_LIB_FLAGS "${VirtualRobot_COMPILE_FLAGS} ${GRASP_STUDIO_COMPILE_FLAGS} ${SABA_COMPILE_FLAGS}")
+SET(Simox_CMAKE_DIR "${Simox_BUILD_DIRECTORY}/share/Simox/cmake")
+SET(VirtualRobot_CMAKE_DIR "${Simox_BUILD_DIRECTORY}/share/VirtualRobot/cmake")
+SET(Simox_LIBRARY_CMAKE_INCLUDE "${VirtualRobot_CMAKE_INCLUDE}")
+SET(Simox_DATA_PATH "${VirtualRobot_DATA_PATH}")
# the SimoxConfig.cmake will be used by external porjects to setup Simox via the FindPackage method.
-# So it must be located in the Simox_DIR directory (build-tree -> SIMOX_BUILD_DIRECTORY)
+# So it must be located in the Simox_DIR directory (build-tree -> Simox_BUILD_DIRECTORY)
configure_file(
${PROJECT_SOURCE_DIR}/CMakeModules/SimoxConfig.cmake.in
- "${SIMOX_BUILD_DIRECTORY}/SimoxConfig.cmake"
+ "${Simox_BUILD_DIRECTORY}/SimoxConfig.cmake"
@ONLY)
configure_file(
${PROJECT_SOURCE_DIR}/CMakeModules/SimoxConfigVersion.cmake.in
- "${SIMOX_BUILD_DIRECTORY}/SimoxConfigVersion.cmake"
+ "${Simox_BUILD_DIRECTORY}/SimoxConfigVersion.cmake"
@ONLY)
configure_file("${PROJECT_SOURCE_DIR}/CMakeModules/SimoxExternalLibrarySetup.cmake"
- "${SIMOX_BUILD_DIRECTORY}/share/Simox/cmake/SimoxExternalLibrarySetup.cmake" COPYONLY)
+ "${Simox_BUILD_DIRECTORY}/share/Simox/cmake/SimoxExternalLibrarySetup.cmake" COPYONLY)
configure_file("${PROJECT_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake"
- "${SIMOX_BUILD_DIRECTORY}/share/Simox/cmake/SimoxMacros.cmake" COPYONLY)
+ "${Simox_BUILD_DIRECTORY}/share/Simox/cmake/SimoxMacros.cmake" COPYONLY)
configure_file("${PROJECT_SOURCE_DIR}/CMakeModules/FindSimox.cmake"
- "${SIMOX_BUILD_DIRECTORY}/share/Simox/cmake/FindSimox.cmake" COPYONLY)
+ "${Simox_BUILD_DIRECTORY}/share/Simox/cmake/FindSimox.cmake" COPYONLY)
# Create an SimoxConfig.cmake file for the use from the install tree
# and install it
# import Virtual-Robot configs (install)
# do not include files from install tree here (the files are not installed yet. So include them manually from inbuild)
-SET (VIRTUAL_ROBOT_DISABLE_DEPENDENCIES_INCLUDE TRUE)
-include ("${VIRTUAL_ROBOT_CONFIG_INSTALL_LOCAL}")
+SET (VirtualRobot_DISABLE_DEPENDENCIES_INCLUDE TRUE)
+include ("${VirtualRobot_CONFIG_INSTALL_LOCAL}")
include(${PROJECT_SOURCE_DIR}/VirtualRobot/CMakeModules/VirtualRobotExternalLibrarySetup.cmake)
include(${PROJECT_SOURCE_DIR}/VirtualRobot/CMakeModules/VirtualRobotMacros.cmake)
-SET(SIMOX_INCLUDE_DIRS "${VIRTUAL_ROBOT_INCLUDE_DIRS}" "${GRASP_STUDIO_INCLUDE_DIRS}" "${SABA_INCLUDE_DIRS}")
-SET(SIMOX_LIB_DIRS "${VIRTUAL_ROBOT_LIBRARY_DIRS}" "${GRASP_STUDIO_LIBRARY_DIRS}" "${SABA_LIBRARY_DIRS}")
-SET(SIMOX_LIB_FLAGS "${VIRTUAL_ROBOT_COMPILE_FLAGS} ${GRASP_STUDIO_COMPILE_FLAGS} ${SABA_COMPILE_FLAGS}")
-SET(SIMOX_BASE_DIR "${CMAKE_INSTALL_PREFIX}/include")
-SET(SIMOX_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/share/Simox/cmake")
-SET(VIRTUAL_ROBOT_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/share/VirtualRobot/cmake")
-SET(SIMOX_DATA_PATH "${CMAKE_INSTALL_PREFIX}/data")
+SET(Simox_INCLUDE_DIRS "${VirtualRobot_INCLUDE_DIRS}" "${GRASP_STUDIO_INCLUDE_DIRS}" "${SABA_INCLUDE_DIRS}")
+SET(Simox_LIB_DIRS "${VirtualRobot_LIBRARY_DIRS}" "${GRASP_STUDIO_LIBRARY_DIRS}" "${SABA_LIBRARY_DIRS}")
+SET(Simox_LIB_FLAGS "${VirtualRobot_COMPILE_FLAGS} ${GRASP_STUDIO_COMPILE_FLAGS} ${SABA_COMPILE_FLAGS}")
+SET(Simox_BASE_DIR "${CMAKE_INSTALL_PREFIX}/include")
+SET(Simox_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/share/Simox/cmake")
+SET(VirtualRobot_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/share/VirtualRobot/cmake")
+SET(Simox_DATA_PATH "${CMAKE_INSTALL_PREFIX}/data")
configure_file(
${PROJECT_SOURCE_DIR}/CMakeModules/SimoxConfig.cmake.in
- "${SIMOX_BUILD_DIRECTORY}/InstallFiles/SimoxConfig.cmake"
+ "${Simox_BUILD_DIRECTORY}/InstallFiles/SimoxConfig.cmake"
@ONLY)
configure_file(
${PROJECT_SOURCE_DIR}/CMakeModules/SimoxConfigVersion.cmake.in
- "${SIMOX_BUILD_DIRECTORY}/InstallFiles/SimoxConfigVersion.cmake"
+ "${Simox_BUILD_DIRECTORY}/InstallFiles/SimoxConfigVersion.cmake"
@ONLY)
# The SimoxConfig.cmake will be used by external porjects to setup Simox via the FindPackage method.
# So it must be located in the Simox_DIR directory (install-tree -> CMAKE_INSTALL_PREFIX)
install(FILES
- "${SIMOX_BUILD_DIRECTORY}/InstallFiles/SimoxConfig.cmake"
- "${SIMOX_BUILD_DIRECTORY}/InstallFiles/SimoxConfigVersion.cmake"
+ "${Simox_BUILD_DIRECTORY}/InstallFiles/SimoxConfig.cmake"
+ "${Simox_BUILD_DIRECTORY}/InstallFiles/SimoxConfigVersion.cmake"
DESTINATION "${CMAKE_INSTALL_PREFIX}")
install(FILES
"${PROJECT_SOURCE_DIR}/CMakeModules/SimoxExternalLibrarySetup.cmake"
"${PROJECT_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake"
"${PROJECT_SOURCE_DIR}/CMakeModules/FindSimox.cmake"
- DESTINATION "${SIMOX_CMAKE_DIR}")
+ DESTINATION "${Simox_CMAKE_DIR}")
install(FILES
"${PROJECT_SOURCE_DIR}/CMakeModules/SimoxExternalLibrarySetup.cmake"
"${PROJECT_SOURCE_DIR}/CMakeModules/SimoxMacros.cmake"
"${PROJECT_SOURCE_DIR}/CMakeModules/FindSimox.cmake"
- DESTINATION "${SIMOX_CMAKE_DIR}")
+ DESTINATION "${Simox_CMAKE_DIR}")
#
#INSTALL(TARGETS Simox
# EXPORT SimoxLibraryDepends
-# RUNTIME DESTINATION ${SIMOX_INSTALL_BIN_DIR}
-# LIBRARY DESTINATION ${SIMOX_INSTALL_LIB_DIR}
-# ARCHIVE DESTINATION ${SIMOX_INSTALL_LIB_DIR}
+# RUNTIME DESTINATION ${Simox_INSTALL_BIN_DIR}
+# LIBRARY DESTINATION ${Simox_INSTALL_LIB_DIR}
+# ARCHIVE DESTINATION ${Simox_INSTALL_LIB_DIR}
# )
diff --git a/CMakeModules/FindSimox.cmake b/CMakeModules/FindSimox.cmake
index 23e2673371017364a30c0178db9738d64d392416..345b45b397799c5d9d991b14d54954633d3e5d9c 100644
--- a/CMakeModules/FindSimox.cmake
+++ b/CMakeModules/FindSimox.cmake
@@ -9,16 +9,16 @@
## [ The paths should point to either the build or the install directory or Simox ]
#
# The following variables are set:
-## SIMOX_FOUND - TRUE on success
-## SIMOX_INCLUDE_DIR - The include directory
-## SIMOX_LIBRARIES - The libraries
+## Simox_FOUND - TRUE on success
+## Simox_INCLUDE_DIR - The include directory
+## Simox_LIBRARIES - The libraries
#
#
# A CMakeLists.txt file for setting up a simox related project could look like this:
#
## PROJECT ( myDemo )
## FIND_PACKAGE(Simox REQUIRED)
-## IF(SIMOX_USE_COIN_VISUALIZATION)
+## IF(Simox_USE_COIN_VISUALIZATION)
## FILE(GLOB SRCS ${PROJECT_SOURCE_DIR}/myDemo.cpp ${PROJECT_SOURCE_DIR}/myWindow.cpp)
## FILE(GLOB INCS ${PROJECT_SOURCE_DIR}/myWindow.h)
## set(GUI_MOC_HDRS ${PROJECT_SOURCE_DIR}/myWindow.h)
@@ -33,17 +33,20 @@ find_path( Simox_DIR SimoxConfig.cmake
"${Simox_DIR}"
"$ENV{Simox_DIR}")
-SET (Simox_CMAKE_CONFIG ${Simox_DIR}/SimoxConfig.cmake)
-MESSAGE(STATUS " * Including ${Simox_CMAKE_CONFIG}")
+SET (Simox_CMAKE_CONFIG ${Simox_DIR}/SimoxConfig.cmake)
+if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE(STATUS " * Including ${Simox_CMAKE_CONFIG}")
+endif()
include (${Simox_CMAKE_CONFIG})
-if( SIMOX_LIBRARIES AND SIMOX_BASE_DIR)
- set( SIMOX_FOUND TRUE )
- set( SIMOX_INCLUDE_DIR ${SIMOX_BASE_DIR} )
- set( SIMOX_LIBRARY ${SIMOX_LIBRARIES} )
+if( Simox_LIBRARIES AND Simox_BASE_DIR)
+ set( Simox_FOUND TRUE )
+ set( VirtualRobot_FOUND TRUE )
+ set( Simox_INCLUDE_DIR ${Simox_BASE_DIR} )
+ set( Simox_LIBRARY ${Simox_LIBRARIES} )
endif()
include( FindPackageHandleStandardArgs )
-find_package_handle_standard_args( Simox DEFAULT_MSG SIMOX_LIBRARIES SIMOX_INCLUDE_DIR )
+find_package_handle_standard_args( Simox DEFAULT_MSG Simox_LIBRARIES Simox_INCLUDE_DIR )
-mark_as_advanced( SIMOX_INCLUDE_DIR SIMOX_LIBRARIES )
+mark_as_advanced( Simox_INCLUDE_DIR Simox_LIBRARIES )
diff --git a/CMakeModules/SimoxConfig.cmake.in b/CMakeModules/SimoxConfig.cmake.in
index 17e1450fbe40123f0097735ea82871a91a546f6c..51ba05c582b124cb0c487952d6da4eefbc567917 100644
--- a/CMakeModules/SimoxConfig.cmake.in
+++ b/CMakeModules/SimoxConfig.cmake.in
@@ -2,43 +2,47 @@
# - Config file for the Simox package
# It defines the following variables
-# SIMOX_INCLUDE_DIRS - include directories for Simox
-# SIMOX_LIBRARY_DIRS - library directories for Simox (normally not used!)
-# SIMOX_LIBRARIES - libraries to link against
-# SIMOX_EXECUTABLES - the Simox executable
-# SIMOX_COMPILE_FLAGS - compile flags
-# SIMOX_CMAKE_INCLUDE - list of includes that may be neccessary for external libraries (e.g. QT_USE_FILE)
-# SIMOX_DATA_PATH - the standard data path
-# SIMOX_CMAKE_DIR - Path to Simox cmake files.
-# SIMOX_BASE_DIR - Path to Simox
+# Simox_INCLUDE_DIRS - include directories for Simox
+# Simox_LIBRARY_DIRS - library directories for Simox (normally not used!)
+# Simox_LIBRARIES - libraries to link against
+# Simox_EXECUTABLES - the Simox executable
+# Simox_COMPILE_FLAGS - compile flags
+# Simox_CMAKE_INCLUDE - list of includes that may be neccessary for external libraries (e.g. QT_USE_FILE)
+# Simox_DATA_PATH - the standard data path
+# Simox_CMAKE_DIR - Path to Simox cmake files.
+# Simox_BASE_DIR - Path to Simox
-SET(SIMOX_INCLUDE_DIRS "@SIMOX_INCLUDE_DIRS@")
-SET(SIMOX_LIBRARY_DIRS "@SIMOX_LIB_DIRS@")
-SET(SIMOX_COMPILE_FLAGS "@SIMOX_LIB_FLAGS@")
-SET(SIMOX_CMAKE_INCLUDE "@SIMOX_LIBRARY_CMAKE_INCLUDE@")
-SET(SIMOX_DATA_PATH "@SIMOX_DATA_PATH@")
-SET(SIMOX_CMAKE_DIR "@SIMOX_CMAKE_DIR@")
-SET(VIRTUAL_ROBOT_CMAKE_DIR "@VIRTUAL_ROBOT_CMAKE_DIR@")
-SET(SIMOX_BASE_DIR "@SIMOX_BASE_DIR@")
+SET(Simox_INCLUDE_DIRS "@Simox_INCLUDE_DIRS@")
+SET(Simox_LIBRARY_DIRS "@Simox_LIB_DIRS@")
+SET(Simox_COMPILE_FLAGS "@Simox_LIB_FLAGS@")
+SET(Simox_CMAKE_INCLUDE "@Simox_LIBRARY_CMAKE_INCLUDE@")
+SET(Simox_DATA_PATH "@Simox_DATA_PATH@")
+SET(Simox_CMAKE_DIR "@Simox_CMAKE_DIR@")
+SET(VirtualRobot_CMAKE_DIR "@VirtualRobot_CMAKE_DIR@")
+SET(Simox_BASE_DIR "@Simox_BASE_DIR@")
# These are IMPORTED targets created by SimoxLibraryDepends.cmake
-SET(SIMOX_LIBRARIES "@SIMOX_LIBRARIES_ALL@")
-SET(SIMOX_EXECUTABLES "@SIMOX_EXECUTABLES@")
+SET(Simox_LIBRARIES "@Simox_LIBRARIES_ALL@")
+SET(Simox_EXECUTABLES "@Simox_EXECUTABLES@")
-SET(SIMOX_VISUALIZATION "@SIMOX_VISUALIZATION@")
-SET(SIMOX_USE_COIN_VISUALIZATION "@SIMOX_USE_COIN_VISUALIZATION@")
-SET(SIMOX_USE_OPENSCENEGRAPH_VISUALIZATION "@SIMOX_USE_OPENSCENEGRAPH_VISUALIZATION@")
-SET(SIMOX_VISUALIZATION_LIBS "@SIMOX_VISUALIZATION_LIBS@")
-SET(SIMOX_VISUALIZATION_INCLUDE_PATHS "@SIMOX_VISUALIZATION_INCLUDE_PATHS@")
-SET(SIMOX_VISUALIZATION_COMPILE_FLAGS "@SIMOX_VISUALIZATION_COMPILE_FLAGS@")
+SET(Simox_VISUALIZATION "@Simox_VISUALIZATION@")
+SET(Simox_USE_COIN_VISUALIZATION "@Simox_USE_COIN_VISUALIZATION@")
+SET(Simox_USE_OPENSCENEGRAPH_VISUALIZATION "@Simox_USE_OPENSCENEGRAPH_VISUALIZATION@")
+SET(Simox_VISUALIZATION_LIBS "@Simox_VISUALIZATION_LIBS@")
+SET(Simox_VISUALIZATION_INCLUDE_PATHS "@Simox_VISUALIZATION_INCLUDE_PATHS@")
+SET(Simox_VISUALIZATION_COMPILE_FLAGS "@Simox_VISUALIZATION_COMPILE_FLAGS@")
# Convenient setup: all simox-related dependencies are included here.
-# If this causes troubles, disable it by steting SIMOX_DISABLE_DEPENDENCIES_INCLUDE.
+# If this causes troubles, disable it by steting Simox_DISABLE_DEPENDENCIES_INCLUDE.
# Then you will need to setup the dependencies on your own, similar to the setup in SimoxExternalLibrarySetup.cmake
-IF(NOT SIMOX_DISABLE_DEPENDENCIES_INCLUDE)
+IF(NOT Simox_DISABLE_DEPENDENCIES_INCLUDE)
# include all library dependencies
- MESSAGE(STATUS " * Including ${SIMOX_CMAKE_DIR}/SimoxExternalLibrarySetup.cmake")
- include(${SIMOX_CMAKE_DIR}/SimoxExternalLibrarySetup.cmake)
- MESSAGE(STATUS " * Including ${SIMOX_CMAKE_DIR}/SimoxMacros.cmake")
- include(${SIMOX_CMAKE_DIR}/SimoxMacros.cmake)
+ if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE(STATUS " * Including ${Simox_CMAKE_DIR}/SimoxExternalLibrarySetup.cmake")
+ endif()
+ include(${Simox_CMAKE_DIR}/SimoxExternalLibrarySetup.cmake)
+ if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE(STATUS " * Including ${Simox_CMAKE_DIR}/SimoxMacros.cmake")
+ endif()
+ include(${Simox_CMAKE_DIR}/SimoxMacros.cmake)
ENDIF()
diff --git a/CMakeModules/SimoxConfigVersion.cmake.in b/CMakeModules/SimoxConfigVersion.cmake.in
index 7af48785509e3153199f84d22e8df783e5c42e7d..72771e106ce9522a495e4d06dfaca04b27db655e 100644
--- a/CMakeModules/SimoxConfigVersion.cmake.in
+++ b/CMakeModules/SimoxConfigVersion.cmake.in
@@ -1,6 +1,6 @@
## Copyright (c) 2012, Karlsruhe Institute of Technology
-set(PACKAGE_VERSION "@SIMOX_VERSION@")
+set(PACKAGE_VERSION "@Simox_VERSION@")
# Check whether the requested PACKAGE_FIND_VERSION is compatible
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
diff --git a/CMakeModules/SimoxExternalLibrarySetup.cmake b/CMakeModules/SimoxExternalLibrarySetup.cmake
index f29f7a9e96936f1d8847ebba2e9bf9a00336b5d6..7dbca40570d92dd05ec9620fe0da4d36b639842a 100644
--- a/CMakeModules/SimoxExternalLibrarySetup.cmake
+++ b/CMakeModules/SimoxExternalLibrarySetup.cmake
@@ -1,12 +1,14 @@
# Setup paths, libs and external cmake files to be used for SIMOX
-MESSAGE(STATUS "SETTING LIBRARY DEPENDENCIES FOR SIMOX")
+if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE(STATUS "SETTING LIBRARY DEPENDENCIES FOR SIMOX")
+endif()
# VR
INCLUDE (${Simox_DIR}/VirtualRobotConfig.cmake)
-INCLUDE (${VIRTUAL_ROBOT_CMAKE_DIR}/VirtualRobotExternalLibrarySetup.cmake)
+INCLUDE (${VirtualRobot_CMAKE_DIR}/VirtualRobotExternalLibrarySetup.cmake)
# SABA
diff --git a/CMakeModules/SimoxMacros.cmake b/CMakeModules/SimoxMacros.cmake
index 668c87272087a376a63d0c55d92dfff5d6168d84..22c2a9c41c86851c0e9fb1b9cc6aacc4143e70a3 100644
--- a/CMakeModules/SimoxMacros.cmake
+++ b/CMakeModules/SimoxMacros.cmake
@@ -11,7 +11,7 @@ function(VirtualRobotQtApplication name srcs incs mocFiles uiFiles)
################################## EXECUTABLE ##############################
ADD_EXECUTABLE(${name} ${srcs} ${incs} ${generatedUiFiles} ${generatedMocFiles})
- TARGET_LINK_LIBRARIES(${name} ${VIRTUAL_ROBOT_LIBRARIES})
+ TARGET_LINK_LIBRARIES(${name} ${VirtualRobot_LIBRARIES})
endfunction()
diff --git a/GraspPlanning/CMakeLists.txt b/GraspPlanning/CMakeLists.txt
index 81dbdd968a97531f27a372b8c24c81266a510861..6cdf3dba7c357c14a776c31f4e4b007030769612 100644
--- a/GraspPlanning/CMakeLists.txt
+++ b/GraspPlanning/CMakeLists.txt
@@ -39,7 +39,7 @@ Visualization/ConvexHullVisualization.h
${GRASPSTUDIO_SimoxDir}/VirtualRobot/definesVR.h
)
-if (SIMOX_VISUALIZATION AND SIMOX_USE_COIN_VISUALIZATION)
+if (Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION)
SET(SOURCES
${SOURCES}
Visualization/CoinVisualization/CoinConvexHullVisualization.cpp
@@ -51,20 +51,20 @@ if (SIMOX_VISUALIZATION AND SIMOX_USE_COIN_VISUALIZATION)
)
endif ()
-# this var is considered for generating SIMOX_INCLUDE_DIRS_
+# this var is considered for generating Simox_INCLUDE_DIRS_
SET(GRASP_STUDIO_INCLUDE_DIRS "${GRASPSTUDIO_SimoxDir}" "${GRASPSTUDIO_DIR}" "${GRASPSTUDIO_DIR}/ExternalDependencies/qhull-2003.1/include")
INCLUDE_DIRECTORIES(${GRASPSTUDIO_SimoxDir})
INCLUDE_DIRECTORIES(${GRASPSTUDIO_DIR})
INCLUDE_DIRECTORIES(${GRASPSTUDIO_DIR}/ExternalDependencies/qhull-2003.1/include)
-INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS})
-ADD_DEFINITIONS(${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS})
+INCLUDE_DIRECTORIES(${VirtualRobot_EXTERNAL_INCLUDE_DIRS})
+ADD_DEFINITIONS(${VirtualRobot_EXTERNAL_LIBRARY_FLAGS})
ADD_LIBRARY (GraspStudio SHARED ${SOURCES} ${INCLUDES})
-#MESSAGE("VIRTUAL_ROBOT_ROBOT_LINK_LIBRARIES:" ${VIRTUAL_ROBOT_LINK_LIBRARIES})
-TARGET_LINK_LIBRARIES (GraspStudio ${COLLISIONDETECTION_LIB} ${VIRTUAL_ROBOT_EXTERNAL_LIBRARIES} VirtualRobot qhull)
+#MESSAGE("VirtualRobot_ROBOT_LINK_LIBRARIES:" ${VirtualRobot_LINK_LIBRARIES})
+TARGET_LINK_LIBRARIES (GraspStudio ${COLLISIONDETECTION_LIB} ${VirtualRobot_EXTERNAL_LIBRARIES} VirtualRobot qhull)
# include examples
ADD_SUBDIRECTORY(examples/)
diff --git a/GraspPlanning/config.cmake b/GraspPlanning/config.cmake
index a922472ea21a4e1a2b1460cb394166e09085ee1f..f0d9c6945b41e14506e401aefde8db3e5dedc1b7 100644
--- a/GraspPlanning/config.cmake
+++ b/GraspPlanning/config.cmake
@@ -7,35 +7,35 @@ IF (NOT GRASPSTUDIO_CONFIGURED)
SET(GRASPSTUDIO_DIR ${CurrentGSPath})
############################# SETUP PATHS TO Simox #############################
- SET(GS_SIMOX_DIR_STANDARD "${CurrentGSPath}/..")
+ SET(GS_Simox_DIR_STANDARD "${CurrentGSPath}/..")
# be sure to have the absolute path
- get_filename_component(GS_SIMOX_DIR_STANDARD ${GS_SIMOX_DIR_STANDARD} ABSOLUTE)
+ get_filename_component(GS_Simox_DIR_STANDARD ${GS_Simox_DIR_STANDARD} ABSOLUTE)
- SET (GRASPSTUDIO_SimoxDir ${GS_SIMOX_DIR_STANDARD} CACHE STRING "Path to Simox used by GraspStudio")
+ SET (GRASPSTUDIO_SimoxDir ${GS_Simox_DIR_STANDARD} CACHE STRING "Path to Simox used by GraspStudio")
INCLUDE(${GRASPSTUDIO_SimoxDir}/config.cmake)
#INCLUDE(${GRASPSTUDIO_SimoxDir}/CMakeModules/SimoxProject.cmake)
- IF(NOT DEFINED SIMOX_BUILD_DIRECTORY)
- get_filename_component(SIMOX_BUILD_DIRECTORY ${SIMOX_BUILD_DIRECTORY} ABSOLUTE)
- SET(SIMOX_BUILD_DIRECTORY "${GRASPSTUDIO_SimoxDir}/build" CACHE STRING "Simox build directory used by GraspStudio")
- SET(SIMOX_LIB_DIR ${SIMOX_BUILD_DIRECTORY}/lib)
- SET(SIMOX_BIN_DIR ${SIMOX_BUILD_DIRECTORY}/bin)
+ IF(NOT DEFINED Simox_BUILD_DIRECTORY)
+ get_filename_component(Simox_BUILD_DIRECTORY ${Simox_BUILD_DIRECTORY} ABSOLUTE)
+ SET(Simox_BUILD_DIRECTORY "${GRASPSTUDIO_SimoxDir}/build" CACHE STRING "Simox build directory used by GraspStudio")
+ SET(Simox_LIB_DIR ${Simox_BUILD_DIRECTORY}/lib)
+ SET(Simox_BIN_DIR ${Simox_BUILD_DIRECTORY}/bin)
ENDIF()
############################# SETUP PATHS #############################
#ADD_DEFINITIONS(-DGRASPSTUDIO_BASE_DIR="${GRASPSTUDIO_DIR}")
# Define, where to put the binaries
- SET(GRASPSTUDIO_LIB_DIR ${SIMOX_LIB_DIR})
- SET(GRASPSTUDIO_BIN_DIR ${SIMOX_BIN_DIR})
+ SET(GRASPSTUDIO_LIB_DIR ${Simox_LIB_DIR})
+ SET(GRASPSTUDIO_BIN_DIR ${Simox_BIN_DIR})
MESSAGE(STATUS "** GRASPSTUDIO_LIB_DIR: ${GRASPSTUDIO_LIB_DIR}")
MESSAGE(STATUS "** GRASPSTUDIO_BIN_DIR: ${GRASPSTUDIO_BIN_DIR}")
# Define, where to install the binaries
- SET(GRASPSTUDIO_INSTALL_LIB_DIR ${SIMOX_INSTALL_LIB_DIR})
- SET(GRASPSTUDIO_INSTALL_BIN_DIR ${SIMOX_INSTALL_BIN_DIR})
- SET(GRASPSTUDIO_INSTALL_HEADER_DIR ${SIMOX_INSTALL_HEADER_DIR})
+ SET(GRASPSTUDIO_INSTALL_LIB_DIR ${Simox_INSTALL_LIB_DIR})
+ SET(GRASPSTUDIO_INSTALL_BIN_DIR ${Simox_INSTALL_BIN_DIR})
+ SET(GRASPSTUDIO_INSTALL_HEADER_DIR ${Simox_INSTALL_HEADER_DIR})
#######################################################################
# Setup for testing
@@ -45,9 +45,9 @@ IF (NOT GRASPSTUDIO_CONFIGURED)
MACRO(ADD_GRASPSTUDIO_TEST TEST_NAME)
ADD_EXECUTABLE(${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp)
- TARGET_LINK_LIBRARIES(${TEST_NAME} VirtualRobot Saba GraspStudio ${VIRTUAL_ROBOT_LINK_LIBRARIES})
+ TARGET_LINK_LIBRARIES(${TEST_NAME} VirtualRobot Saba GraspStudio ${VirtualRobot_LINK_LIBRARIES})
IF(NOT UNIX)
- SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SIMOX_BIN_DIR})
+ SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
ENDIF(NOT UNIX)
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES FOLDER "GraspStudio Tests")
ADD_TEST( GraspStudio_${TEST_NAME} ${TEST_NAME} --output_format=XML --log_level=all --report_level=no)
diff --git a/GraspPlanning/examples/GraspPlanner/CMakeLists.txt b/GraspPlanning/examples/GraspPlanner/CMakeLists.txt
index cbb1eb1045b3a727151b401cd57ece4972eca617..5764582ca337487fb78c6a38b8a377c0213f24fe 100644
--- a/GraspPlanning/examples/GraspPlanner/CMakeLists.txt
+++ b/GraspPlanning/examples/GraspPlanner/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
CMAKE_POLICY(VERSION 2.6)
-IF(SIMOX_VISUALIZATION AND SIMOX_USE_COIN_VISUALIZATION)
+IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION)
# the variable "demo_SRCS" contains all .cpp files of this project
FILE(GLOB demo_SRCS ${PROJECT_SOURCE_DIR}/GraspPlanner.cpp ${PROJECT_SOURCE_DIR}/GraspPlannerWindow.cpp)
diff --git a/GraspPlanning/examples/GraspQuality/CMakeLists.txt b/GraspPlanning/examples/GraspQuality/CMakeLists.txt
index 52ae1f3e9b42b9853a08a42b8e78fe59b48afb57..a70ea73550d2e48c4fd79e0a0007b85848d30a0b 100644
--- a/GraspPlanning/examples/GraspQuality/CMakeLists.txt
+++ b/GraspPlanning/examples/GraspQuality/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
CMAKE_POLICY(VERSION 2.6)
-IF(SIMOX_VISUALIZATION AND SIMOX_USE_COIN_VISUALIZATION)
+IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION)
# the variable "demo_SRCS" contains all .cpp files of this project
FILE(GLOB demo_SRCS ${PROJECT_SOURCE_DIR}/GraspQualityDemo.cpp ${PROJECT_SOURCE_DIR}/GraspQualityWindow.cpp)
diff --git a/MotionPlanning/CMakeLists.txt b/MotionPlanning/CMakeLists.txt
index c05b3e8d47f41f759ba0e982d4d3b18da315252b..e95aef14b842b9e22a3c18595abecffa339ab89d 100644
--- a/MotionPlanning/CMakeLists.txt
+++ b/MotionPlanning/CMakeLists.txt
@@ -7,9 +7,9 @@ MESSAGE (STATUS "\n ***** CONFIGURING Simox project Saba *****")
INCLUDE (config.cmake)
#MESSAGE(STATUS "Saba: using VirtualRobotDir: ${SABA_VirtualRobotDir}")
-#MESSAGE(STATUS " SIMOX_LIB_DIR: ${SIMOX_LIB_DIR}")
-#MESSAGE(STATUS " SIMOX_BIN_DIR: ${SIMOX_BIN_DIR}")
-#MESSAGE ("SIMOX_USE_COIN_VISUALIZATION:${SIMOX_USE_COIN_VISUALIZATION}")
+#MESSAGE(STATUS " Simox_LIB_DIR: ${Simox_LIB_DIR}")
+#MESSAGE(STATUS " Simox_BIN_DIR: ${Simox_BIN_DIR}")
+#MESSAGE ("Simox_USE_COIN_VISUALIZATION:${Simox_USE_COIN_VISUALIZATION}")
SET(SOURCES
CSpace/CSpace.cpp
@@ -56,7 +56,7 @@ ${SABA_SimoxDir}/VirtualRobot/definesVR.h
)
-if (SIMOX_USE_COIN_VISUALIZATION)
+if (Simox_USE_COIN_VISUALIZATION)
SET(SOURCES
${SOURCES}
Visualization/CoinVisualization/CoinRrtWorkspaceVisualization.cpp
@@ -66,20 +66,20 @@ if (SIMOX_USE_COIN_VISUALIZATION)
${INCLUDES}
Visualization/CoinVisualization/CoinRrtWorkspaceVisualization.h
)
-endif (SIMOX_USE_COIN_VISUALIZATION)
+endif (Simox_USE_COIN_VISUALIZATION)
-# this var is considered for generating SIMOX_INCLUDE_DIRS
+# this var is considered for generating Simox_INCLUDE_DIRS
SET(SABA_INCLUDE_DIRS "${SABA_DIR}")
INCLUDE_DIRECTORIES(${SABA_DIR})
-LINK_DIRECTORIES (${SIMOX_LIB_DIR})
+LINK_DIRECTORIES (${Simox_LIB_DIR})
-INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS})
-ADD_DEFINITIONS(${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS})
+INCLUDE_DIRECTORIES(${VirtualRobot_EXTERNAL_INCLUDE_DIRS})
+ADD_DEFINITIONS(${VirtualRobot_EXTERNAL_LIBRARY_FLAGS})
ADD_LIBRARY (Saba SHARED ${SOURCES} ${INCLUDES})
-#MESSAGE("VIRTUAL_ROBOT_ROBOT_LINK_LIBRARIES:" ${VIRTUAL_ROBOT_EXTERNAL_LIBRARIES})
-TARGET_LINK_LIBRARIES (Saba VirtualRobot ${VIRTUAL_ROBOT_EXTERNAL_LIBRARIES})
+#MESSAGE("VirtualRobot_ROBOT_LINK_LIBRARIES:" ${VirtualRobot_EXTERNAL_LIBRARIES})
+TARGET_LINK_LIBRARIES (Saba VirtualRobot ${VirtualRobot_EXTERNAL_LIBRARIES})
# .DLL path
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SABA_BIN_DIR})
diff --git a/MotionPlanning/config.cmake b/MotionPlanning/config.cmake
index dd753b25a1632099eb133a8ad623629ac50e2a90..64c4a8c74c04731c413e6b52f1685d2a1dca33ff 100644
--- a/MotionPlanning/config.cmake
+++ b/MotionPlanning/config.cmake
@@ -7,34 +7,34 @@ IF (NOT SABA_CONFIGURED)
SET(SABA_DIR ${CurrentSabaPath})
############################# SETUP PATHS TO Simox #############################
- SET(SIMOX_DIR_STANDARD "${CurrentSabaPath}/..")
+ SET(Simox_DIR_STANDARD "${CurrentSabaPath}/..")
# be sure to have the absolute path
- get_filename_component(SIMOX_DIR_STANDARD ${SIMOX_DIR_STANDARD} ABSOLUTE)
+ get_filename_component(Simox_DIR_STANDARD ${Simox_DIR_STANDARD} ABSOLUTE)
- SET (SABA_SimoxDir ${SIMOX_DIR_STANDARD} CACHE STRING "Path to Simox used by SaBa")
+ SET (SABA_SimoxDir ${Simox_DIR_STANDARD} CACHE STRING "Path to Simox used by SaBa")
INCLUDE(${SABA_SimoxDir}/config.cmake)
- IF(NOT DEFINED SIMOX_BUILD_DIRECTORY)
- get_filename_component(SIMOX_BUILD_DIRECTORY ${SIMOX_BUILD_DIRECTORY} ABSOLUTE)
- SET(SIMOX_BUILD_DIRECTORY "${SABA_SimoxDir}/build" CACHE STRING "Simox build directory used by SaBa")
- SET(SIMOX_LIB_DIR ${SIMOX_BUILD_DIRECTORY}/lib)
- SET(SIMOX_BIN_DIR ${SIMOX_BUILD_DIRECTORY}/bin)
+ IF(NOT DEFINED Simox_BUILD_DIRECTORY)
+ get_filename_component(Simox_BUILD_DIRECTORY ${Simox_BUILD_DIRECTORY} ABSOLUTE)
+ SET(Simox_BUILD_DIRECTORY "${SABA_SimoxDir}/build" CACHE STRING "Simox build directory used by SaBa")
+ SET(Simox_LIB_DIR ${Simox_BUILD_DIRECTORY}/lib)
+ SET(Simox_BIN_DIR ${Simox_BUILD_DIRECTORY}/bin)
ENDIF()
############################# SETUP PATHS #############################
#ADD_DEFINITIONS(-DSABA_BASE_DIR="${SABA_DIR}")
# Define, where to put the binaries
- SET(SABA_LIB_DIR ${SIMOX_LIB_DIR})
- SET(SABA_BIN_DIR ${SIMOX_BIN_DIR})
+ SET(SABA_LIB_DIR ${Simox_LIB_DIR})
+ SET(SABA_BIN_DIR ${Simox_BIN_DIR})
MESSAGE(STATUS "** SABA_LIB_DIR: ${SABA_LIB_DIR}")
MESSAGE(STATUS "** SABA_BIN_DIR: ${SABA_BIN_DIR}")
# Define, where to install the binaries
- SET(SABA_INSTALL_LIB_DIR ${SIMOX_INSTALL_LIB_DIR})
- SET(SABA_INSTALL_BIN_DIR ${SIMOX_INSTALL_BIN_DIR})
- SET(SABA_INSTALL_HEADER_DIR ${SIMOX_INSTALL_HEADER_DIR})
+ SET(SABA_INSTALL_LIB_DIR ${Simox_INSTALL_LIB_DIR})
+ SET(SABA_INSTALL_BIN_DIR ${Simox_INSTALL_BIN_DIR})
+ SET(SABA_INSTALL_HEADER_DIR ${Simox_INSTALL_HEADER_DIR})
#######################################################################
# Setup for testing
@@ -44,9 +44,9 @@ IF (NOT SABA_CONFIGURED)
MACRO(ADD_SABA_TEST TEST_NAME)
ADD_EXECUTABLE(${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp)
- TARGET_LINK_LIBRARIES(${TEST_NAME} VirtualRobot Saba ${VIRTUAL_ROBOT_LINK_LIBRARIES})
+ TARGET_LINK_LIBRARIES(${TEST_NAME} VirtualRobot Saba ${VirtualRobot_LINK_LIBRARIES})
IF(NOT UNIX)
- SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SIMOX_BIN_DIR})
+ SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
ENDIF(NOT UNIX)
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES FOLDER "Saba Tests")
ADD_TEST( Saba_${TEST_NAME} ${TEST_NAME} --output_format=XML --log_level=all --report_level=no)
diff --git a/MotionPlanning/examples/GraspRRT/CMakeLists.txt b/MotionPlanning/examples/GraspRRT/CMakeLists.txt
index 44736e2a31ad4fae5049616a3f4f2c0b5d62dca6..ab9318882064e70ced16125151035fd4fafc829d 100644
--- a/MotionPlanning/examples/GraspRRT/CMakeLists.txt
+++ b/MotionPlanning/examples/GraspRRT/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
CMAKE_POLICY(VERSION 2.6)
-IF(SIMOX_VISUALIZATION AND SIMOX_USE_COIN_VISUALIZATION)
+IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION)
# the variable "demo_SRCS" contains all .cpp files of this project
FILE(GLOB demo_SRCS ${PROJECT_SOURCE_DIR}/GraspRrtDemo.cpp ${PROJECT_SOURCE_DIR}/GraspRrtWindow.cpp)
@@ -23,13 +23,13 @@ IF(SIMOX_VISUALIZATION AND SIMOX_USE_COIN_VISUALIZATION)
SimoxQtApplication("${PROJECT_NAME}" "${demo_SRCS}" "${demo_INCS}" "${GUI_MOC_HDRS}" "${GUI_UIS}")
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SIMOX_BIN_DIR})
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
# install
INSTALL(TARGETS ${PROJECT_NAME}
DESTINATION ${SABA_INSTALL_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${SIMOX_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${Simox_BIN_DIR})
MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${SABA_INSTALL_BIN_DIR})
diff --git a/MotionPlanning/examples/IKRRT/CMakeLists.txt b/MotionPlanning/examples/IKRRT/CMakeLists.txt
index f00e4905b155d8ab308be7faf2e528070f3e6a13..b513f9df1b9a0170f1f3ce107cf2224dcd539741 100644
--- a/MotionPlanning/examples/IKRRT/CMakeLists.txt
+++ b/MotionPlanning/examples/IKRRT/CMakeLists.txt
@@ -4,8 +4,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
CMAKE_POLICY(VERSION 2.6)
-IF(SIMOX_VISUALIZATION AND SIMOX_USE_COIN_VISUALIZATION)
- LINK_DIRECTORIES(${SIMOX_LIB_DIR})
+IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION)
+ LINK_DIRECTORIES(${Simox_LIB_DIR})
# the variable "demo_SRCS" contains all .cpp files of this project
@@ -32,16 +32,16 @@ IF(SIMOX_VISUALIZATION AND SIMOX_USE_COIN_VISUALIZATION)
ADD_EXECUTABLE(${PROJECT_NAME} ${demo_SRCS} ${demo_INCS})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SIMOX_BIN_DIR})
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot Saba ${SIMOX_VISUALIZATION_LIBS})
- INCLUDE_DIRECTORIES(${SIMOX_VISUALIZATION_INCLUDE_PATHS})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot Saba ${Simox_VISUALIZATION_LIBS})
+ INCLUDE_DIRECTORIES(${Simox_VISUALIZATION_INCLUDE_PATHS})
INCLUDE(${QT_USE_FILE})
- ADD_DEFINITIONS(${SIMOX_VISUALIZATION_COMPILE_FLAGS})
+ ADD_DEFINITIONS(${Simox_VISUALIZATION_COMPILE_FLAGS})
INSTALL(TARGETS ${PROJECT_NAME}
DESTINATION ${SABA_INSTALL_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${SIMOX_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${Simox_BIN_DIR})
MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${SABA_INSTALL_BIN_DIR})
ENDIF()
diff --git a/MotionPlanning/examples/MultiThreadedPlanning/CMakeLists.txt b/MotionPlanning/examples/MultiThreadedPlanning/CMakeLists.txt
index d8fbc25bcfe086f9382fbb90e0e2c3be8487fb05..4f87585751cc32598faae6c51e2f313640111958 100644
--- a/MotionPlanning/examples/MultiThreadedPlanning/CMakeLists.txt
+++ b/MotionPlanning/examples/MultiThreadedPlanning/CMakeLists.txt
@@ -5,7 +5,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
CMAKE_POLICY(VERSION 2.6)
-IF(SIMOX_VISUALIZATION AND SIMOX_USE_COIN_VISUALIZATION)
+IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION)
# the variable "demo_SRCS" contains all .cpp files of this project
FILE(GLOB demo_SRCS ${PROJECT_SOURCE_DIR}/MTPlanning.cpp ${PROJECT_SOURCE_DIR}/MTPlanningWindow.cpp ${PROJECT_SOURCE_DIR}/MTPlanningScenery.cpp)
@@ -24,13 +24,13 @@ IF(SIMOX_VISUALIZATION AND SIMOX_USE_COIN_VISUALIZATION)
SimoxQtApplication("${PROJECT_NAME}" "${demo_SRCS}" "${demo_INCS}" "${GUI_MOC_HDRS}" "${GUI_UIS}")
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SIMOX_BIN_DIR})
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
# install
INSTALL(TARGETS ${PROJECT_NAME}
DESTINATION ${SABA_INSTALL_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${SIMOX_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${Simox_BIN_DIR})
MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${SABA_INSTALL_BIN_DIR})
diff --git a/MotionPlanning/examples/RRT/CMakeLists.txt b/MotionPlanning/examples/RRT/CMakeLists.txt
index 998e775fa7546689d1c2d48130c5b31b9f1afb0d..262d94a762f597d9504e0c32e2c47b905179bae4 100644
--- a/MotionPlanning/examples/RRT/CMakeLists.txt
+++ b/MotionPlanning/examples/RRT/CMakeLists.txt
@@ -6,27 +6,27 @@ CMAKE_POLICY(VERSION 2.6)
INCLUDE_DIRECTORIES(${SABA_DIR})
-IF(SIMOX_VISUALIZATION AND SIMOX_USE_COIN_VISUALIZATION)
+IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION)
- LINK_DIRECTORIES(${SIMOX_LIB_DIR})
+ LINK_DIRECTORIES(${Simox_LIB_DIR})
# the variable "demo_SRCS" contains all .cpp files of this project
FILE(GLOB demo_SRCS ${PROJECT_SOURCE_DIR}/RRTdemo.cpp)
ADD_EXECUTABLE(${PROJECT_NAME} ${demo_SRCS})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SIMOX_BIN_DIR})
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot Saba ${SIMOX_VISUALIZATION_LIBS})
- INCLUDE_DIRECTORIES(${SIMOX_VISUALIZATION_INCLUDE_PATHS})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot Saba ${Simox_VISUALIZATION_LIBS})
+ INCLUDE_DIRECTORIES(${Simox_VISUALIZATION_INCLUDE_PATHS})
INCLUDE(${QT_USE_FILE})
- ADD_DEFINITIONS(${SIMOX_VISUALIZATION_COMPILE_FLAGS})
+ ADD_DEFINITIONS(${Simox_VISUALIZATION_COMPILE_FLAGS})
INSTALL(TARGETS ${PROJECT_NAME}
DESTINATION ${SABA_INSTALL_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${SIMOX_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${Simox_BIN_DIR})
MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${SABA_INSTALL_BIN_DIR})
ELSE()
- MESSAGE (STATUS "SIMOX_USE_COIN_VISUALIZATION not defined: Skipping ${PROJECT_NAME}")
+ MESSAGE (STATUS "Simox_USE_COIN_VISUALIZATION not defined: Skipping ${PROJECT_NAME}")
ENDIF()
diff --git a/MotionPlanning/examples/RrtGui/CMakeLists.txt b/MotionPlanning/examples/RrtGui/CMakeLists.txt
index 89fff730a3debd67ea6f116cab8fe0ef42498910..afbbc0c02a59643d992b565825489083990dd399 100644
--- a/MotionPlanning/examples/RrtGui/CMakeLists.txt
+++ b/MotionPlanning/examples/RrtGui/CMakeLists.txt
@@ -7,7 +7,7 @@ CMAKE_POLICY(VERSION 2.6)
INCLUDE(${SABA_SimoxDir}/CMakeModules/SimoxMacros.cmake)
-IF(SIMOX_VISUALIZATION AND SIMOX_USE_COIN_VISUALIZATION)
+IF(Simox_VISUALIZATION AND Simox_USE_COIN_VISUALIZATION)
# the variable "demo_SRCS" contains all .cpp files of this project
FILE(GLOB demo_SRCS ${PROJECT_SOURCE_DIR}/RrtGui.cpp ${PROJECT_SOURCE_DIR}/RrtGuiWindow.cpp)
diff --git a/VirtualRobot/CMakeLists.txt b/VirtualRobot/CMakeLists.txt
index 9d85c6cc9daacb524959e43d5bb280787f8fe151..30342f830206a554fcc8ff46b69e870e30603950 100644
--- a/VirtualRobot/CMakeLists.txt
+++ b/VirtualRobot/CMakeLists.txt
@@ -7,8 +7,8 @@ CMAKE_POLICY(VERSION 2.6)
INCLUDE(config.cmake)
-MESSAGE (STATUS " * VirtualRobot Binary directory: ${VIRTUAL_ROBOT_BIN_DIR}")
-MESSAGE (STATUS " * VirtualRobot Library directory: ${VIRTUAL_ROBOT_LIB_DIR}")
+MESSAGE (STATUS " * VirtualRobot Binary directory: ${VirtualRobot_BIN_DIR}")
+MESSAGE (STATUS " * VirtualRobot Library directory: ${VirtualRobot_LIB_DIR}")
SET(SOURCES
CollisionDetection/CollisionChecker.cpp
@@ -131,7 +131,7 @@ SphereApproximator.h
ADD_SUBDIRECTORY(Visualization/tests)
ADD_SUBDIRECTORY(Workspace/tests)
-if (VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
+if (VirtualRobot_VISUALIZATION AND VirtualRobot_USE_COIN_VISUALIZATION)
SET(SOURCES
${SOURCES}
@@ -148,7 +148,7 @@ if (VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
)
ADD_SUBDIRECTORY(Visualization/CoinVisualization/tests)
-elseif (VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_OPENSCENEGRAPH_VISUALIZATION)
+elseif (VirtualRobot_VISUALIZATION AND VirtualRobot_USE_OPENSCENEGRAPH_VISUALIZATION)
SET(SOURCES
${SOURCES}
@@ -176,8 +176,8 @@ elseif (VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_OPENSCENEGRAPH_VISUALI
endif ()
-#INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS})
-#ADD_DEFINITIONS(${VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS})
+#INCLUDE_DIRECTORIES(${VirtualRobot_VISUALIZATION_INCLUDE_PATHS})
+#ADD_DEFINITIONS(${VirtualRobot_VISUALIZATION_COMPILE_FLAGS})
#######################################################################################
@@ -185,17 +185,17 @@ endif ()
#INCLUDE(CMakeModules/VirtualRobotExternalLibrarySetup.cmake)
# manually apply the configuration of external libs
-MESSAGE(STATUS " * VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS: ${VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS}")
-INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS})
+MESSAGE(STATUS " * VirtualRobot_EXTERNAL_INCLUDE_DIRS: ${VirtualRobot_EXTERNAL_INCLUDE_DIRS}")
+INCLUDE_DIRECTORIES(${VirtualRobot_EXTERNAL_INCLUDE_DIRS})
-MESSAGE(STATUS " * VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS: ${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS}")
-ADD_DEFINITIONS(${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS})
+MESSAGE(STATUS " * VirtualRobot_EXTERNAL_LIBRARY_FLAGS: ${VirtualRobot_EXTERNAL_LIBRARY_FLAGS}")
+ADD_DEFINITIONS(${VirtualRobot_EXTERNAL_LIBRARY_FLAGS})
-MESSAGE(STATUS " * VIRTUAL_ROBOT_EXTERNAL_LIBRARY_DIRS: ${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_DIRS}")
-LINK_DIRECTORIES( ${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_DIRS} )
+MESSAGE(STATUS " * VirtualRobot_EXTERNAL_LIBRARY_DIRS: ${VirtualRobot_EXTERNAL_LIBRARY_DIRS}")
+LINK_DIRECTORIES( ${VirtualRobot_EXTERNAL_LIBRARY_DIRS} )
-MESSAGE(STATUS " * VIRTUAL_ROBOT_EXTERNAL_LIBRARY_CMAKE_INCLUDE: ${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_CMAKE_INCLUDE}")
-FOREACH(f ${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_CMAKE_INCLUDE})
+MESSAGE(STATUS " * VirtualRobot_EXTERNAL_LIBRARY_CMAKE_INCLUDE: ${VirtualRobot_EXTERNAL_LIBRARY_CMAKE_INCLUDE}")
+FOREACH(f ${VirtualRobot_EXTERNAL_LIBRARY_CMAKE_INCLUDE})
MESSAGE(STATUS " ** INCLUDE: ${f}")
INCLUDE(${f})
ENDFOREACH(f)
@@ -214,20 +214,20 @@ ADD_SUBDIRECTORY(examples/)
# create configuration file which contains all compile time defines
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/definesVR.h.cmake ${PROJECT_SOURCE_DIR}/definesVR.h)
-ADD_DEFINITIONS(-DVIRTUAL_ROBOT_DATA_PATH="${CMAKE_INSTALL_PREFIX}/data")
+ADD_DEFINITIONS(-DVirtualRobot_DATA_PATH="${CMAKE_INSTALL_PREFIX}/data")
ADD_LIBRARY (VirtualRobot SHARED ${SOURCES} ${INCLUDES})
-TARGET_LINK_LIBRARIES (VirtualRobot ${COLLISIONDETECTION_LIB} ${VIRTUAL_ROBOT_EXTERNAL_LIBRARIES})
+TARGET_LINK_LIBRARIES (VirtualRobot ${COLLISIONDETECTION_LIB} ${VirtualRobot_EXTERNAL_LIBRARIES})
# need this to let the dependencies show up in VirtualRobotLibraryDepends
-TARGET_LINK_LIBRARIES (VirtualRobot LINK_INTERFACE_LIBRARIES ${COLLISIONDETECTION_LIB} ${VIRTUAL_ROBOT_EXTERNAL_LIBRARIES})
+TARGET_LINK_LIBRARIES (VirtualRobot LINK_INTERFACE_LIBRARIES ${COLLISIONDETECTION_LIB} ${VirtualRobot_EXTERNAL_LIBRARIES})
# .DLL path
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_BIN_DIR})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VirtualRobot_BIN_DIR})
# .so path
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_LIB_DIR})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${VirtualRobot_LIB_DIR})
# .lib path (this is needed for setting the DLL-import library path on windows)
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_LIB_DIR})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${VirtualRobot_LIB_DIR})
@@ -240,14 +240,14 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${VIRT
############################################
MESSAGE(STATUS " * Generating CMake files")
-set(VIRTUAL_ROBOT_MAJOR_VERSION 2)
-set(VIRTUAL_ROBOT_MINOR_VERSION 1)
-set(VIRTUAL_ROBOT_PATCH_VERSION 3)
-set(VIRTUAL_ROBOT_VERSION
- ${VIRTUAL_ROBOT_MAJOR_VERSION}.${VIRTUAL_ROBOT_MINOR_VERSION}.${VIRTUAL_ROBOT_PATCH_VERSION})
+set(VirtualRobot_MAJOR_VERSION 2)
+set(VirtualRobot_MINOR_VERSION 1)
+set(VirtualRobot_PATCH_VERSION 3)
+set(VirtualRobot_VERSION
+ ${VirtualRobot_MAJOR_VERSION}.${VirtualRobot_MINOR_VERSION}.${VirtualRobot_PATCH_VERSION})
-set(VIRTUAL_ROBOT_LIBRARIES VirtualRobot)
-set(VIRTUAL_ROBOT_EXECUTABLES "")
+set(VirtualRobot_LIBRARIES VirtualRobot)
+set(VirtualRobot_EXECUTABLES "")
# Export the package for use from the build-tree
# (this registers the build-tree with a global CMake-registry)
@@ -257,88 +257,88 @@ EXPORT(PACKAGE VirtualRobot)
#get_property(VirtualRobot_external_INCLUDE_DIRS TARGET VirtualRobot PROPERTY EXTERNAL_INCLUDE_DIRS)
#message(STATUS "VirtualRobot_external_INCLUDE_DIRS: ${VirtualRobot_external_INCLUDE_DIRS}")
-SET (VIRTUAL_ROBOT_CONFIG_INBUILD_DIR ${VIRTUAL_ROBOT_BUILD_DIRECTORY}/share/VirtualRobot/cmake)
-SET (VIRTUAL_ROBOT_CONFIG_INBUILD "${VIRTUAL_ROBOT_BUILD_DIRECTORY}/VirtualRobotConfig.cmake")
-SET (VIRTUAL_ROBOT_CONFIG_INSTALL_LCOAL_DIR ${VIRTUAL_ROBOT_BUILD_DIRECTORY}/InstallFiles)
-SET (VIRTUAL_ROBOT_CONFIG_INSTALL_LOCAL "${VIRTUAL_ROBOT_CONFIG_INSTALL_LCOAL_DIR}/VirtualRobotConfig.cmake")
-SET (VIRTUAL_ROBOT_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/VirtualRobot/cmake)
-SET (VIRTUAL_ROBOT_CONFIG_INSTALL "${CMAKE_INSTALL_PREFIX}/VirtualRobotConfig.cmake")
+SET (VirtualRobot_CONFIG_INBUILD_DIR ${VirtualRobot_BUILD_DIRECTORY}/share/VirtualRobot/cmake)
+SET (VirtualRobot_CONFIG_INBUILD "${VirtualRobot_BUILD_DIRECTORY}/VirtualRobotConfig.cmake")
+SET (VirtualRobot_CONFIG_INSTALL_LCOAL_DIR ${VirtualRobot_BUILD_DIRECTORY}/InstallFiles)
+SET (VirtualRobot_CONFIG_INSTALL_LOCAL "${VirtualRobot_CONFIG_INSTALL_LCOAL_DIR}/VirtualRobotConfig.cmake")
+SET (VirtualRobot_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/VirtualRobot/cmake)
+SET (VirtualRobot_CONFIG_INSTALL "${CMAKE_INSTALL_PREFIX}/VirtualRobotConfig.cmake")
MESSAGE (STATUS " * VirtualRobot: SETTING UP INSTALL FILES")
-MESSAGE (STATUS " ** In-build tree: VIRTUAL_ROBOT_CONFIG_INBUILD = ${VIRTUAL_ROBOT_CONFIG_INBUILD}")
-MESSAGE (STATUS " ** Install tree : (local) VIRTUAL_ROBOT_CONFIG_INSTALL_LOCAL = ${VIRTUAL_ROBOT_CONFIG_INSTALL_LOCAL}")
-MESSAGE (STATUS " ** Install tree : (install) VIRTUAL_ROBOT_CONFIG_INSTALL = ${VIRTUAL_ROBOT_CONFIG_INSTALL}")
+MESSAGE (STATUS " ** In-build tree: VirtualRobot_CONFIG_INBUILD = ${VirtualRobot_CONFIG_INBUILD}")
+MESSAGE (STATUS " ** Install tree : (local) VirtualRobot_CONFIG_INSTALL_LOCAL = ${VirtualRobot_CONFIG_INSTALL_LOCAL}")
+MESSAGE (STATUS " ** Install tree : (install) VirtualRobot_CONFIG_INSTALL = ${VirtualRobot_CONFIG_INSTALL}")
# Install the export set for use with the install-tree
install(
EXPORT VirtualRobotLibraryDepends
- DESTINATION "${VIRTUAL_ROBOT_CONFIG_INSTALL_DIR}")
+ DESTINATION "${VirtualRobot_CONFIG_INSTALL_DIR}")
# Create an VirtualRobotConfig.cmake file for the use from the build tree
-SET(VIRTUAL_ROBOT_LIBRARIES_ALL "${VIRTUAL_ROBOT_LIBRARIES}" "${VIRTUAL_ROBOT_EXTERNAL_LIBRARIES}")
-SET(VIRTUAL_ROBOT_DIR "${PROJECT_SOURCE_DIR}/..")
-SET(VIRTUAL_ROBOT_INCLUDE_DIRS "${VIRTUAL_ROBOT_DIR}" "${VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS}")
-SET(VIRTUAL_ROBOT_LIB_DIRS "${VIRTUAL_ROBOT_BUILD_DIRECTORY}/${LIB_DIR}" "${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_DIRS}")
-SET(VIRTUAL_ROBOT_LIB_FLAGS "${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS}")
-SET(VIRTUAL_ROBOT_CMAKE_DIR "${VIRTUAL_ROBOT_CONFIG_INBUILD_DIR}")
-SET(VIRTUAL_ROBOT_LIBRARY_CMAKE_INCLUDE "${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_CMAKE_INCLUDE}")
-SET(VIRTUAL_ROBOT_DATA_PATH "${PROJECT_SOURCE_DIR}/data")
+SET(VirtualRobot_LIBRARIES_ALL "${VirtualRobot_LIBRARIES}" "${VirtualRobot_EXTERNAL_LIBRARIES}")
+SET(VirtualRobot_DIR "${PROJECT_SOURCE_DIR}/..")
+SET(VirtualRobot_INCLUDE_DIRS "${VirtualRobot_DIR}" "${VirtualRobot_EXTERNAL_INCLUDE_DIRS}")
+SET(VirtualRobot_LIB_DIRS "${VirtualRobot_BUILD_DIRECTORY}/${LIB_DIR}" "${VirtualRobot_EXTERNAL_LIBRARY_DIRS}")
+SET(VirtualRobot_LIB_FLAGS "${VirtualRobot_EXTERNAL_LIBRARY_FLAGS}")
+SET(VirtualRobot_CMAKE_DIR "${VirtualRobot_CONFIG_INBUILD_DIR}")
+SET(VirtualRobot_LIBRARY_CMAKE_INCLUDE "${VirtualRobot_EXTERNAL_LIBRARY_CMAKE_INCLUDE}")
+SET(VirtualRobot_DATA_PATH "${PROJECT_SOURCE_DIR}/data")
configure_file(
${VR_DIR}/CMakeModules/VirtualRobotConfig.cmake.in
- "${VIRTUAL_ROBOT_BUILD_DIRECTORY}/VirtualRobotConfig.cmake"
+ "${VirtualRobot_BUILD_DIRECTORY}/VirtualRobotConfig.cmake"
@ONLY)
configure_file(
${VR_DIR}/CMakeModules/VirtualRobotConfigVersion.cmake.in
- "${VIRTUAL_ROBOT_BUILD_DIRECTORY}/VirtualRobotConfigVersion.cmake"
+ "${VirtualRobot_BUILD_DIRECTORY}/VirtualRobotConfigVersion.cmake"
@ONLY)
configure_file("${PROJECT_SOURCE_DIR}/CMakeModules/VirtualRobotExternalLibrarySetup.cmake"
- "${VIRTUAL_ROBOT_CONFIG_INBUILD_DIR}/VirtualRobotExternalLibrarySetup.cmake" COPYONLY)
+ "${VirtualRobot_CONFIG_INBUILD_DIR}/VirtualRobotExternalLibrarySetup.cmake" COPYONLY)
configure_file("${PROJECT_SOURCE_DIR}/CMakeModules/VirtualRobotMacros.cmake"
- "${VIRTUAL_ROBOT_CONFIG_INBUILD_DIR}/VirtualRobotMacros.cmake" COPYONLY)
+ "${VirtualRobot_CONFIG_INBUILD_DIR}/VirtualRobotMacros.cmake" COPYONLY)
configure_file("${PROJECT_SOURCE_DIR}/CMakeModules/FindVirtualRobot.cmake"
- "${VIRTUAL_ROBOT_CONFIG_INBUILD_DIR}/FindVirtualRobot.cmake" COPYONLY)
+ "${VirtualRobot_CONFIG_INBUILD_DIR}/FindVirtualRobot.cmake" COPYONLY)
# Create an VirtualRobotConfig.cmake file for the use from the install tree
# and install it
-SET(VIRTUAL_ROBOT_LIBRARIES_ALL "${VIRTUAL_ROBOT_LIBRARIES}" "${VIRTUAL_ROBOT_EXTERNAL_LIBRARIES}")
-SET(VIRTUAL_ROBOT_DIR "${CMAKE_INSTALL_PREFIX}/include")
-SET(VIRTUAL_ROBOT_INCLUDE_DIRS "${VIRTUAL_ROBOT_DIR}" "${VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS}")
-SET(VIRTUAL_ROBOT_LIB_DIRS "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}" "${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_DIRS}")
-SET(VIRTUAL_ROBOT_CMAKE_DIR "${VIRTUAL_ROBOT_CONFIG_INSTALL_DIR}")
-SET(VIRTUAL_ROBOT_LIB_FLAGS "${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS}")
-SET(VIRTUAL_ROBOT_LIBRARY_CMAKE_INCLUDE "${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_CMAKE_INCLUDE}")
-SET(VIRTUAL_ROBOT_DATA_PATH "${CMAKE_INSTALL_PREFIX}/data")
+SET(VirtualRobot_LIBRARIES_ALL "${VirtualRobot_LIBRARIES}" "${VirtualRobot_EXTERNAL_LIBRARIES}")
+SET(VirtualRobot_DIR "${CMAKE_INSTALL_PREFIX}/include")
+SET(VirtualRobot_INCLUDE_DIRS "${VirtualRobot_DIR}" "${VirtualRobot_EXTERNAL_INCLUDE_DIRS}")
+SET(VirtualRobot_LIB_DIRS "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}" "${VirtualRobot_EXTERNAL_LIBRARY_DIRS}")
+SET(VirtualRobot_CMAKE_DIR "${VirtualRobot_CONFIG_INSTALL_DIR}")
+SET(VirtualRobot_LIB_FLAGS "${VirtualRobot_EXTERNAL_LIBRARY_FLAGS}")
+SET(VirtualRobot_LIBRARY_CMAKE_INCLUDE "${VirtualRobot_EXTERNAL_LIBRARY_CMAKE_INCLUDE}")
+SET(VirtualRobot_DATA_PATH "${CMAKE_INSTALL_PREFIX}/data")
configure_file(
${VR_DIR}/CMakeModules/VirtualRobotConfig.cmake.in
- "${VIRTUAL_ROBOT_CONFIG_INSTALL_LCOAL_DIR}/VirtualRobotConfig.cmake"
+ "${VirtualRobot_CONFIG_INSTALL_LCOAL_DIR}/VirtualRobotConfig.cmake"
@ONLY)
configure_file(
${VR_DIR}/CMakeModules/VirtualRobotConfigVersion.cmake.in
- "${VIRTUAL_ROBOT_CONFIG_INSTALL_LCOAL_DIR}/VirtualRobotConfigVersion.cmake"
+ "${VirtualRobot_CONFIG_INSTALL_LCOAL_DIR}/VirtualRobotConfigVersion.cmake"
@ONLY)
install(FILES
- "${VIRTUAL_ROBOT_CONFIG_INSTALL_LCOAL_DIR}/VirtualRobotConfig.cmake"
- "${VIRTUAL_ROBOT_CONFIG_INSTALL_LCOAL_DIR}/VirtualRobotConfigVersion.cmake"
+ "${VirtualRobot_CONFIG_INSTALL_LCOAL_DIR}/VirtualRobotConfig.cmake"
+ "${VirtualRobot_CONFIG_INSTALL_LCOAL_DIR}/VirtualRobotConfigVersion.cmake"
DESTINATION "${CMAKE_INSTALL_PREFIX}")
install(FILES
"${PROJECT_SOURCE_DIR}/CMakeModules/VirtualRobotExternalLibrarySetup.cmake"
"${PROJECT_SOURCE_DIR}/CMakeModules/VirtualRobotMacros.cmake"
"${PROJECT_SOURCE_DIR}/CMakeModules/FindVirtualRobot.cmake"
- DESTINATION "${VIRTUAL_ROBOT_CMAKE_DIR}")
+ DESTINATION "${VirtualRobot_CMAKE_DIR}")
INSTALL(TARGETS VirtualRobot
EXPORT VirtualRobotLibraryDepends
- RUNTIME DESTINATION ${VIRTUAL_ROBOT_INSTALL_BIN_DIR}
- LIBRARY DESTINATION ${VIRTUAL_ROBOT_INSTALL_LIB_DIR}
- ARCHIVE DESTINATION ${VIRTUAL_ROBOT_INSTALL_LIB_DIR}
+ RUNTIME DESTINATION ${VirtualRobot_INSTALL_BIN_DIR}
+ LIBRARY DESTINATION ${VirtualRobot_INSTALL_LIB_DIR}
+ ARCHIVE DESTINATION ${VirtualRobot_INSTALL_LIB_DIR}
)
-INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${VIRTUAL_ROBOT_INSTALL_HEADER_DIR}
+INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${VirtualRobot_INSTALL_HEADER_DIR}
FILES_MATCHING PATTERN "*.h"
PATTERN ".svn" EXCLUDE
PATTERN "CMakeModules" EXCLUDE
diff --git a/VirtualRobot/CMakeModules/FindVirtualRobot.cmake b/VirtualRobot/CMakeModules/FindVirtualRobot.cmake
index 6a97b786c2d0c2d685cf3f01d9017b53606b74a4..fc4ff3003de6b1f687dc79bd47bd45c6db9684bb 100644
--- a/VirtualRobot/CMakeModules/FindVirtualRobot.cmake
+++ b/VirtualRobot/CMakeModules/FindVirtualRobot.cmake
@@ -1,10 +1,10 @@
-# Find VIRTUAL_ROBOT
+# Find VirtualRobot
#
# This find script searches for VirtualRobot and includes all neccessary config files.
#
-# VIRTUAL_ROBOT_FOUND - TRUE on success
-# VIRTUAL_ROBOT_INCLUDE_DIR - The include directory
-# VIRTUAL_ROBOT_LIBRARIES - The libraries
+# VirtualRobot_FOUND - TRUE on success
+# VirtualRobot_INCLUDE_DIR - The include directory
+# VirtualRobot_LIBRARIES - The libraries
#
# Search order
## 1. ${Custom_Simox_VR_DIR}
@@ -18,9 +18,8 @@
#
## PROJECT ( myDemo )
## SET(VirtualRobot_DIR $ENV{Simox_DIR} CACHE STRING "Choose the path to VirtualRobot (install or build).")
-## SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${VirtualRobot_DIR}/share/VirtualRobot/cmake)
## FIND_PACKAGE(VirtualRobot REQUIRED)
-## IF(VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
+## IF(VirtualRobot_USE_COIN_VISUALIZATION)
## FILE(GLOB SRCS ${PROJECT_SOURCE_DIR}/myDemo.cpp ${PROJECT_SOURCE_DIR}/myWindow.cpp)
## FILE(GLOB INCS ${PROJECT_SOURCE_DIR}/myWindow.h)
## set(GUI_MOC_HDRS ${PROJECT_SOURCE_DIR}/myWindow.h)
@@ -34,22 +33,26 @@
find_path( VirtualRobot_DIR VirtualRobotConfig.cmake
"${Custom_Simox_VR_DIR}"
"${VirtualRobot_DIR}"
- "$ENV{VirtualRobot_DIR}")
+ "$ENV{VirtualRobot_DIR}"
+ "${Simox_DIR}"
+ "$ENV{SImox_DIR}"
+ )
SET (Simox_VR_CMAKE_CONFIG ${VirtualRobot_DIR}/VirtualRobotConfig.cmake)
-MESSAGE(STATUS " Including ${Simox_VR_CMAKE_CONFIG}")
+if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE(STATUS " Including ${Simox_VR_CMAKE_CONFIG}")
+endif()
include (${Simox_VR_CMAKE_CONFIG})
-if( VIRTUAL_ROBOT_LIBRARIES AND VIRTUAL_ROBOT_DIR)
-
- set( VIRTUAL_ROBOT_FOUND TRUE )
- set( VIRTUAL_ROBOT_INCLUDE_DIR ${VIRTUAL_ROBOT_DIR} )
- set( VIRTUAL_ROBOT_LIBRARY ${VIRTUAL_ROBOT_LIBRARIES} )
+if( VirtualRobot_LIBRARIES AND VirtualRobot_DIR)
+ set( VirtualRobot_FOUND TRUE )
+ set( VirtualRobot_INCLUDE_DIR ${VirtualRobot_DIR} )
+ set( VirtualRobot_LIBRARY ${VirtualRobot_LIBRARIES} )
endif()
include( FindPackageHandleStandardArgs )
-find_package_handle_standard_args( Simox DEFAULT_MSG VIRTUAL_ROBOT_LIBRARIES VIRTUAL_ROBOT_INCLUDE_DIR )
+find_package_handle_standard_args( VirtualRobot DEFAULT_MSG VirtualRobot_LIBRARIES VirtualRobot_INCLUDE_DIR )
-mark_as_advanced( VIRTUAL_ROBOT_INCLUDE_DIR VIRTUAL_ROBOT_LIBRARIES )
+mark_as_advanced( VirtualRobot_INCLUDE_DIR VirtualRobot_LIBRARIES )
diff --git a/VirtualRobot/CMakeModules/VirtualRobotConfig.cmake.in b/VirtualRobot/CMakeModules/VirtualRobotConfig.cmake.in
index 61de76678d83825855ff1253a823f011f32d2b59..e0f70d66cdf87676c0a1af2bd520db893c97c646 100644
--- a/VirtualRobot/CMakeModules/VirtualRobotConfig.cmake.in
+++ b/VirtualRobot/CMakeModules/VirtualRobotConfig.cmake.in
@@ -2,51 +2,55 @@
# - Config file for the VirtualRobot package
# It defines the following variables
-# VIRTUAL_ROBOT_INCLUDE_DIRS - include directories for VirtualRobot
-# VIRTUAL_ROBOT_LIBRARY_DIRS - library directories for VirtualRobot (normally not used!)
-# VIRTUAL_ROBOT_LIBRARIES - libraries to link against
-# VIRTUAL_ROBOT_EXECUTABLES - the VirtualRobot executable
-# VIRTUAL_ROBOT_COMPILE_FLAGS - compile flags
-# VIRTUAL_ROBOT_CMAKE_INCLUDE - list of includes that may be neccessary for external libraries (e.g. QT_USE_FILE)
-# VIRTUAL_ROBOT_DATA_PATH - the standard data path
-# VIRTUAL_ROBOT_CMAKE_DIR - Path to VirtualRobot cmake files.
-# VIRTUAL_ROBOT_DIR - Path to VirtualRobot
+# VirtualRobot_INCLUDE_DIRS - include directories for VirtualRobot
+# VirtualRobot_LIBRARY_DIRS - library directories for VirtualRobot (normally not used!)
+# VirtualRobot_LIBRARIES - libraries to link against
+# VirtualRobot_EXECUTABLES - the VirtualRobot executable
+# VirtualRobot_COMPILE_FLAGS - compile flags
+# VirtualRobot_CMAKE_INCLUDE - list of includes that may be neccessary for external libraries (e.g. QT_USE_FILE)
+# VirtualRobot_DATA_PATH - the standard data path
+# VirtualRobot_CMAKE_DIR - Path to VirtualRobot cmake files.
+# VirtualRobot_DIR - Path to VirtualRobot
# Tell the user project where to find VirtualRobot headers and libraries
#get_property(VirtualRobot_external_INCLUDE_DIRS TARGET VirtualRobot PROPERTY EXTERNAL_INCLUDE_DIRS)
#message(STATUS "VirtualRobot_external_INCLUDE_DIRS: ${VirtualRobot_external_INCLUDE_DIRS}")
-SET(VIRTUAL_ROBOT_INCLUDE_DIRS "@VIRTUAL_ROBOT_INCLUDE_DIRS@")
-SET(VIRTUAL_ROBOT_LIBRARY_DIRS "@VIRTUAL_ROBOT_LIB_DIRS@")
-SET(VIRTUAL_ROBOT_COMPILE_FLAGS "@VIRTUAL_ROBOT_LIB_FLAGS@")
-SET(VIRTUAL_ROBOT_CMAKE_INCLUDE "@VIRTUAL_ROBOT_LIBRARY_CMAKE_INCLUDE@")
-SET(VIRTUAL_ROBOT_DATA_PATH "@VIRTUAL_ROBOT_DATA_PATH@")
-SET(VIRTUAL_ROBOT_CMAKE_DIR "@VIRTUAL_ROBOT_CMAKE_DIR@")
-SET(VIRTUAL_ROBOT_DIR "@VIRTUAL_ROBOT_DIR@")
+SET(VirtualRobot_INCLUDE_DIRS "@VirtualRobot_INCLUDE_DIRS@")
+SET(VirtualRobot_LIBRARY_DIRS "@VirtualRobot_LIB_DIRS@")
+SET(VirtualRobot_COMPILE_FLAGS "@VirtualRobot_LIB_FLAGS@")
+SET(VirtualRobot_CMAKE_INCLUDE "@VirtualRobot_LIBRARY_CMAKE_INCLUDE@")
+SET(VirtualRobot_DATA_PATH "@VirtualRobot_DATA_PATH@")
+SET(VirtualRobot_CMAKE_DIR "@VirtualRobot_CMAKE_DIR@")
+SET(VirtualRobot_DIR "@VirtualRobot_DIR@")
# VirtualRobot library dependencies (contains definitions for IMPORTED targets)
-#include("@VIRTUAL_ROBOT_CMAKE_DIR@/VirtualRobotLibraryDepends.cmake")
+#include("@VirtualRobot_CMAKE_DIR@/VirtualRobotLibraryDepends.cmake")
# These are IMPORTED targets created by VirtualRobotLibraryDepends.cmake
-#SET(VIRTUAL_ROBOT_LIBRARIES "@VIRTUAL_ROBOT_LIBRARIES@")
-SET(VIRTUAL_ROBOT_LIBRARIES "@VIRTUAL_ROBOT_LIBRARIES_ALL@")
-SET(VIRTUAL_ROBOT_EXECUTABLES "@VIRTUAL_ROBOT_EXECUTABLES@")
+#SET(VirtualRobot_LIBRARIES "@VirtualRobot_LIBRARIES@")
+SET(VirtualRobot_LIBRARIES "@VirtualRobot_LIBRARIES_ALL@")
+SET(VirtualRobot_EXECUTABLES "@VirtualRobot_EXECUTABLES@")
-SET(VIRTUAL_ROBOT_VISUALIZATION "@VIRTUAL_ROBOT_VISUALIZATION@")
-SET(VIRTUAL_ROBOT_USE_COIN_VISUALIZATION "@VIRTUAL_ROBOT_USE_COIN_VISUALIZATION@")
-SET(VIRTUAL_ROBOT_USE_OPENSCENEGRAPH_VISUALIZATION "@VIRTUAL_ROBOT_USE_OPENSCENEGRAPH_VISUALIZATION@")
-SET(VIRTUAL_ROBOT_VISUALIZATION_LIBS "@VIRTUAL_ROBOT_VISUALIZATION_LIBS@")
-SET(VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS "@VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS@")
-SET(VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS "@VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS@")
+SET(VirtualRobot_VISUALIZATION "@VirtualRobot_VISUALIZATION@")
+SET(VirtualRobot_USE_COIN_VISUALIZATION "@VirtualRobot_USE_COIN_VISUALIZATION@")
+SET(VirtualRobot_USE_OPENSCENEGRAPH_VISUALIZATION "@VirtualRobot_USE_OPENSCENEGRAPH_VISUALIZATION@")
+SET(VirtualRobot_VISUALIZATION_LIBS "@VirtualRobot_VISUALIZATION_LIBS@")
+SET(VirtualRobot_VISUALIZATION_INCLUDE_PATHS "@VirtualRobot_VISUALIZATION_INCLUDE_PATHS@")
+SET(VirtualRobot_VISUALIZATION_COMPILE_FLAGS "@VirtualRobot_VISUALIZATION_COMPILE_FLAGS@")
# Convenient setup: all VirtualRobot-related dependencies are included here.
-# If this causes troubles, disable it by steting VIRTUAL_ROBOT_DISABLE_DEPENDENCIES_INCLUDE.
+# If this causes troubles, disable it by steting VirtualRobot_DISABLE_DEPENDENCIES_INCLUDE.
# Then you will need to setup the dependencies on your own, similar to the setup in VirtualRobotExternalLibrarySetup.cmake
-IF(NOT VIRTUAL_ROBOT_DISABLE_DEPENDENCIES_INCLUDE)
+IF(NOT VirtualRobot_DISABLE_DEPENDENCIES_INCLUDE)
# include all library dependencies
- MESSAGE (STATUS " * Including ${VIRTUAL_ROBOT_CMAKE_DIR}/VirtualRobotExternalLibrarySetup.cmake")
- include(${VIRTUAL_ROBOT_CMAKE_DIR}/VirtualRobotExternalLibrarySetup.cmake)
+ if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE (STATUS " * Including ${VirtualRobot_CMAKE_DIR}/VirtualRobotExternalLibrarySetup.cmake")
+ endif()
+ include(${VirtualRobot_CMAKE_DIR}/VirtualRobotExternalLibrarySetup.cmake)
- MESSAGE (STATUS " * Including ${VIRTUAL_ROBOT_CMAKE_DIR}/VirtualRobotMacros.cmake")
- include(${VIRTUAL_ROBOT_CMAKE_DIR}/VirtualRobotMacros.cmake)
+ if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE (STATUS " * Including ${VirtualRobot_CMAKE_DIR}/VirtualRobotMacros.cmake")
+ endif()
+ include(${VirtualRobot_CMAKE_DIR}/VirtualRobotMacros.cmake)
ENDIF()
diff --git a/VirtualRobot/CMakeModules/VirtualRobotConfigDependencies.cmake b/VirtualRobot/CMakeModules/VirtualRobotConfigDependencies.cmake
index f8436d11b44daf9cc12bd4cc60b5f8d4d164c7a1..7c63fe1c9234ab5fc5eddcca359a6c163eead7ea 100644
--- a/VirtualRobot/CMakeModules/VirtualRobotConfigDependencies.cmake
+++ b/VirtualRobot/CMakeModules/VirtualRobotConfigDependencies.cmake
@@ -1,9 +1,9 @@
- SET (VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS "")
- SET (VIRTUAL_ROBOT_EXTERNAL_LIBRARIES "")
- SET (VIRTUAL_ROBOT_EXTERNAL_LIBRARY_DIRS "")
- SET (VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS "")
- SET (VIRTUAL_ROBOT_EXTERNAL_LIBRARY_CMAKE_INCLUDE "")
+ SET (VirtualRobot_EXTERNAL_INCLUDE_DIRS "")
+ SET (VirtualRobot_EXTERNAL_LIBRARIES "")
+ SET (VirtualRobot_EXTERNAL_LIBRARY_DIRS "")
+ SET (VirtualRobot_EXTERNAL_LIBRARY_FLAGS "")
+ SET (VirtualRobot_EXTERNAL_LIBRARY_CMAKE_INCLUDE "")
############################# SETUP MODULES #############################
MESSAGE (STATUS "module path: " ${CMAKE_MODULE_PATH})
@@ -11,18 +11,18 @@
#### Eigen
FIND_PACKAGE (Eigen3 REQUIRED)
if (Eigen3_FOUND)
- SET (VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS ${VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS} ${Eigen3_INCLUDE_DIR})
+ SET (VirtualRobot_EXTERNAL_INCLUDE_DIRS ${VirtualRobot_EXTERNAL_INCLUDE_DIRS} ${Eigen3_INCLUDE_DIR})
endif (Eigen3_FOUND)
#### BOOST
FIND_PACKAGE(Boost 1.42.0 COMPONENTS filesystem system unit_test_framework program_options thread REQUIRED)
if (Boost_FOUND)
MESSAGE (STATUS "Boost found at: ${Boost_INCLUDE_DIR}")
- SET (VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS ${VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS} ${Boost_INCLUDE_DIR})
- SET (VIRTUAL_ROBOT_EXTERNAL_LIBRARY_DIRS ${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
- SET (VIRTUAL_ROBOT_EXTERNAL_LIBRARIES ${VIRTUAL_ROBOT_EXTERNAL_LIBRARIES} ${Boost_LIBRARIES})
+ SET (VirtualRobot_EXTERNAL_INCLUDE_DIRS ${VirtualRobot_EXTERNAL_INCLUDE_DIRS} ${Boost_INCLUDE_DIR})
+ SET (VirtualRobot_EXTERNAL_LIBRARY_DIRS ${VirtualRobot_EXTERNAL_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
+ SET (VirtualRobot_EXTERNAL_LIBRARIES ${VirtualRobot_EXTERNAL_LIBRARIES} ${Boost_LIBRARIES})
# disable boost auto linking
- SET (VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS "${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS} -DBOOST_ALL_NO_LIB -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK -DBOOST_THREAD_DYN_LINK")
+ SET (VirtualRobot_EXTERNAL_LIBRARY_FLAGS "${VirtualRobot_EXTERNAL_LIBRARY_FLAGS} -DBOOST_ALL_NO_LIB -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK -DBOOST_THREAD_DYN_LINK")
else (Boost_FOUND)
MESSAGE ("!! Could not find Boost !!")
endif (Boost_FOUND)
@@ -38,16 +38,16 @@
#### VISUALIZATION Coin3D+Qt+SoQt / OSG+Qt
##########################################
- SET (VIRTUAL_ROBOT_VISUALIZATION FALSE)
- SET (VIRTUAL_ROBOT_VISUALIZATION_LIBS "")
- SET (VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS "")
- SET (VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS "")
+ SET (VirtualRobot_VISUALIZATION FALSE)
+ SET (VirtualRobot_VISUALIZATION_LIBS "")
+ SET (VirtualRobot_VISUALIZATION_INCLUDE_PATHS "")
+ SET (VirtualRobot_VISUALIZATION_COMPILE_FLAGS "")
- OPTION(VIRTUAL_ROBOT_USE_COIN_VISUALIZATION "Use Coin3D for visualization" ON)
- OPTION(VIRTUAL_ROBOT_USE_OPENSCENEGRAPH_VISUALIZATION "Use OpenSceneGraph for visualization" OFF)
+ OPTION(VirtualRobot_USE_COIN_VISUALIZATION "Use Coin3D for visualization" ON)
+ OPTION(VirtualRobot_USE_OPENSCENEGRAPH_VISUALIZATION "Use OpenSceneGraph for visualization" OFF)
- if (VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
+ if (VirtualRobot_USE_COIN_VISUALIZATION)
MESSAGE(STATUS "Searching Coin3D, Qt and SoQt...")
##### Coin3D
@@ -63,9 +63,9 @@
MESSAGE (STATUS "Found Qt4: " ${QT_INCLUDE_DIR})
MESSAGE (STATUS "QT_USE_FILE: " ${QT_USE_FILE})
include(${QT_USE_FILE})
- SET (VIRTUAL_ROBOT_EXTERNAL_LIBRARY_CMAKE_INCLUDE ${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_CMAKE_INCLUDE} ${QT_USE_FILE})
- SET (VIRTUAL_ROBOT_EXTERNAL_LIBRARY_DIRS ${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_DIRS} ${QT_LIBRARY_DIR})
- SET (VIRTUAL_ROBOT_EXTERNAL_LIBRARIES ${VIRTUAL_ROBOT_EXTERNAL_LIBRARIES} ${QT_LIBRARIES})
+ SET (VirtualRobot_EXTERNAL_LIBRARY_CMAKE_INCLUDE ${VirtualRobot_EXTERNAL_LIBRARY_CMAKE_INCLUDE} ${QT_USE_FILE})
+ SET (VirtualRobot_EXTERNAL_LIBRARY_DIRS ${VirtualRobot_EXTERNAL_LIBRARY_DIRS} ${QT_LIBRARY_DIR})
+ SET (VirtualRobot_EXTERNAL_LIBRARIES ${VirtualRobot_EXTERNAL_LIBRARIES} ${QT_LIBRARIES})
#MESSAGE(STATUS "QT_LIBRARIES: " ${QT_LIBRARIES})
@@ -85,13 +85,13 @@
if (QT_FOUND AND SOQT_FOUND AND COIN3D_FOUND)
MESSAGE (STATUS "Enabling Coin3D/Qt/SoQt support")
MESSAGE (STATUS "By using the Coin3D library, the license of Simox is not LGPL any more. The license must be GPL, since Coin3D is a GPL library. If you want to use Simox under LGPL you must disable Coin3D support!")
- SET (VIRTUAL_ROBOT_VISUALIZATION TRUE)
- SET (VIRTUAL_ROBOT_VISUALIZATION_LIBS ${QT_LIBRARIES} ${COIN3D_LIBRARIES} ${SoQt_LIBRARIES} )
- SET (VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS ${QT_INCLUDE_DIR} ${SoQt_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} )
- SET (VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS " -DCOIN_DLL -DSOQT_DLL ")
+ SET (VirtualRobot_VISUALIZATION TRUE)
+ SET (VirtualRobot_VISUALIZATION_LIBS ${QT_LIBRARIES} ${COIN3D_LIBRARIES} ${SoQt_LIBRARIES} )
+ SET (VirtualRobot_VISUALIZATION_INCLUDE_PATHS ${QT_INCLUDE_DIR} ${SoQt_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} )
+ SET (VirtualRobot_VISUALIZATION_COMPILE_FLAGS " -DCOIN_DLL -DSOQT_DLL ")
endif()
- elseif (VIRTUAL_ROBOT_USE_OPENSCENEGRAPH_VISUALIZATION)
+ elseif (VirtualRobot_USE_OPENSCENEGRAPH_VISUALIZATION)
MESSAGE(STATUS "Searching OSG and Qt...")
@@ -123,20 +123,20 @@
list(APPEND OPENSCENEGRAPH_LIBRARIES debug)
list(APPEND OPENSCENEGRAPH_LIBRARIES ${osgLibPath}/osgQtd.lib)
MESSAGE("OPENSCENEGRAPH_LIBRARIES: ${OPENSCENEGRAPH_LIBRARIES}")
- SET (VIRTUAL_ROBOT_VISUALIZATION TRUE)
- SET (VIRTUAL_ROBOT_VISUALIZATION_LIBS ${QT_LIBRARIES} ${OPENSCENEGRAPH_LIBRARIES} )
- SET (VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS ${OPENSCENEGRAPH_INCLUDE_DIRS} )
- SET (VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS "")
+ SET (VirtualRobot_VISUALIZATION TRUE)
+ SET (VirtualRobot_VISUALIZATION_LIBS ${QT_LIBRARIES} ${OPENSCENEGRAPH_LIBRARIES} )
+ SET (VirtualRobot_VISUALIZATION_INCLUDE_PATHS ${OPENSCENEGRAPH_INCLUDE_DIRS} )
+ SET (VirtualRobot_VISUALIZATION_COMPILE_FLAGS "")
endif()
else()
MESSAGE(STATUS "Visualization disabled")
endif()
- SET (VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS ${VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS} ${VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS})
- SET (VIRTUAL_ROBOT_EXTERNAL_LIBRARIES ${VIRTUAL_ROBOT_EXTERNAL_LIBRARIES} ${VIRTUAL_ROBOT_VISUALIZATION_LIBS})
- SET (VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS "${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS} ${VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS}")
- MESSAGE(STATUS "VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS:${VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS}")
- MESSAGE(STATUS "VIRTUAL_ROBOT_EXTERNAL_LIBRARY_DIRS:${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_DIRS}")
- MESSAGE(STATUS "VIRTUAL_ROBOT_EXTERNAL_LIBRARIES:${VIRTUAL_ROBOT_EXTERNAL_LIBRARIES}")
- MESSAGE(STATUS "VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS:${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS}")
\ No newline at end of file
+ SET (VirtualRobot_EXTERNAL_INCLUDE_DIRS ${VirtualRobot_EXTERNAL_INCLUDE_DIRS} ${VirtualRobot_VISUALIZATION_INCLUDE_PATHS})
+ SET (VirtualRobot_EXTERNAL_LIBRARIES ${VirtualRobot_EXTERNAL_LIBRARIES} ${VirtualRobot_VISUALIZATION_LIBS})
+ SET (VirtualRobot_EXTERNAL_LIBRARY_FLAGS "${VirtualRobot_EXTERNAL_LIBRARY_FLAGS} ${VirtualRobot_VISUALIZATION_COMPILE_FLAGS}")
+ MESSAGE(STATUS "VirtualRobot_EXTERNAL_INCLUDE_DIRS:${VirtualRobot_EXTERNAL_INCLUDE_DIRS}")
+ MESSAGE(STATUS "VirtualRobot_EXTERNAL_LIBRARY_DIRS:${VirtualRobot_EXTERNAL_LIBRARY_DIRS}")
+ MESSAGE(STATUS "VirtualRobot_EXTERNAL_LIBRARIES:${VirtualRobot_EXTERNAL_LIBRARIES}")
+ MESSAGE(STATUS "VirtualRobot_EXTERNAL_LIBRARY_FLAGS:${VirtualRobot_EXTERNAL_LIBRARY_FLAGS}")
\ No newline at end of file
diff --git a/VirtualRobot/CMakeModules/VirtualRobotConfigVersion.cmake.in b/VirtualRobot/CMakeModules/VirtualRobotConfigVersion.cmake.in
index 08b8a6b2c7b4e9de649bf7b23e4566e1d44da5de..76822934d8509ddbfa22bc2e4204bace693f7e43 100644
--- a/VirtualRobot/CMakeModules/VirtualRobotConfigVersion.cmake.in
+++ b/VirtualRobot/CMakeModules/VirtualRobotConfigVersion.cmake.in
@@ -1,13 +1,13 @@
-## Copyright (c) 2011, Karlsruhe Institute of Technology (Manfred Kroehnert)
-
-set(PACKAGE_VERSION "@VIRTUAL_ROBOT_VERSION@")
-
- # Check whether the requested PACKAGE_FIND_VERSION is compatible
- if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
- set(PACKAGE_VERSION_COMPATIBLE FALSE)
- else()
- set(PACKAGE_VERSION_COMPATIBLE TRUE)
- if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
- set(PACKAGE_VERSION_EXACT TRUE)
- endif()
+## Copyright (c) 2011, Karlsruhe Institute of Technology (Manfred Kroehnert)
+
+set(PACKAGE_VERSION "@VirtualRobot_VERSION@")
+
+ # Check whether the requested PACKAGE_FIND_VERSION is compatible
+ if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+ else()
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
endif()
\ No newline at end of file
diff --git a/VirtualRobot/CMakeModules/VirtualRobotExternalLibrarySetup.cmake b/VirtualRobot/CMakeModules/VirtualRobotExternalLibrarySetup.cmake
index 783184b1c44d682b66361e2df462184f4b4bef0d..791ce03bac0dff3f33f3318cab3ba86ca5e3f45a 100644
--- a/VirtualRobot/CMakeModules/VirtualRobotExternalLibrarySetup.cmake
+++ b/VirtualRobot/CMakeModules/VirtualRobotExternalLibrarySetup.cmake
@@ -1,31 +1,43 @@
-# Setup paths, libs and external cmake files to be used for VIRTUAL_ROBOT
+# Setup paths, libs and external cmake files to be used for VirtualRobot
-MESSAGE(STATUS "SETTING LIBRARY DEPENDENCIES FOR VIRTUAL ROBOT")
-MESSAGE(STATUS " * VIRTUAL_ROBOT_VISUALIZATION: ${VIRTUAL_ROBOT_VISUALIZATION}")
+if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE(STATUS "SETTING LIBRARY DEPENDENCIES FOR VIRTUAL ROBOT")
+ MESSAGE(STATUS " * VirtualRobot_VISUALIZATION: ${VirtualRobot_VISUALIZATION}")
+endif()
-IF (VIRTUAL_ROBOT_VISUALIZATION)
+IF (VirtualRobot_VISUALIZATION)
# we need to check for Qt4
IF(NOT "$ENV{QT_QMAKE_EXECUTABLE}" STREQUAL "")
- MESSAGE (STATUS "USING QT-PATH from environment variable QT_QMAKE_EXECUTABLE: $ENV{QT_QMAKE_EXECUTABLE}")
+ if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE (STATUS "USING QT-PATH from environment variable QT_QMAKE_EXECUTABLE: $ENV{QT_QMAKE_EXECUTABLE}")
+ endif()
file(TO_CMAKE_PATH "$ENV{QT_QMAKE_EXECUTABLE}" QT_QMAKE_EXECUTABLE)
ENDIF()
FIND_PACKAGE(Qt4 4.6.0 COMPONENTS QtOpenGL QtCore QtGui)
ENDIF()
-MESSAGE(STATUS " * VIRTUAL_ROBOT_INCLUDE_DIRS: ${VIRTUAL_ROBOT_INCLUDE_DIRS}")
-INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_INCLUDE_DIRS})
-
-MESSAGE(STATUS " * VIRTUAL_ROBOT_COMPILE_FLAGS: ${VIRTUAL_ROBOT_COMPILE_FLAGS}")
-ADD_DEFINITIONS( ${VIRTUAL_ROBOT_COMPILE_FLAGS} )
-
-MESSAGE(STATUS " * VIRTUAL_ROBOT_LIBRARY_DIRS: ${VIRTUAL_ROBOT_LIBRARY_DIRS}")
-LINK_DIRECTORIES( ${VIRTUAL_ROBOT_LIBRARY_DIRS} )
-
-#MESSAGE(STATUS " * VIRTUAL_ROBOT_CMAKE_INCLUDE: ${VIRTUAL_ROBOT_CMAKE_INCLUDE}")
-FOREACH(f ${VIRTUAL_ROBOT_CMAKE_INCLUDE})
- MESSAGE(STATUS " * VIRTUAL_ROBOT_CMAKE_INCLUDE: ${f}")
+if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE(STATUS " * VirtualRobot_INCLUDE_DIRS: ${VirtualRobot_INCLUDE_DIRS}")
+endif()
+INCLUDE_DIRECTORIES(${VirtualRobot_INCLUDE_DIRS})
+
+if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE(STATUS " * VirtualRobot_COMPILE_FLAGS: ${VirtualRobot_COMPILE_FLAGS}")
+endif()
+ADD_DEFINITIONS( ${VirtualRobot_COMPILE_FLAGS} )
+
+if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE(STATUS " * VirtualRobot_LIBRARY_DIRS: ${VirtualRobot_LIBRARY_DIRS}")
+endif()
+LINK_DIRECTORIES( ${VirtualRobot_LIBRARY_DIRS} )
+
+#MESSAGE(STATUS " * VirtualRobot_CMAKE_INCLUDE: ${VirtualRobot_CMAKE_INCLUDE}")
+FOREACH(f ${VirtualRobot_CMAKE_INCLUDE})
+ if (NOT (Simox_FIND_QUIETLY OR VirtualRobot_FIND_QUIETLY))
+ MESSAGE(STATUS " * VirtualRobot_CMAKE_INCLUDE: ${f}")
+ endif()
INCLUDE(${f})
ENDFOREACH(f)
diff --git a/VirtualRobot/CMakeModules/VirtualRobotMacros.cmake b/VirtualRobot/CMakeModules/VirtualRobotMacros.cmake
index 7d62cf70aa2be048095c3c6e9c173dd91360d4a6..fd16b0f88cbc7fc62a4feeacc2825dbebf701264 100644
--- a/VirtualRobot/CMakeModules/VirtualRobotMacros.cmake
+++ b/VirtualRobot/CMakeModules/VirtualRobotMacros.cmake
@@ -11,7 +11,7 @@ function(VirtualRobotQtApplication name srcs incs mocFiles uiFiles)
################################## EXECUTABLE ##############################
ADD_EXECUTABLE(${name} ${srcs} ${incs} ${generatedUiFiles} ${generatedMocFiles})
- TARGET_LINK_LIBRARIES(${name} ${VIRTUAL_ROBOT_LIBRARIES})
+ TARGET_LINK_LIBRARIES(${name} ${VirtualRobot_LIBRARIES})
endfunction()
diff --git a/VirtualRobot/CollisionDetection/PQP/PQP++/CMakeLists.txt b/VirtualRobot/CollisionDetection/PQP/PQP++/CMakeLists.txt
index 1dfda1e5ba7704b503356b15b4c90836368d3180..d36decc31b672fcd18916483d24fdff6ab3e1d54 100644
--- a/VirtualRobot/CollisionDetection/PQP/PQP++/CMakeLists.txt
+++ b/VirtualRobot/CollisionDetection/PQP/PQP++/CMakeLists.txt
@@ -13,7 +13,7 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR})
ADD_LIBRARY(${PROJECT_NAME} STATIC ${SRCS} ${INCS})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "3rd_Party")
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_LIB_DIR})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${VirtualRobot_LIB_DIR})
IF(UNIX)
#MESSAGE("PQP 2: CMAKE_SYSTEM_PROCESSOR:${CMAKE_SYSTEM_PROCESSOR}")
# We are on Linux
@@ -25,10 +25,10 @@ ENDIF(UNIX)
TARGET_LINK_LIBRARIES(${PROJECT_NAME})
-MESSAGE(STATUS " ** ${PROJECT_NAME} will be placed into " ${VIRTUAL_ROBOT_LIB_DIR})
+MESSAGE(STATUS " ** ${PROJECT_NAME} will be placed into " ${VirtualRobot_LIB_DIR})
-MESSAGE(STATUS " ** make install will install " ${PROJECT_NAME} " into " ${VIRTUAL_ROBOT_INSTALL_LIB_DIR})
+MESSAGE(STATUS " ** make install will install " ${PROJECT_NAME} " into " ${VirtualRobot_INSTALL_LIB_DIR})
INSTALL(TARGETS ${PROJECT_NAME}
EXPORT VirtualRobotLibraryDepends
- DESTINATION ${VIRTUAL_ROBOT_INSTALL_LIB_DIR})
+ DESTINATION ${VirtualRobot_INSTALL_LIB_DIR})
diff --git a/VirtualRobot/config.cmake b/VirtualRobot/config.cmake
index 39ff7b78d7ee1c37268c02c5e4f6d0118e38cfad..f42e774761c0e25196c710fb4a70fc3fa806e602 100644
--- a/VirtualRobot/config.cmake
+++ b/VirtualRobot/config.cmake
@@ -1,7 +1,7 @@
-IF (NOT VIRTUAL_ROBOT_CONFIGURED)
+IF (NOT VirtualRobot_CONFIGURED)
- SET(VIRTUAL_ROBOT_CONFIGURED TRUE)
+ SET(VirtualRobot_CONFIGURED TRUE)
GET_FILENAME_COMPONENT (CurrentVRPath ${CMAKE_CURRENT_LIST_FILE} PATH)
SET(VR_DIR ${CurrentVRPath})
@@ -16,7 +16,7 @@ IF (NOT VIRTUAL_ROBOT_CONFIGURED)
############################# SETUP PATHS #############################
- # Allow #include <VIRTUAL_ROBOT/*.h>
+ # Allow #include <VirtualRobot/*.h>
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR} ${VR_DIR}/..)
@@ -29,37 +29,37 @@ IF (NOT VIRTUAL_ROBOT_CONFIGURED)
ENDIF()
# check if we are enforced to build to some destination
- IF(DEFINED VIRTUAL_ROBOT_BUILD_DIRECTORY)
- get_filename_component(VIRTUAL_ROBOT_BUILD_DIRECTORY ${VIRTUAL_ROBOT_BUILD_DIRECTORY} ABSOLUTE)
- MESSAGE (STATUS "** VIRTUAL_ROBOT Build dir defined: ${VIRTUAL_ROBOT_BUILD_DIRECTORY}")
+ IF(DEFINED VirtualRobot_BUILD_DIRECTORY)
+ get_filename_component(VirtualRobot_BUILD_DIRECTORY ${VirtualRobot_BUILD_DIRECTORY} ABSOLUTE)
+ MESSAGE (STATUS "** VirtualRobot Build dir defined: ${VirtualRobot_BUILD_DIRECTORY}")
ELSE()
- SET(VIRTUAL_ROBOT_BUILD_DIRECTORY ${CMAKE_BINARY_DIR})
- MESSAGE (STATUS "** VIRTUAL_ROBOT Build dir not defined, using CMAKE_BINARY_DIR: ${VIRTUAL_ROBOT_BUILD_DIRECTORY}")
+ SET(VirtualRobot_BUILD_DIRECTORY ${CMAKE_BINARY_DIR})
+ MESSAGE (STATUS "** VirtualRobot Build dir not defined, using CMAKE_BINARY_DIR: ${VirtualRobot_BUILD_DIRECTORY}")
ENDIF()
- SET(VIRTUAL_ROBOT_LIB_DIR ${VIRTUAL_ROBOT_BUILD_DIRECTORY}/${LIB_DIR})
- SET(VIRTUAL_ROBOT_BIN_DIR ${VIRTUAL_ROBOT_BUILD_DIRECTORY}/${BIN_DIR})
+ SET(VirtualRobot_LIB_DIR ${VirtualRobot_BUILD_DIRECTORY}/${LIB_DIR})
+ SET(VirtualRobot_BIN_DIR ${VirtualRobot_BUILD_DIRECTORY}/${BIN_DIR})
- MESSAGE (STATUS "** VIRTUAL_ROBOT LIB DIR: ${VIRTUAL_ROBOT_LIB_DIR}")
- MESSAGE (STATUS "** VIRTUAL_ROBOT BIN DIR: ${VIRTUAL_ROBOT_BIN_DIR}")
+ MESSAGE (STATUS "** VirtualRobot LIB DIR: ${VirtualRobot_LIB_DIR}")
+ MESSAGE (STATUS "** VirtualRobot BIN DIR: ${VirtualRobot_BIN_DIR}")
# Define, where to install the binaries
- IF (NOT DEFINED VIRTUAL_ROBOT_INSTALL_LIB_DIR)
- SET(VIRTUAL_ROBOT_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_DIR})
+ IF (NOT DEFINED VirtualRobot_INSTALL_LIB_DIR)
+ SET(VirtualRobot_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_DIR})
ENDIF()
- IF (NOT DEFINED VIRTUAL_ROBOT_INSTALL_BIN_DIR)
- SET(VIRTUAL_ROBOT_INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${BIN_DIR})
+ IF (NOT DEFINED VirtualRobot_INSTALL_BIN_DIR)
+ SET(VirtualRobot_INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${BIN_DIR})
ENDIF()
- IF (NOT DEFINED VIRTUAL_ROBOT_INSTALL_HEADER_DIR)
- SET(VIRTUAL_ROBOT_INSTALL_HEADER_DIR ${CMAKE_INSTALL_PREFIX}/include)
+ IF (NOT DEFINED VirtualRobot_INSTALL_HEADER_DIR)
+ SET(VirtualRobot_INSTALL_HEADER_DIR ${CMAKE_INSTALL_PREFIX}/include)
ENDIF()
############################# Set OS specific options #############################
IF(UNIX)
# We are on Linux
- SET(VIRTUAL_ROBOT_TEST_DIR ${VIRTUAL_ROBOT_BIN_DIR}/tests)
+ SET(VirtualRobot_TEST_DIR ${VirtualRobot_BIN_DIR}/tests)
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
ADD_DEFINITIONS(-fPIC)
ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
@@ -78,7 +78,7 @@ IF (NOT VIRTUAL_ROBOT_CONFIGURED)
# (but later on when installing)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- SET(CMAKE_INSTALL_RPATH "${VIRTUAL_ROBOT_LIB_DIR}")
+ SET(CMAKE_INSTALL_RPATH "${VirtualRobot_LIB_DIR}")
# add the automatically determined parts of the RPATH
# which point to directories outside the build tree to the install RPATH
@@ -86,15 +86,15 @@ IF (NOT VIRTUAL_ROBOT_CONFIGURED)
# the RPATH to be used when installing, but only if it's not a system directory
- LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${VIRTUAL_ROBOT_LIB_DIR}" isSystemDir)
+ LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${VirtualRobot_LIB_DIR}" isSystemDir)
IF("${isSystemDir}" STREQUAL "-1")
- SET(CMAKE_INSTALL_RPATH "${VIRTUAL_ROBOT_LIB_DIR}")
+ SET(CMAKE_INSTALL_RPATH "${VirtualRobot_LIB_DIR}")
ENDIF("${isSystemDir}" STREQUAL "-1")
ELSE(UNIX)
# We are on Windows
- SET(VIRTUAL_ROBOT_TEST_DIR ${VIRTUAL_ROBOT_BIN_DIR})
+ SET(VirtualRobot_TEST_DIR ${VirtualRobot_BIN_DIR})
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
# On MSVC we compile with /MP flag (use multiple threads)
@@ -110,18 +110,18 @@ IF (NOT VIRTUAL_ROBOT_CONFIGURED)
ENABLE_TESTING()
INCLUDE(CTest)
- MESSAGE(STATUS "** Test output directory: ${VIRTUAL_ROBOT_TEST_DIR}")
+ MESSAGE(STATUS "** Test output directory: ${VirtualRobot_TEST_DIR}")
MACRO(ADD_VR_TEST TEST_NAME)
- INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_EXTERNAL_INCLUDE_DIRS})
- ADD_DEFINITIONS(${VIRTUAL_ROBOT_EXTERNAL_LIBRARY_FLAGS})
+ INCLUDE_DIRECTORIES(${VirtualRobot_EXTERNAL_INCLUDE_DIRS})
+ ADD_DEFINITIONS(${VirtualRobot_EXTERNAL_LIBRARY_FLAGS})
ADD_EXECUTABLE(${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp)
- TARGET_LINK_LIBRARIES(${TEST_NAME} VirtualRobot ${VIRTUAL_ROBOT_EXTERNAL_LIBRARIES})
- SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_TEST_DIR})
+ TARGET_LINK_LIBRARIES(${TEST_NAME} VirtualRobot ${VirtualRobot_EXTERNAL_LIBRARIES})
+ SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VirtualRobot_TEST_DIR})
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES FOLDER "VirtualRobot Tests")
ADD_TEST(NAME VirtualRobot_${TEST_NAME}
- COMMAND ${VIRTUAL_ROBOT_TEST_DIR}/${TEST_NAME} --output_format=XML --log_level=all --report_level=no)
+ COMMAND ${VirtualRobot_TEST_DIR}/${TEST_NAME} --output_format=XML --log_level=all --report_level=no)
ENDMACRO(ADD_VR_TEST)
-ENDIF (NOT VIRTUAL_ROBOT_CONFIGURED)
+ENDIF (NOT VirtualRobot_CONFIGURED)
diff --git a/VirtualRobot/examples/GraspEditor/CMakeLists.txt b/VirtualRobot/examples/GraspEditor/CMakeLists.txt
index 5391c933fe750c19d38b3c8538ec9a68884fbcc6..6d39713cfd2de46473b304bd26f5a48132b6d91c 100644
--- a/VirtualRobot/examples/GraspEditor/CMakeLists.txt
+++ b/VirtualRobot/examples/GraspEditor/CMakeLists.txt
@@ -4,9 +4,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
CMAKE_POLICY(VERSION 2.6)
-IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
+IF(VirtualRobot_VISUALIZATION AND VirtualRobot_USE_COIN_VISUALIZATION)
- LINK_DIRECTORIES(${VIRTUAL_ROBOT_LIB_DIR})
+ LINK_DIRECTORIES(${VirtualRobot_LIB_DIR})
# the variable "demo_SRCS" contains all .cpp files of this project
@@ -33,17 +33,17 @@ IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
ADD_EXECUTABLE(${PROJECT_NAME} ${demo_SRCS} ${demo_INCS})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_BIN_DIR})
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VirtualRobot_BIN_DIR})
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VIRTUAL_ROBOT_VISUALIZATION_LIBS})
- INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VirtualRobot_VISUALIZATION_LIBS})
+ INCLUDE_DIRECTORIES(${VirtualRobot_VISUALIZATION_INCLUDE_PATHS})
INCLUDE(${QT_USE_FILE})
- ADD_DEFINITIONS(${VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS})
+ ADD_DEFINITIONS(${VirtualRobot_VISUALIZATION_COMPILE_FLAGS})
INSTALL(TARGETS ${PROJECT_NAME}
- DESTINATION ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ DESTINATION ${VirtualRobot_INSTALL_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VIRTUAL_ROBOT_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VirtualRobot_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VirtualRobot_INSTALL_BIN_DIR})
ENDIF()
diff --git a/VirtualRobot/examples/Jacobi/CMakeLists.txt b/VirtualRobot/examples/Jacobi/CMakeLists.txt
index d682fe802bdf2d6ed4d036e145d22331283ccccf..f3c6fb10d3e2a630577cfbef229f46b2f758e6c1 100644
--- a/VirtualRobot/examples/Jacobi/CMakeLists.txt
+++ b/VirtualRobot/examples/Jacobi/CMakeLists.txt
@@ -5,9 +5,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
CMAKE_POLICY(VERSION 2.6)
-IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
+IF(VirtualRobot_VISUALIZATION AND VirtualRobot_USE_COIN_VISUALIZATION)
- LINK_DIRECTORIES(${VIRTUAL_ROBOT_LIB_DIR})
+ LINK_DIRECTORIES(${VirtualRobot_LIB_DIR})
# the variable "demo_SRCS" contains all .cpp files of this project
@@ -37,17 +37,17 @@ IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
ADD_EXECUTABLE(${PROJECT_NAME} ${demo_SRCS} ${demo_INCS})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_BIN_DIR})
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VirtualRobot_BIN_DIR})
#MESSAGE("QT_LIBRARIES :" ${QT_LIBRARIES})
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VIRTUAL_ROBOT_VISUALIZATION_LIBS})
- INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VirtualRobot_VISUALIZATION_LIBS})
+ INCLUDE_DIRECTORIES(${VirtualRobot_VISUALIZATION_INCLUDE_PATHS})
INCLUDE(${QT_USE_FILE})
- ADD_DEFINITIONS(${VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS})
+ ADD_DEFINITIONS(${VirtualRobot_VISUALIZATION_COMPILE_FLAGS})
INSTALL(TARGETS ${PROJECT_NAME}
- DESTINATION ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ DESTINATION ${VirtualRobot_INSTALL_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VIRTUAL_ROBOT_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VirtualRobot_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VirtualRobot_INSTALL_BIN_DIR})
ENDIF()
diff --git a/VirtualRobot/examples/RobotViewer/CMakeLists.txt b/VirtualRobot/examples/RobotViewer/CMakeLists.txt
index 3eb9a422abf7e69ccbd1ece4426c20ff446d1c04..9e6aaece47f17b145eb7ccc226eb162c8fded1d7 100644
--- a/VirtualRobot/examples/RobotViewer/CMakeLists.txt
+++ b/VirtualRobot/examples/RobotViewer/CMakeLists.txt
@@ -4,9 +4,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
CMAKE_POLICY(VERSION 2.6)
-IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
+IF(VirtualRobot_VISUALIZATION AND VirtualRobot_USE_COIN_VISUALIZATION)
- LINK_DIRECTORIES(${VIRTUAL_ROBOT_LIB_DIR})
+ LINK_DIRECTORIES(${VirtualRobot_LIB_DIR})
# the variable "demo_SRCS" contains all .cpp files of this project
@@ -32,16 +32,16 @@ IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
ADD_EXECUTABLE(${PROJECT_NAME} ${demo_SRCS} ${demo_INCS})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_BIN_DIR})
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VirtualRobot_BIN_DIR})
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VIRTUAL_ROBOT_VISUALIZATION_LIBS})
- INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VirtualRobot_VISUALIZATION_LIBS})
+ INCLUDE_DIRECTORIES(${VirtualRobot_VISUALIZATION_INCLUDE_PATHS})
INCLUDE(${QT_USE_FILE})
- ADD_DEFINITIONS(${VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS})
+ ADD_DEFINITIONS(${VirtualRobot_VISUALIZATION_COMPILE_FLAGS})
INSTALL(TARGETS ${PROJECT_NAME}
- DESTINATION ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ DESTINATION ${VirtualRobot_INSTALL_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VIRTUAL_ROBOT_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VirtualRobot_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VirtualRobot_INSTALL_BIN_DIR})
ENDIF()
diff --git a/VirtualRobot/examples/RobotViewerOSG/CMakeLists.txt b/VirtualRobot/examples/RobotViewerOSG/CMakeLists.txt
index e66704afcbb6e219a57f51af37defb1e5446e138..121f1b4b8bde2690e324c29c22c60008b0e8e59d 100644
--- a/VirtualRobot/examples/RobotViewerOSG/CMakeLists.txt
+++ b/VirtualRobot/examples/RobotViewerOSG/CMakeLists.txt
@@ -4,9 +4,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
CMAKE_POLICY(VERSION 2.6)
-IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_OPENSCENEGRAPH_VISUALIZATION)
+IF(VirtualRobot_VISUALIZATION AND VirtualRobot_USE_OPENSCENEGRAPH_VISUALIZATION)
- LINK_DIRECTORIES(${VIRTUAL_ROBOT_LIB_DIR})
+ LINK_DIRECTORIES(${VirtualRobot_LIB_DIR})
# the variable "demo_SRCS" contains all .cpp files of this project
@@ -34,16 +34,16 @@ IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_OPENSCENEGRAPH_VISUALIZATIO
ADD_EXECUTABLE(${PROJECT_NAME} ${demo_SRCS} ${demo_INCS})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_BIN_DIR})
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VirtualRobot_BIN_DIR})
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VIRTUAL_ROBOT_VISUALIZATION_LIBS})
- INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VirtualRobot_VISUALIZATION_LIBS})
+ INCLUDE_DIRECTORIES(${VirtualRobot_VISUALIZATION_INCLUDE_PATHS})
INCLUDE(${QT_USE_FILE})
- ADD_DEFINITIONS(${VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS})
+ ADD_DEFINITIONS(${VirtualRobot_VISUALIZATION_COMPILE_FLAGS})
INSTALL(TARGETS ${PROJECT_NAME}
- DESTINATION ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ DESTINATION ${VirtualRobot_INSTALL_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VIRTUAL_ROBOT_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VirtualRobot_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VirtualRobot_INSTALL_BIN_DIR})
ENDIF()
diff --git a/VirtualRobot/examples/SceneViewer/CMakeLists.txt b/VirtualRobot/examples/SceneViewer/CMakeLists.txt
index 480137d31adc3de5ac59bd7fe182b32454d3bd0a..41f95b931ee8845e997c405c55e8a6fb5be9e6f9 100644
--- a/VirtualRobot/examples/SceneViewer/CMakeLists.txt
+++ b/VirtualRobot/examples/SceneViewer/CMakeLists.txt
@@ -4,9 +4,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
CMAKE_POLICY(VERSION 2.6)
-IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
+IF(VirtualRobot_VISUALIZATION AND VirtualRobot_USE_COIN_VISUALIZATION)
- LINK_DIRECTORIES(${VIRTUAL_ROBOT_LIB_DIR})
+ LINK_DIRECTORIES(${VirtualRobot_LIB_DIR})
# the variable "demo_SRCS" contains all .cpp files of this project
@@ -33,16 +33,16 @@ IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
ADD_EXECUTABLE(${PROJECT_NAME} ${demo_SRCS} ${demo_INCS})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_BIN_DIR})
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VirtualRobot_BIN_DIR})
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VIRTUAL_ROBOT_VISUALIZATION_LIBS})
- INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VirtualRobot_VISUALIZATION_LIBS})
+ INCLUDE_DIRECTORIES(${VirtualRobot_VISUALIZATION_INCLUDE_PATHS})
INCLUDE(${QT_USE_FILE})
- ADD_DEFINITIONS(${VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS})
+ ADD_DEFINITIONS(${VirtualRobot_VISUALIZATION_COMPILE_FLAGS})
INSTALL(TARGETS ${PROJECT_NAME}
- DESTINATION ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ DESTINATION ${VirtualRobot_INSTALL_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VIRTUAL_ROBOT_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VirtualRobot_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VirtualRobot_INSTALL_BIN_DIR})
ENDIF()
diff --git a/VirtualRobot/examples/loadRobot/CMakeLists.txt b/VirtualRobot/examples/loadRobot/CMakeLists.txt
index 4d6f0ed51a164a603ea5013ad813f118cbf58eb7..eafee93ff3ef59eea48ebfff681002e058a52782 100644
--- a/VirtualRobot/examples/loadRobot/CMakeLists.txt
+++ b/VirtualRobot/examples/loadRobot/CMakeLists.txt
@@ -4,17 +4,17 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
CMAKE_POLICY(VERSION 2.6)
-LINK_DIRECTORIES(${VIRTUAL_ROBOT_LIB_DIR})
+LINK_DIRECTORIES(${VirtualRobot_LIB_DIR})
ADD_EXECUTABLE(${PROJECT_NAME} loadRobot.cpp)
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_BIN_DIR})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VirtualRobot_BIN_DIR})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot)
INSTALL(TARGETS ${PROJECT_NAME}
- DESTINATION ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ DESTINATION ${VirtualRobot_INSTALL_BIN_DIR})
-MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VIRTUAL_ROBOT_BIN_DIR})
-MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VirtualRobot_BIN_DIR})
+MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VirtualRobot_INSTALL_BIN_DIR})
diff --git a/VirtualRobot/examples/reachability/CMakeLists.txt b/VirtualRobot/examples/reachability/CMakeLists.txt
index b28c9972b712fce0a044c76bc0f39f23f5998f9b..57cfea733f9845fa5296d130c57a6aa276b4ef25 100644
--- a/VirtualRobot/examples/reachability/CMakeLists.txt
+++ b/VirtualRobot/examples/reachability/CMakeLists.txt
@@ -4,9 +4,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
CMAKE_POLICY(VERSION 2.6)
-IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
+IF(VirtualRobot_VISUALIZATION AND VirtualRobot_USE_COIN_VISUALIZATION)
- LINK_DIRECTORIES(${VIRTUAL_ROBOT_LIB_DIR})
+ LINK_DIRECTORIES(${VirtualRobot_LIB_DIR})
# the variable "demo_SRCS" contains all .cpp files of this project
@@ -36,16 +36,16 @@ IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
ADD_EXECUTABLE(${PROJECT_NAME} ${demo_SRCS} ${demo_INCS})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_BIN_DIR})
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VirtualRobot_BIN_DIR})
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VIRTUAL_ROBOT_VISUALIZATION_LIBS})
- INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VirtualRobot_VISUALIZATION_LIBS})
+ INCLUDE_DIRECTORIES(${VirtualRobot_VISUALIZATION_INCLUDE_PATHS})
INCLUDE(${QT_USE_FILE})
- ADD_DEFINITIONS(${VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS})
+ ADD_DEFINITIONS(${VirtualRobot_VISUALIZATION_COMPILE_FLAGS})
INSTALL(TARGETS ${PROJECT_NAME}
- DESTINATION ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ DESTINATION ${VirtualRobot_INSTALL_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VIRTUAL_ROBOT_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VirtualRobot_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VirtualRobot_INSTALL_BIN_DIR})
ENDIF()
diff --git a/VirtualRobot/examples/stability/CMakeLists.txt b/VirtualRobot/examples/stability/CMakeLists.txt
index d724b6ad832605f31b2343c53a4c5743f15ab44a..33299db927a15891a95fde9d7e7499aeea5bc1f4 100644
--- a/VirtualRobot/examples/stability/CMakeLists.txt
+++ b/VirtualRobot/examples/stability/CMakeLists.txt
@@ -4,9 +4,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4)
CMAKE_POLICY(VERSION 2.6)
-IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
+IF(VirtualRobot_VISUALIZATION AND VirtualRobot_USE_COIN_VISUALIZATION)
- LINK_DIRECTORIES(${VIRTUAL_ROBOT_LIB_DIR})
+ LINK_DIRECTORIES(${VirtualRobot_LIB_DIR})
# the variable "demo_SRCS" contains all .cpp files of this project
@@ -34,16 +34,16 @@ IF(VIRTUAL_ROBOT_VISUALIZATION AND VIRTUAL_ROBOT_USE_COIN_VISUALIZATION)
ADD_EXECUTABLE(${PROJECT_NAME} ${demo_SRCS} ${demo_INCS})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES FOLDER "Examples")
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VIRTUAL_ROBOT_BIN_DIR})
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${VirtualRobot_BIN_DIR})
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VIRTUAL_ROBOT_VISUALIZATION_LIBS})
- INCLUDE_DIRECTORIES(${VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} VirtualRobot ${VirtualRobot_VISUALIZATION_LIBS})
+ INCLUDE_DIRECTORIES(${VirtualRobot_VISUALIZATION_INCLUDE_PATHS})
INCLUDE(${QT_USE_FILE})
- ADD_DEFINITIONS(${VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS})
+ ADD_DEFINITIONS(${VirtualRobot_VISUALIZATION_COMPILE_FLAGS})
INSTALL(TARGETS ${PROJECT_NAME}
- DESTINATION ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ DESTINATION ${VirtualRobot_INSTALL_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VIRTUAL_ROBOT_BIN_DIR})
- MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VIRTUAL_ROBOT_INSTALL_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be placed into " ${VirtualRobot_BIN_DIR})
+ MESSAGE( STATUS ${PROJECT_NAME} " will be installed into " ${VirtualRobot_INSTALL_BIN_DIR})
ENDIF()
diff --git a/VirtualRobot/tests/CMakeLists.txt b/VirtualRobot/tests/CMakeLists.txt
index f9be542a6fd68a6b4d151cce52c56549ebd8aa17..5ccea68476d47a70d260fe7cc588cddc0442bfb9 100644
--- a/VirtualRobot/tests/CMakeLists.txt
+++ b/VirtualRobot/tests/CMakeLists.txt
@@ -5,7 +5,7 @@ ADD_VR_TEST( VirtualRobotRobotTest )
ADD_VR_TEST( VirtualRobotTransformationTest )
-if (VIRTUAL_ROBOT_VISUALIZATION)
+if (VirtualRobot_VISUALIZATION)
ADD_VR_TEST( VirtualRobotCollisionTest )
endif()
diff --git a/config.cmake b/config.cmake
index e2356025eb8ecedffc8a3ef7042834813b51b14c..b29d4ecbbd0295fa3267b8cb4ec4ed7bfeb65da0 100644
--- a/config.cmake
+++ b/config.cmake
@@ -1,8 +1,8 @@
-IF (NOT SIMOX_CONFIGURED)
+IF (NOT Simox_CONFIGURED)
- # defines SIMOX_CONFIGURED variable which indicates that this config file has already been included
- SET(SIMOX_CONFIGURED TRUE)
+ # defines Simox_CONFIGURED variable which indicates that this config file has already been included
+ SET(Simox_CONFIGURED TRUE)
# Set up for debug build
IF(NOT CMAKE_BUILD_TYPE)
@@ -13,36 +13,36 @@ IF (NOT SIMOX_CONFIGURED)
############################# SETUP PATHS #############################
- SET(SIMOX_BUILD_DIRECTORY ${CMAKE_BINARY_DIR})
+ SET(Simox_BUILD_DIRECTORY ${CMAKE_BINARY_DIR})
SET(BIN_DIR bin)
SET(LIB_DIR lib)
- SET(SIMOX_LIB_DIR ${SIMOX_BUILD_DIRECTORY}/${LIB_DIR})
- SET(SIMOX_BIN_DIR ${SIMOX_BUILD_DIRECTORY}/${BIN_DIR})
+ SET(Simox_LIB_DIR ${Simox_BUILD_DIRECTORY}/${LIB_DIR})
+ SET(Simox_BIN_DIR ${Simox_BUILD_DIRECTORY}/${BIN_DIR})
- MESSAGE (STATUS "** SIMOX LIB DIR: ${SIMOX_LIB_DIR}")
- MESSAGE (STATUS "** SIMOX BIN DIR: ${SIMOX_BIN_DIR}")
+ MESSAGE (STATUS "** SIMOX LIB DIR: ${Simox_LIB_DIR}")
+ MESSAGE (STATUS "** SIMOX BIN DIR: ${Simox_BIN_DIR}")
- SET(SIMOX_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_DIR})
- SET(SIMOX_INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${BIN_DIR})
- SET(SIMOX_INSTALL_HEADER_DIR ${CMAKE_INSTALL_PREFIX}/include)
+ SET(Simox_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_DIR})
+ SET(Simox_INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${BIN_DIR})
+ SET(Simox_INSTALL_HEADER_DIR ${CMAKE_INSTALL_PREFIX}/include)
## set library settings
## SETUP VIRTUAL ROBOT
- SET(VIRTUAL_ROBOT_BUILD_DIRECTORY ${SIMOX_BUILD_DIRECTORY})
- SET(VIRTUAL_ROBOT_INSTALL_LIB_DIR ${SIMOX_INSTALL_LIB_DIR})
- SET(VIRTUAL_ROBOT_INSTALL_BIN_DIR ${SIMOX_INSTALL_BIN_DIR})
- SET(VIRTUAL_ROBOT_INSTALL_HEADER_DIR ${SIMOX_INSTALL_HEADER_DIR})
+ SET(VirtualRobot_BUILD_DIRECTORY ${Simox_BUILD_DIRECTORY})
+ SET(VirtualRobot_INSTALL_LIB_DIR ${Simox_INSTALL_LIB_DIR})
+ SET(VirtualRobot_INSTALL_BIN_DIR ${Simox_INSTALL_BIN_DIR})
+ SET(VirtualRobot_INSTALL_HEADER_DIR ${Simox_INSTALL_HEADER_DIR})
include (VirtualRobot/config.cmake)
- # set SIMOX vars according to VIRTUAL_ROBOT config
- SET(SIMOX_VISUALIZATION ${VIRTUAL_ROBOT_VISUALIZATION})
- SET(SIMOX_USE_COIN_VISUALIZATION ${VIRTUAL_ROBOT_USE_COIN_VISUALIZATION})
- SET(SIMOX_USE_OPENSCENEGRAPH_VISUALIZATION ${VIRTUAL_ROBOT_USE_OPENSCENEGRAPH_VISUALIZATION})
- SET(SIMOX_VISUALIZATION_LIBS ${VIRTUAL_ROBOT_VISUALIZATION_LIBS})
- SET(SIMOX_VISUALIZATION_INCLUDE_PATHS ${VIRTUAL_ROBOT_VISUALIZATION_INCLUDE_PATHS})
- SET(SIMOX_VISUALIZATION_COMPILE_FLAGS ${VIRTUAL_ROBOT_VISUALIZATION_COMPILE_FLAGS})
+ # set SIMOX vars according to VirtualRobot config
+ SET(Simox_VISUALIZATION ${VirtualRobot_VISUALIZATION})
+ SET(Simox_USE_COIN_VISUALIZATION ${VirtualRobot_USE_COIN_VISUALIZATION})
+ SET(Simox_USE_OPENSCENEGRAPH_VISUALIZATION ${VirtualRobot_USE_OPENSCENEGRAPH_VISUALIZATION})
+ SET(Simox_VISUALIZATION_LIBS ${VirtualRobot_VISUALIZATION_LIBS})
+ SET(Simox_VISUALIZATION_INCLUDE_PATHS ${VirtualRobot_VISUALIZATION_INCLUDE_PATHS})
+ SET(Simox_VISUALIZATION_COMPILE_FLAGS ${VirtualRobot_VISUALIZATION_COMPILE_FLAGS})
## SETUP SABA
# nothing to do yet
@@ -51,4 +51,4 @@ IF (NOT SIMOX_CONFIGURED)
# nothing to do yet
-ENDIF(NOT SIMOX_CONFIGURED)
+ENDIF(NOT Simox_CONFIGURED)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 1825c5a87c5634f51e3988de7cdca137cefa5354..e3ebc0b071cc112f1ae93fb20338b69e6fa5dcd9 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -31,14 +31,14 @@ IF(DOXYGEN_FOUND)
"${CMAKE_CURRENT_SOURCE_DIR}/../VirtualRobot")
# consider visualization setup
- IF (SIMOX_USE_COIN_VISUALIZATION)
+ IF (Simox_USE_COIN_VISUALIZATION)
SET (CMAKE_DOXYGEN_INPUT_LIST ${CMAKE_DOXYGEN_INPUT_LIST}
"${CMAKE_CURRENT_SOURCE_DIR}/../VirtualRobot/Visualization/CoinVisualization"
"${CMAKE_CURRENT_SOURCE_DIR}/../GraspPlanning/Visualization/CoinVisualization"
"${CMAKE_CURRENT_SOURCE_DIR}/../MotionPlanning/Visualization/CoinVisualization")
ENDIF()
- IF (SIMOX_USE_OPENSCENEGRAPH_VISUALIZATION)
+ IF (Simox_USE_OPENSCENEGRAPH_VISUALIZATION)
SET (CMAKE_DOXYGEN_INPUT_LIST ${CMAKE_DOXYGEN_INPUT_LIST}
"${CMAKE_CURRENT_SOURCE_DIR}/../VirtualRobot/Visualization/OSGVisualization")
ENDIF()
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 767647c0be7658ca0280b598efe4ed3235027250..ba43c30afdab07a285e83d94fea06c5242c4f96b 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -32,7 +32,7 @@ PROJECT_NAME = Simox
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = @SIMOX_VERSION@
+PROJECT_NUMBER = @Simox_VERSION@
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
diff --git a/doc/external_project_setup.txt b/doc/external_project_setup.txt
index 42baaa73256f70bdd31693bc2d066355e13bd0a8..97ffd242f6c9b4368bc4dd54c64095d4a97c2d99 100644
--- a/doc/external_project_setup.txt
+++ b/doc/external_project_setup.txt
@@ -12,7 +12,7 @@ CMAKE_POLICY(VERSION 2.6)
FIND_PACKAGE(Simox REQUIRED)
# Build only if Simox was created with Coin3D support.
-IF(SIMOX_USE_COIN_VISUALIZATION)
+IF(Simox_USE_COIN_VISUALIZATION)
FILE(GLOB SRCS ${PROJECT_SOURCE_DIR}/myDemo.cpp ${PROJECT_SOURCE_DIR}/myWindow.cpp)
FILE(GLOB INCS ${PROJECT_SOURCE_DIR}/myWindow.h)
set(GUI_MOC_HDRS ${PROJECT_SOURCE_DIR}/myWindow.h)