Skip to content
Snippets Groups Projects
Commit 13e3a53a authored by vahrenkamp's avatar vahrenkamp
Browse files

Version 2.1.6

git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@344 042f3d55-54a8-47e9-b7fb-15903f145c44
parent ba113591
No related branches found
No related tags found
No related merge requests found
......@@ -34,7 +34,7 @@ MESSAGE (STATUS "\n ***** Simox: Generating CMake files for build and install se
set(Simox_MAJOR_VERSION 2)
set(Simox_MINOR_VERSION 1)
set(Simox_PATCH_VERSION 5)
set(Simox_PATCH_VERSION 6)
set(Simox_VERSION
${Simox_MAJOR_VERSION}.${Simox_MINOR_VERSION}.${Simox_PATCH_VERSION})
......
......@@ -76,7 +76,7 @@ ADD_SUBDIRECTORY(examples/)
IF (NOT DEFINED Simox_VERSION)
set(GraspStudio_MAJOR_VERSION 2)
set(GraspStudio_MINOR_VERSION 1)
set(GraspStudio_PATCH_VERSION 5)
set(GraspStudio_PATCH_VERSION 6)
ELSE()
set(GraspStudio_MAJOR_VERSION ${Simox_MAJOR_VERSION})
set(GraspStudio_MINOR_VERSION ${Simox_MINOR_VERSION})
......
......@@ -85,7 +85,7 @@ 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 5)
set(Saba_PATCH_VERSION 6)
ELSE()
set(Saba_MAJOR_VERSION ${Simox_MAJOR_VERSION})
set(Saba_MINOR_VERSION ${Simox_MINOR_VERSION})
......
......@@ -97,6 +97,24 @@ if (SimDynamics_DYNAMICSENGINE)
ADD_SUBDIRECTORY(DynamicsEngine/BulletEngine/tests/)
endif()
IF (NOT DEFINED Simox_VERSION)
set(SimDynamics_MAJOR_VERSION 2)
set(SimDynamics_MINOR_VERSION 1)
set(SimDynamics_PATCH_VERSION 6)
ELSE()
set(SimDynamics_MAJOR_VERSION ${Simox_MAJOR_VERSION})
set(SimDynamics_MINOR_VERSION ${Simox_MINOR_VERSION})
set(SimDynamics_PATCH_VERSION ${Simox_PATCH_VERSION})
ENDIF()
set(SimDynamics_VERSION
${SimDynamics_MAJOR_VERSION}.${SimDynamics_MINOR_VERSION}.${SimDynamics_PATCH_VERSION})
set_target_properties( SimDynamics PROPERTIES
VERSION ${SimDynamics_VERSION}
SOVERSION ${SimDynamics_MAJOR_VERSION}
)
MESSAGE(STATUS " * SimDynamics Version: ${SimDynamics_VERSION}")
# .DLL path
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SimDynamics_BIN_DIR})
# .so path
......@@ -120,4 +138,4 @@ if (SimDynamics_DYNAMICSENGINE)
PATTERN "examples" EXCLUDE)
else()
MESSAGE ("Not building SimDynamics, physics engine not found...")
endif()
\ No newline at end of file
endif()
......@@ -256,7 +256,7 @@ MESSAGE(STATUS " * Generating CMake files")
IF (NOT DEFINED Simox_VERSION)
set(VirtualRobot_MAJOR_VERSION 2)
set(VirtualRobot_MINOR_VERSION 1)
set(VirtualRobot_PATCH_VERSION 5)
set(VirtualRobot_PATCH_VERSION 6)
ELSE()
set(VirtualRobot_MAJOR_VERSION ${SIMOX_MAJOR_VERSION})
set(VirtualRobot_MINOR_VERSION ${SIMOX_MINOR_VERSION})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment