diff --git a/CMakeLists.txt b/CMakeLists.txt index f6da9f02a39f99931742e46257d75bdbe76117a8..e39f88a6aafee4b7ab1c2a7427189480856ff9c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,15 +47,6 @@ set(Simox_EXECUTABLES "") # (this registers the build-tree with a global CMake-registry) EXPORT(PACKAGE Simox) -# Install the export set for use with the install-tree -#install( -# EXPORT SimoxLibraryDepends -# DESTINATION "${CMAKE_INSTALL_PREFIX}/share/Simox/cmake") - - -#get_property(VirtualRobot_external_INCLUDE_DIRS TARGET VirtualRobot PROPERTY EXTERNAL_INCLUDE_DIRS) -#message(STATUS "VirtualRobot_external_INCLUDE_DIRS: ${VirtualRobot_external_INCLUDE_DIRS}") - # import Virtual-Robot configs (build) SET (VirtualRobot_CONFIG_INBUILD "${Simox_BUILD_DIRECTORY}/VirtualRobotConfig.cmake") SET (VirtualRobot_CONFIG_INSTALL_LOCAL "${Simox_BUILD_DIRECTORY}/InstallFiles/VirtualRobotConfig.cmake") diff --git a/GraspPlanning/CMakeLists.txt b/GraspPlanning/CMakeLists.txt index 072afb2e36809d1ed381eb1d981e8a166b12fc0e..ed1215d279599acfeaa8cb7553e673d7b1fdad65 100644 --- a/GraspPlanning/CMakeLists.txt +++ b/GraspPlanning/CMakeLists.txt @@ -6,6 +6,7 @@ CMAKE_POLICY(VERSION 2.6) MESSAGE (STATUS "\n ***** CONFIGURING Simox project GraspStudio *****") INCLUDE (config.cmake) + ########### QHULL ################# OPTION(BUILD_qhull "if on builds qhull external library" ON) IF(BUILD_qhull) @@ -72,6 +73,23 @@ ADD_SUBDIRECTORY(examples/) # include unit tests #ADD_SUBDIRECTORY(tests/) +IF (NOT DEFINED Simox_VERSION) + set(GraspStudio_MAJOR_VERSION 2) + set(GraspStudio_MINOR_VERSION 1) + set(GraspStudio_PATCH_VERSION 3) +ELSE() + set(GraspStudio_MAJOR_VERSION ${SIMOX_MAJOR_VERSION}) + set(GraspStudio_MINOR_VERSION ${SIMOX_MINOR_VERSION}) + set(GraspStudio_PATCH_VERSION ${SIMOX_PATCH_VERSION}) +ENDIF() +set(GraspStudio_VERSION + ${GraspStudio_MAJOR_VERSION}.${GraspStudio_MINOR_VERSION}.${GraspStudio_PATCH_VERSION}) +set_target_properties( GraspStudio PROPERTIES + VERSION ${GraspStudio_VERSION} + SOVERSION ${GraspStudio_MAJOR_VERSION} + ) +MESSAGE(STATUS " * GraspStudio Version: ${GraspStudio_VERSION}") + # .DLL path SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${GRASPSTUDIO_BIN_DIR}) diff --git a/MotionPlanning/CMakeLists.txt b/MotionPlanning/CMakeLists.txt index 5987c698372e2ddd797e3e634cb1c3e802332c69..99b9ed41376ea9df35c1b13e093d7267d92e4841 100644 --- a/MotionPlanning/CMakeLists.txt +++ b/MotionPlanning/CMakeLists.txt @@ -11,6 +11,7 @@ INCLUDE (config.cmake) #MESSAGE(STATUS " Simox_BIN_DIR: ${Simox_BIN_DIR}") #MESSAGE ("Simox_USE_COIN_VISUALIZATION:${Simox_USE_COIN_VISUALIZATION}") + SET(SOURCES CSpace/CSpace.cpp CSpace/CSpaceSampled.cpp @@ -81,6 +82,24 @@ ADD_LIBRARY (Saba SHARED ${SOURCES} ${INCLUDES}) #MESSAGE("VirtualRobot_ROBOT_LINK_LIBRARIES:" ${VirtualRobot_EXTERNAL_LIBRARIES}) TARGET_LINK_LIBRARIES (Saba VirtualRobot ${VirtualRobot_EXTERNAL_LIBRARIES}) +IF (NOT DEFINED Simox_VERSION) + set(Saba_MAJOR_VERSION 2) + set(Saba_MINOR_VERSION 1) + set(Saba_PATCH_VERSION 3) +ELSE() + set(Saba_MAJOR_VERSION ${SIMOX_MAJOR_VERSION}) + set(Saba_MINOR_VERSION ${SIMOX_MINOR_VERSION}) + set(Saba_PATCH_VERSION ${SIMOX_PATCH_VERSION}) +ENDIF() +set(Saba_VERSION + ${Saba_MAJOR_VERSION}.${Saba_MINOR_VERSION}.${Saba_PATCH_VERSION}) +set_target_properties( Saba PROPERTIES + VERSION ${Saba_VERSION} + SOVERSION ${Saba_MAJOR_VERSION} + ) +MESSAGE(STATUS " * Saba Version: ${Saba_VERSION}") + + # .DLL path SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SABA_BIN_DIR}) # .so path diff --git a/VirtualRobot/CMakeLists.txt b/VirtualRobot/CMakeLists.txt index 259af1fcd15f867e616342196cd1f2de62f08286..33c03ad60236bdeda9849d9b68ce35156420dcf9 100644 --- a/VirtualRobot/CMakeLists.txt +++ b/VirtualRobot/CMakeLists.txt @@ -249,12 +249,22 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${Virt ############################################ MESSAGE(STATUS " * Generating CMake files") - -set(VirtualRobot_MAJOR_VERSION 2) -set(VirtualRobot_MINOR_VERSION 1) -set(VirtualRobot_PATCH_VERSION 3) +IF (NOT DEFINED Simox_VERSION) + set(VirtualRobot_MAJOR_VERSION 2) + set(VirtualRobot_MINOR_VERSION 1) + set(VirtualRobot_PATCH_VERSION 3) +ELSE() + set(VirtualRobot_MAJOR_VERSION ${SIMOX_MAJOR_VERSION}) + set(VirtualRobot_MINOR_VERSION ${SIMOX_MINOR_VERSION}) + set(VirtualRobot_PATCH_VERSION ${SIMOX_PATCH_VERSION}) +ENDIF() set(VirtualRobot_VERSION ${VirtualRobot_MAJOR_VERSION}.${VirtualRobot_MINOR_VERSION}.${VirtualRobot_PATCH_VERSION}) +set_target_properties( VirtualRobot PROPERTIES + VERSION ${VirtualRobot_VERSION} + SOVERSION ${VirtualRobot_MAJOR_VERSION} + ) +MESSAGE(STATUS " * VirtualRobot Version: ${VirtualRobot_VERSION}") set(VirtualRobot_LIBRARIES VirtualRobot) set(VirtualRobot_EXECUTABLES "") @@ -263,7 +273,6 @@ set(VirtualRobot_EXECUTABLES "") # (this registers the build-tree with a global CMake-registry) 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}") diff --git a/VirtualRobot/RuntimeEnvironment.cpp b/VirtualRobot/RuntimeEnvironment.cpp index c079f6e2350607d4aab1e7c8ac5437797fd8eeab..63d64cd1c62d886255e4616c34696443f5b1b206 100644 --- a/VirtualRobot/RuntimeEnvironment.cpp +++ b/VirtualRobot/RuntimeEnvironment.cpp @@ -65,6 +65,12 @@ namespace VirtualRobot #ifdef VIRTUAL_ROBOT_DATA_PATH pathFound = pathFound | addDataPath(std::string(VIRTUAL_ROBOT_DATA_PATH),true); #endif + // check stnadard linux install path + if (!pathFound) + { + pathFound = addDataPath(std::string("/usr/local/data"),true); + } + // last chance, check for inbuild paths if (!pathFound) {