diff --git a/CMakeLists.txt b/CMakeLists.txt index ae43099be756af7fb3daffad7342f3a16c000a9a..25ddbfc6fadf007e82d5cb756bab36e586f3589f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,11 +19,6 @@ SET(CXX_DISABLE_WERROR TRUE) SET(DOXYGEN_USE_MATHJAX YES) SET(DOXYGEN_USE_TEMPLATE_CSS YES) -SET(DYNAMIC_GRAPH_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}-plugins") -SET(PACKAGE_EXTRA_MACROS "set(DYNAMIC_GRAPH_PLUGINDIR ${DYNAMIC_GRAPH_PLUGINDIR})") -SET(PKG_CONFIG_EXTRA "plugindir=${DYNAMIC_GRAPH_PLUGINDIR}") -SET(CMAKE_INSTALL_RPATH "${DYNAMIC_GRAPH_PLUGINDIR}") - # JRL-cmakemodule setup INCLUDE(cmake/base.cmake) INCLUDE(cmake/boost.cmake) @@ -145,6 +140,12 @@ ENDIF(SUFFIX_SO_VERSION) INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib) + +SET(DYNAMIC_GRAPH_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}-plugins") +SET(PACKAGE_EXTRA_MACROS "set(DYNAMIC_GRAPH_PLUGINDIR ${DYNAMIC_GRAPH_PLUGINDIR})") +SET(PKG_CONFIG_EXTRA "plugindir=${DYNAMIC_GRAPH_PLUGINDIR}") +SET(CMAKE_INSTALL_RPATH "${DYNAMIC_GRAPH_PLUGINDIR}") + ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(tests) diff --git a/cmake b/cmake index 321eb1ccf1d94570eb564f3659b13ef3ef82239e..72cf8cdefcf8cde818745ad7998122bde0b54734 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 321eb1ccf1d94570eb564f3659b13ef3ef82239e +Subproject commit 72cf8cdefcf8cde818745ad7998122bde0b54734 diff --git a/package.xml b/package.xml index 6d6d0033a3b00d99bd0c65d9889fd8c39da47039..cc41fbc2840eec21516d1dcdf47ffaf0abc7bead 100644 --- a/package.xml +++ b/package.xml @@ -1,6 +1,6 @@ <package format="2"> <name>dynamic-graph</name> - <version>4.0.0</version> + <version>4.1.0</version> <description> Dynamic graph library </description>