From b9f9cbdbf0cd17c57afd6e8bf713315beef078ba Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Thu, 7 May 2020 18:57:01 +0200 Subject: [PATCH] [CMake] fix PACKAGE_EXTRA_MACROS use --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7edd7fbe..cc7f6c99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,10 +15,6 @@ SET(PROJECT_USE_CMAKE_EXPORT TRUE) SET(CUSTOM_HEADER_DIR ${PROJECT_NAME}) SET(CXX_DISABLE_WERROR TRUE) SET(DOXYGEN_USE_MATHJAX YES) -SET(DYNAMIC_GRAPH_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}-plugins") -SET(PACKAGE_EXTRA_MACROS "set(DYNAMIC_GRAPH_PLUGINDIR ${DYNAMIC_GRAPH_PLUGINDIR})") -SET(PKG_CONFIG_EXTRA "plugindir=${DYNAMIC_GRAPH_PLUGINDIR}") -SET(CMAKE_INSTALL_RPATH "${DYNAMIC_GRAPH_PLUGINDIR}") # JRL-cmakemodule setup INCLUDE(cmake/base.cmake) @@ -141,6 +137,11 @@ ENDIF(SUFFIX_SO_VERSION) INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib) +SET(DYNAMIC_GRAPH_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}-plugins") +SET(PACKAGE_EXTRA_MACROS "set(DYNAMIC_GRAPH_PLUGINDIR ${DYNAMIC_GRAPH_PLUGINDIR})") +SET(PKG_CONFIG_EXTRA "plugindir=${DYNAMIC_GRAPH_PLUGINDIR}") +SET(CMAKE_INSTALL_RPATH "${DYNAMIC_GRAPH_PLUGINDIR}") + ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(tests) -- GitLab