Skip to content
Snippets Groups Projects
Commit b2154ea1 authored by Jeremie Deray's avatar Jeremie Deray
Browse files

ff fix paths

parent 4827aa32
No related branches found
No related tags found
1 merge request!91catkin build
# Pre-requisites about cmake itself # Pre-requisites about cmake itself
CMAKE_MINIMUM_REQUIRED(VERSION 2.6) CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
...@@ -10,14 +9,18 @@ endif(COMMAND cmake_policy) ...@@ -10,14 +9,18 @@ endif(COMMAND cmake_policy)
SET(CMAKE_MACOSX_RPATH 1) SET(CMAKE_MACOSX_RPATH 1)
# The project name and the type of project # The project name
PROJECT(wolf) PROJECT(wolf)
# EXECUTABLE_OUTPUT_PATH & LIBRARY_OUTPUT_PATH are
# supercede by LIBRARY_OUTPUT_DIRECTORY & RUNTIME_OUTPUT_DIRECTORY string(COMPARE EQUAL "${CMAKE_BINARY_DIR}" "" result)
# which are properly set by catkin IF(result)
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin) SET(CMAKE_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR})
SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib) ENDIF()
message(STATUS "Binary path : " ${CMAKE_BINARY_DIR})
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
# We'll set the install prefix only is it's empty # We'll set the install prefix only is it's empty
# which shouldn't be the case ... # which shouldn't be the case ...
...@@ -25,9 +28,8 @@ string(COMPARE EQUAL "${CMAKE_INSTALL_PREFIX}" "" result) ...@@ -25,9 +28,8 @@ string(COMPARE EQUAL "${CMAKE_INSTALL_PREFIX}" "" result)
IF(result) IF(result)
# This path is actually default on linux # This path is actually default on linux
SET(CMAKE_INSTALL_PREFIX /usr/local) SET(CMAKE_INSTALL_PREFIX /usr/local)
else()
message(STATUS "Installation path : " ${CMAKE_INSTALL_PREFIX})
ENDIF() ENDIF()
message(STATUS "Installation path : " ${CMAKE_INSTALL_PREFIX})
IF (NOT CMAKE_BUILD_TYPE) IF (NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "DEBUG") SET(CMAKE_BUILD_TYPE "DEBUG")
......
...@@ -395,7 +395,8 @@ INSTALL(FILES ${HDRS_WRAPPER} ...@@ -395,7 +395,8 @@ INSTALL(FILES ${HDRS_WRAPPER}
INSTALL(FILES ${HDRS_SOLVER} INSTALL(FILES ${HDRS_SOLVER}
DESTINATION include/iri-algorithms/wolf/solver) DESTINATION include/iri-algorithms/wolf/solver)
INSTALL(FILES ../cmake_modules/Findwolf.cmake DESTINATION "lib/cmake/${PROJECT_NAME}") INSTALL(FILES "${CMAKE_SOURCE_DIR}/cmake_modules/Findwolf.cmake"
DESTINATION "lib/cmake/${PROJECT_NAME}")
#install Find*.cmake #install Find*.cmake
configure_file("${CMAKE_SOURCE_DIR}/cmake_modules/wolfConfig.cmake" configure_file("${CMAKE_SOURCE_DIR}/cmake_modules/wolfConfig.cmake"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment