File tree Expand file tree Collapse file tree 2 files changed +4
-6
lines changed
Expand file tree Collapse file tree 2 files changed +4
-6
lines changed Original file line number Diff line number Diff line change 1919
2020CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
2121
22- #SET(CXX_DISABLE_WERROR TRUE)
2322INCLUDE (cmake/base.cmake)
2423INCLUDE (cmake/boost.cmake)
2524INCLUDE (cmake/cpack.cmake)
@@ -33,9 +32,6 @@ SET(PROJECT_URL "http://github.com/roboptim/roboptim-core-plugin-cminpack")
3332# Use MathJax for Doxygen formulae
3433SET (DOXYGEN_USE_MATHJAX "YES" )
3534
36- # Where to compile shared objects
37- SET (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR} /lib)
38-
3935SET (PKG_CONFIG_ADDITIONAL_VARIABLES plugindir ${PKG_CONFIG_ADDITIONAL_VARIABLES} )
4036SETUP_PROJECT()
4137
Original file line number Diff line number Diff line change 2020# Define the directory where plug-ins will be installed.
2121SET (PLUGIN_NAME ${PROJECT_NAME} )
2222
23- ADD_DEFINITIONS (-DPLUGIN_PATH="${LIBRARY_OUTPUT_PATH} " )
23+ # Define the directory where plug-ins will be installed.
24+ GET_FILENAME_COMPONENT (RELPLUGINDIR ${ROBOPTIM_CORE_PLUGINDIR} NAME )
25+ SET (PLUGINDIR ${CMAKE_INSTALL_LIBDIR} /${RELPLUGINDIR} )
2426
2527ADD_LIBRARY (${PLUGIN_NAME}
2628 MODULE
@@ -33,4 +35,4 @@ SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES
3335PKG_CONFIG_USE_DEPENDENCY(${PLUGIN_NAME} roboptim-core)
3436PKG_CONFIG_USE_DEPENDENCY(${PLUGIN_NAME} cminpack)
3537
36- INSTALL (TARGETS ${PLUGIN_NAME} DESTINATION ${ROBOPTIM_CORE_PLUGINDIR } )
38+ INSTALL (TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR } )
You can’t perform that action at this time.
0 commit comments