From fbc0225345d47e2b1592ebad63d4fc0ec86c60c4 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Thu, 30 Nov 2023 06:51:48 +0100 Subject: [PATCH] fix: revert to pre-4.x install path {prefix}/utf8cpp (see #112) This reverts the install path of the headers to the path that was used before the 4.x release series, unbreaking projects that were building against the library without using the CMake config files. --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ca50a6..63ea5b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required (VERSION 3.5...3.27) -project (utf8cpp +project (utf8cpp VERSION 4.0.1 LANGUAGES CXX DESCRIPTION "C++ portable library for working with utf-8 encoding") @@ -10,7 +10,7 @@ include(GNUInstallDirs) target_include_directories(utf8cpp INTERFACE "$" - $ + $ ) include(CMakePackageConfigHelpers) @@ -44,5 +44,6 @@ install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake) -install(FILES ${PROJECT_SOURCE_DIR}/source/utf8.h DESTINATION include) -install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/utf8 DESTINATION include) +install(FILES ${PROJECT_SOURCE_DIR}/source/utf8.h DESTINATION include/utf8cpp) +install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/utf8 DESTINATION + include/utf8cpp)