Skip to content

Commit

Permalink
Merge pull request #115 from mhx/mhx/fix-install
Browse files Browse the repository at this point in the history
fix: revert to pre-4.x install path {prefix}/utf8cpp (see #112)
  • Loading branch information
nemtrif authored Dec 3, 2023
2 parents b199c0d + fbc0225 commit bc36baf
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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")
Expand All @@ -10,7 +10,7 @@ include(GNUInstallDirs)

target_include_directories(utf8cpp INTERFACE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/source>"
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:include/utf8cpp>
)

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

0 comments on commit bc36baf

Please sign in to comment.