Commit 9495b282 authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

Fix CMakeLists.txt

  Do not define CUSTOM_HEADER_DIR twice
  do not hardcode installation directories
    lib -> ${CMAKE_INSTALL_LIBDIR},
    bin -> ${CMAKE_INSTALL_BINDIR}.
parent bc853bbb
......@@ -19,7 +19,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
SET(CXX_DISABLE_WERROR true)
SET(CUSTOM_HEADER_DIR "hpp/wholebody-step-corba")
INCLUDE(cmake/base.cmake)
INCLUDE(cmake/cpack.cmake)
......
......@@ -40,7 +40,7 @@ PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-wholebody-step-planner)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-template-corba)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-util)
INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION lib)
INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
# search for python
FINDPYTHON()
......@@ -101,6 +101,6 @@ PKG_CONFIG_USE_DEPENDENCY(hpp-wholebody-step-server hpp-template-corba)
PKG_CONFIG_USE_DEPENDENCY(hpp-wholebody-step-server hpp-util)
KINEO_STANDALONE(hpp-wholebody-step-server)
INSTALL (TARGETS hpp-wholebody-step-server DESTINATION bin)
INSTALL (TARGETS hpp-wholebody-step-server DESTINATION ${CMAKE_INSTALL_BINDIR})
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/hpp-wholebody-step-server.kab
DESTINATION bin)
DESTINATION ${CMAKE_INSTALL_BINDIR})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment