Skip to content

Commit f1b9bce

Browse files
committed
Adjust project name to match package name. Include version file in installer with semver compatibility.
1 parent 542564a commit f1b9bce

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

CMakeLists.txt

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
#######################################################
44
# Project information
55
cmake_minimum_required(VERSION 3.14)
6-
project(matplotplusplus VERSION 1.1.0)
7-
set(CMAKE_CXX_STANDARD 17)
8-
set(CMAKE_C_STANDARD 11)
6+
project(Matplot++ VERSION 1.1.0)
97
set(MATPLOT_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
108
set(MATPLOT_VERSION ${CMAKE_PROJECT_VERSION})
119

@@ -130,16 +128,22 @@ if (BUILD_INSTALLER)
130128
write_basic_package_version_file(
131129
Matplot++ConfigVersion.cmake
132130
VERSION ${PACKAGE_VERSION}
133-
COMPATIBILITY AnyNewerVersion
131+
COMPATIBILITY SameMajorVersion
134132
)
135133

136-
# Create matplot++-config.cmake from matplot++-config.cmake.in
137-
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/matplot++-config.cmake.in
138-
${CMAKE_CURRENT_BINARY_DIR}/matplot++-config.cmake
139-
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Matplot++)
134+
# Install the file Matplot++ConfigVersion.cmake
135+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Matplot++ConfigVersion.cmake
136+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Matplot++)
137+
138+
# Create Matplot++Config.cmake from Matplot++Config.cmake.in
139+
configure_package_config_file(
140+
${CMAKE_CURRENT_SOURCE_DIR}/Matplot++Config.cmake.in # input file
141+
${CMAKE_CURRENT_BINARY_DIR}/Matplot++Config.cmake # output file
142+
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Matplot++
143+
)
140144

141-
# Install the file matplot++-config.cmake
142-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/matplot++-config.cmake
145+
# Install the file Matplot++Config.cmake
146+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Matplot++Config.cmake
143147
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Matplot++)
144148

145149
# Install cmake to find filesystem as a dependency

0 commit comments

Comments
 (0)