Skip to content

Commit

Permalink
Prepare release v2.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-moulard committed Apr 9, 2013
1 parent a176f8b commit 1c1bc10
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cmake
Submodule cmake updated 4 files
+3 −3 doxygen.cmake
+20 −14 header.cmake
+1 −1 install-data.cmake
+1 −1 pkg-config.cmake
10 changes: 5 additions & 5 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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})

0 comments on commit 1c1bc10

Please sign in to comment.