Skip to content
Snippets Groups Projects
Commit e34cdaee authored by Mederic Fourmy's avatar Mederic Fourmy
Browse files

Remove set(CMAKE_INSTALL_PREFIX ...), fix little syntax error, clean commented code

parent c42209e1
No related branches found
No related tags found
2 merge requests!451After cmake and const refactor,!445Resolve "Refactoring WOLF installation system"
Pipeline #10088 failed
......@@ -12,9 +12,6 @@ endif(COMMAND cmake_policy)
# MAC OSX RPATH
SET(CMAKE_MACOSX_RPATH 1)
# install prefix
SET(CMAKE_INSTALL_PREFIX /usr/local)
# The project name
PROJECT(core)
set(PLUGIN_NAME "wolf${PROJECT_NAME}")
......@@ -26,7 +23,7 @@ SET(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY FALSE)
SET(LIB_INSTALL_DIR lib)
# plugin_core is not really needed, why was it used in the first place?
#SET(INCLUDE_INSTALL_DIR "include/iri-algorithms/wolf/plugin_${PROJECT_NAME}")
SET(INCLUDE_INSTALL_DIR "include/iri-algorithms/wolf")
SET(INCLUDE_INSTALL_DIR include/iri-algorithms/wolf)
message("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
message("LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}")
message("INCLUDE_INSTALL_DIR: ${INCLUDE_INSTALL_DIR}")
......@@ -457,7 +454,7 @@ ENDIF(BUILD_DEMOS)
INSTALL(TARGETS ${PLUGIN_NAME} EXPORT ${PLUGIN_NAME}Targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
)
install(EXPORT ${PLUGIN_NAME}Targets DESTINATION lib/${PLUGIN_NAME}/cmake)
......@@ -528,22 +525,6 @@ INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h"
DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/internal)
# configure_file("${CMAKE_SOURCE_DIR}/cmake_modules/${PLUGIN_NAME}Config.cmake"
# "${CMAKE_BINARY_DIR}/${PLUGIN_NAME}Config.cmake" @ONLY)
#install Find*.cmake
# configure_file("${CMAKE_SOURCE_DIR}/cmake_modules/${PLUGIN_NAME}Config.cmake"
# "${CMAKE_BINARY_DIR}/${PLUGIN_NAME}Config.cmake" @ONLY)
# configure_file("${CMAKE_SOURCE_DIR}/cmake_modules/FindYamlCpp.cmake"
# "${CMAKE_BINARY_DIR}/FindYamlCpp.cmake" @ONLY)
# INSTALL(FILES "${CMAKE_BINARY_DIR}/${PLUGIN_NAME}Config.cmake" DESTINATION "lib/cmake/${PLUGIN_NAME}")
# INSTALL(FILES "${CMAKE_BINARY_DIR}/FindYamlCpp.cmake" DESTINATION "lib/cmake/${PLUGIN_NAME}")
INSTALL(DIRECTORY ${SPDLOG_INCLUDE_DIRS} DESTINATION "include/iri-algorithms/")
export(PACKAGE ${PLUGIN_NAME})
......
......@@ -17,5 +17,4 @@ FIND_DEPENDENCY(yaml-cpp REQUIRED)
include("${CMAKE_CURRENT_LIST_DIR}/wolfcoreTargets.cmake")
check_required_components(@PLUGIN_NAME@)
\ No newline at end of file
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