From 5dfcd18adbb8a7dea55acea4db3e4f20ad3529c0 Mon Sep 17 00:00:00 2001 From: Florent Pruvost <florent.pruvost@inria.fr> Date: Mon, 14 Dec 2020 15:25:10 +0100 Subject: [PATCH] take into account mathieu's remarks --- CMakeLists.txt | 3 +-- cmake_modules/GenHQRPkgConfig.cmake | 3 +-- src/CMakeLists.txt | 4 ++-- src/HQRConfig.cmake.in | 10 +--------- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f658167..965e843 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,7 @@ ### # -# @copyright 2017-2019 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, +# @copyright 2017-2020 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, # Univ. Bordeaux. All rights reserved. -# @copyright 2020 Inria. All rights reserved. # # @version 0.1.0 # @author Mathieu Faverge diff --git a/cmake_modules/GenHQRPkgConfig.cmake b/cmake_modules/GenHQRPkgConfig.cmake index 54b7749..135aaef 100644 --- a/cmake_modules/GenHQRPkgConfig.cmake +++ b/cmake_modules/GenHQRPkgConfig.cmake @@ -1,7 +1,6 @@ ### # -# @copyright (c) 2012-2017 Inria. All rights reserved. -# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. +# @copyright (c) 2012-2020 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. # ### # diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index baeec1c..cea2dd5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,7 @@ ### # -# @copyright 2017-2019 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, +# @copyright 2017-2020 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, # Univ. Bordeaux. All rights reserved. -# @copyright 2020 Inria. All rights reserved. # # @version 0.1.0 # @author Mathieu Faverge @@ -18,6 +17,7 @@ set(HEADER_LIST ${HQR_SOURCE_DIR}/include/libhqr_internal.h ${HQR_SOURCE_DIR}/include/libhqr_queue.h ) + set(SOURCE_LIST # Low level tree functions low_flat.c diff --git a/src/HQRConfig.cmake.in b/src/HQRConfig.cmake.in index 9362904..36a8baa 100644 --- a/src/HQRConfig.cmake.in +++ b/src/HQRConfig.cmake.in @@ -8,13 +8,5 @@ set_and_check(HQR_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@") check_required_components(HQR) - -# This commented material could be useful later -#include(CMakeFindDependencyMacro) -# Same syntax as find_package -#find_dependency(MYDEP REQUIRED) - -# Any extra setup - # Add the targets file -include("${CMAKE_CURRENT_LIST_DIR}/HQRTargets.cmake") \ No newline at end of file +include("${CMAKE_CURRENT_LIST_DIR}/HQRTargets.cmake") -- GitLab