Skip to content

Commit 03122db

Browse files
author
Benjamin Chrétien
committed
Fix CMakeLists.txt
1 parent 8e657e6 commit 03122db

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
2121

22-
#SET(CXX_DISABLE_WERROR TRUE)
2322
INCLUDE(cmake/base.cmake)
2423
INCLUDE(cmake/boost.cmake)
2524
INCLUDE(cmake/cpack.cmake)
@@ -33,9 +32,6 @@ SET(PROJECT_URL "http://github.com/roboptim/roboptim-core-plugin-cminpack")
3332
# Use MathJax for Doxygen formulae
3433
SET(DOXYGEN_USE_MATHJAX "YES")
3534

36-
# Where to compile shared objects
37-
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
38-
3935
SET(PKG_CONFIG_ADDITIONAL_VARIABLES plugindir ${PKG_CONFIG_ADDITIONAL_VARIABLES})
4036
SETUP_PROJECT()
4137

src/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
# Define the directory where plug-ins will be installed.
2121
SET(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

2527
ADD_LIBRARY(${PLUGIN_NAME}
2628
MODULE
@@ -33,4 +35,4 @@ SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES
3335
PKG_CONFIG_USE_DEPENDENCY(${PLUGIN_NAME} roboptim-core)
3436
PKG_CONFIG_USE_DEPENDENCY(${PLUGIN_NAME} cminpack)
3537

36-
INSTALL(TARGETS ${PLUGIN_NAME} DESTINATION ${ROBOPTIM_CORE_PLUGINDIR})
38+
INSTALL(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR})

0 commit comments

Comments
 (0)