From be2809166d70152f4607af4eaabf5cf17532de92 Mon Sep 17 00:00:00 2001 From: Tom de Geus Date: Fri, 20 Dec 2019 17:37:04 +0100 Subject: [PATCH] Minor robustness updates CMake (#15) * Minor robustness updates CMake * Bumping version --- CMakeLists.txt | 6 +++--- include/cppcolormap.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9b8117..5f9980b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ include(GNUInstallDirs) install( FILES - "include/cppcolormap.h" + "${CMAKE_CURRENT_SOURCE_DIR}/include/cppcolormap.h" DESTINATION include) @@ -80,13 +80,13 @@ set(CMAKE_SIZEOF_VOID_P ${_CPPCOLORMAP}) install( FILES - cppcolormapConfig.cmake + "${CMAKE_CURRENT_SOURCE_DIR}/cppcolormapConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cppcolormapConfigVersion.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cppcolormap") configure_file( - "cppcolormap.pc.in" + "${CMAKE_CURRENT_SOURCE_DIR}/cppcolormap.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/cppcolormap.pc" @ONLY) diff --git a/include/cppcolormap.h b/include/cppcolormap.h index 5e7b0d5..570af43 100644 --- a/include/cppcolormap.h +++ b/include/cppcolormap.h @@ -9,7 +9,7 @@ #define CPPCOLORMAP_VERSION_MAJOR 1 #define CPPCOLORMAP_VERSION_MINOR 1 -#define CPPCOLORMAP_VERSION_PATCH 0 +#define CPPCOLORMAP_VERSION_PATCH 1 #define CPPCOLORMAP_VERSION_AT_LEAST(x,y,z) \ (CPPCOLORMAP_VERSION_MAJOR>x || (CPPCOLORMAP_VERSION_MAJOR>=x && \