From 6a74422d7b3473fb075d7f8dee2641095d9abe04 Mon Sep 17 00:00:00 2001 From: Joaquim Casals <jcasals@iri.upc.edu> Date: Fri, 7 Jun 2019 15:51:26 +0200 Subject: [PATCH] Not so quick fix to ship FindYamlCpp.cmake with wolf --- CMakeLists.txt | 4 ++++ cmake_modules/wolfConfig.cmake | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8987e7b7f..5765ab7ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -523,10 +523,14 @@ INSTALL(FILES ${PROJECT_NAME}.found configure_file("${CMAKE_SOURCE_DIR}/cmake_modules/wolfConfig.cmake" "${CMAKE_BINARY_DIR}/wolfConfig.cmake" @ONLY) +configure_file("${CMAKE_SOURCE_DIR}/cmake_modules/FindYamlCpp.cmake" + "${CMAKE_BINARY_DIR}/FindYamlCpp.cmake" @ONLY) + INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h" DESTINATION include/iri-algorithms/wolf/plugin_core/core/internal) INSTALL(FILES "${CMAKE_BINARY_DIR}/wolfConfig.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}") +INSTALL(FILES "${CMAKE_BINARY_DIR}/FindYamlCpp.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}") INSTALL(DIRECTORY ${SPDLOG_INCLUDE_DIRS} DESTINATION "include/iri-algorithms/") diff --git a/cmake_modules/wolfConfig.cmake b/cmake_modules/wolfConfig.cmake index e895c1e76..f370972f1 100644 --- a/cmake_modules/wolfConfig.cmake +++ b/cmake_modules/wolfConfig.cmake @@ -69,6 +69,12 @@ set(wolf_FOUND TRUE) # FIND_PACKAGE(Eigen3 3.2.92 REQUIRED) # list(APPEND wolf_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}) +get_filename_component(WOLF_CURRENT_CONFIG_DIR + "${CMAKE_CURRENT_LIST_FILE}" PATH) + +SET(BACKUP_MODULE_PATH ${CMAKE_MODULE_PATH}) +LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${WOLF_CURRENT_CONFIG_DIR}) + FIND_PACKAGE(Threads REQUIRED) list(APPEND wolf_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) @@ -80,3 +86,5 @@ list(APPEND wolf_LIBRARIES ${CERES_LIBRARIES}) FIND_PACKAGE(YamlCpp REQUIRED) list(APPEND wolf_INCLUDE_DIRS ${YAMLCPP_INCLUDE_DIRS}) list(APPEND wolf_LIBRARIES ${YAMLCPP_LIBRARY}) + +SET(CMAKE_MODULE_PATH ${BACKUP_MODULE_PATH}) \ No newline at end of file -- GitLab