Skip to content

Commit

Permalink
Minor robustness updates CMake (#15)
Browse files Browse the repository at this point in the history
* Minor robustness updates CMake

* Bumping version
  • Loading branch information
tdegeus authored Dec 20, 2019
1 parent 7a29f48 commit be28091
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ include(GNUInstallDirs)

install(
FILES
"include/cppcolormap.h"
"${CMAKE_CURRENT_SOURCE_DIR}/include/cppcolormap.h"
DESTINATION
include)

Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion include/cppcolormap.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down

0 comments on commit be28091

Please sign in to comment.