Skip to content

Commit

Permalink
Fix CMakeLists.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin Chrétien committed Jul 29, 2015
1 parent 8e657e6 commit 03122db
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

CMAKE_MINIMUM_REQUIRED(VERSION 2.8)

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

# Where to compile shared objects
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)

SET(PKG_CONFIG_ADDITIONAL_VARIABLES plugindir ${PKG_CONFIG_ADDITIONAL_VARIABLES})
SETUP_PROJECT()

Expand Down
6 changes: 4 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
# Define the directory where plug-ins will be installed.
SET(PLUGIN_NAME ${PROJECT_NAME})

ADD_DEFINITIONS(-DPLUGIN_PATH="${LIBRARY_OUTPUT_PATH}")
# Define the directory where plug-ins will be installed.
GET_FILENAME_COMPONENT(RELPLUGINDIR ${ROBOPTIM_CORE_PLUGINDIR} NAME)
SET(PLUGINDIR ${CMAKE_INSTALL_LIBDIR}/${RELPLUGINDIR})

ADD_LIBRARY(${PLUGIN_NAME}
MODULE
Expand All @@ -33,4 +35,4 @@ SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES
PKG_CONFIG_USE_DEPENDENCY(${PLUGIN_NAME} roboptim-core)
PKG_CONFIG_USE_DEPENDENCY(${PLUGIN_NAME} cminpack)

INSTALL(TARGETS ${PLUGIN_NAME} DESTINATION ${ROBOPTIM_CORE_PLUGINDIR})
INSTALL(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINDIR})

0 comments on commit 03122db

Please sign in to comment.