From 1c1bc1029f7e4fabf35db82665c71c3bcf1691a4 Mon Sep 17 00:00:00 2001 From: Thomas Moulard Date: Tue, 9 Apr 2013 02:25:37 +0900 Subject: [PATCH] Prepare release v2.0. --- cmake | 2 +- src/CMakeLists.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake b/cmake index 321fd1467..8d534603e 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 321fd1467804d10d3f249811042228eb90fca341 +Subproject commit 8d534603ea0480eaaca0309eda1ea0ab1796a950 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ccf4fde1e..6f138def4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) # Define the directory where plug-ins will be installed. -SET(PLUGINDIR lib/${PROJECT_NAME}) +SET(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}) # Main library. ADD_LIBRARY(roboptim-core SHARED @@ -46,8 +46,8 @@ PKG_CONFIG_USE_DEPENDENCY(roboptim-core eigen3) PKG_CONFIG_USE_DEPENDENCY(roboptim-core liblog4cxx) TARGET_LINK_LIBRARIES(roboptim-core ltdl) -SET_TARGET_PROPERTIES(roboptim-core PROPERTIES SOVERSION 1.1.0) -INSTALL(TARGETS roboptim-core DESTINATION lib) +SET_TARGET_PROPERTIES(roboptim-core PROPERTIES SOVERSION 2.0.0) +INSTALL(TARGETS roboptim-core DESTINATION ${CMAKE_INSTALL_LIBDIR}) # Dummy plug-in. @@ -56,7 +56,7 @@ ADD_DEPENDENCIES(roboptim-core-plugin-dummy roboptim-core) TARGET_LINK_LIBRARIES(roboptim-core-plugin-dummy roboptim-core) SET_TARGET_PROPERTIES(roboptim-core-plugin-dummy PROPERTIES PREFIX "" - SOVERSION 1.1.0) + SOVERSION 2.0.0) INSTALL(TARGETS roboptim-core-plugin-dummy DESTINATION ${PLUGINDIR}) # Dummy-laststate plug-in. @@ -65,5 +65,5 @@ ADD_DEPENDENCIES(roboptim-core-plugin-dummy-laststate roboptim-core) TARGET_LINK_LIBRARIES(roboptim-core-plugin-dummy-laststate roboptim-core) SET_TARGET_PROPERTIES(roboptim-core-plugin-dummy-laststate PROPERTIES PREFIX "" - SOVERSION 1.1.0) + SOVERSION 2.0.0) INSTALL(TARGETS roboptim-core-plugin-dummy-laststate DESTINATION ${PLUGINDIR})