From 1f6c1dfb8527cfadbce1c786708e9844d38209d1 Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco Claraco Date: Sun, 22 Dec 2019 17:09:50 +0100 Subject: [PATCH] More consistent (not) use of CMAKE_INSTALL_PREFIX. --- cmake/GtsamMakeConfigFile.cmake | 2 +- gtsam/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/GtsamMakeConfigFile.cmake b/cmake/GtsamMakeConfigFile.cmake index 2fff888ef..0479a2524 100644 --- a/cmake/GtsamMakeConfigFile.cmake +++ b/cmake/GtsamMakeConfigFile.cmake @@ -15,7 +15,7 @@ function(GtsamMakeConfigFile PACKAGE_NAME) get_filename_component(name "${ARGV1}" NAME_WE) set(EXTRA_FILE "${name}.cmake") configure_file(${ARGV1} "${PROJECT_BINARY_DIR}/${EXTRA_FILE}" @ONLY) - install(FILES "${PROJECT_BINARY_DIR}/${EXTRA_FILE}" DESTINATION "${CMAKE_INSTALL_PREFIX}/${DEF_INSTALL_CMAKE_DIR}") + install(FILES "${PROJECT_BINARY_DIR}/${EXTRA_FILE}" DESTINATION "${DEF_INSTALL_CMAKE_DIR}") else() set(EXTRA_FILE "_does_not_exist_") endif() diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index 48bb14f1b..1079b845f 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -153,7 +153,7 @@ if(GTSAM_SUPPORT_NESTED_DISSECTION) $ $ $ - $ + $ ) endif()