From 357b1e258ecb8db92fdebba43319690f01a60fa3 Mon Sep 17 00:00:00 2001 From: fundawang Date: Sat, 23 Aug 2025 09:29:22 +0800 Subject: [PATCH 1/2] use GNUInstallDirs for installation --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b79e5b5c2..ad9d78cb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ cmake_minimum_required(VERSION 3.5) set (PACKAGE_NAME opencc) project (${PACKAGE_NAME} CXX) include (CTest) +include (GNUInstallDirs) ######## Options option(BUILD_DOCUMENTATION "Use Doxygen to create the HTML based API documentation" OFF) @@ -79,10 +80,10 @@ endif() ######## Directory set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX}) -set (DIR_INCLUDE ${DIR_PREFIX}/include) -set (DIR_SHARE ${DIR_PREFIX}/share) -set (DIR_ETC ${DIR_PREFIX}/etc) -set (DIR_LIBRARY ${DIR_PREFIX}/lib${LIB_SUFFIX}) +set (DIR_INCLUDE ${CMAKE_INSTALL_INCLUDEDIR}) +set (DIR_SHARE ${CMAKE_INSTALL_DATAROOTDIR}) +set (DIR_ETC ${CMAKE_INSTALL_SYSCONFDIR}) +set (DIR_LIBRARY ${CMAKE_INSTALL_FULL_LIBDIR}) if (DEFINED SHARE_INSTALL_PREFIX) set (DIR_SHARE ${SHARE_INSTALL_PREFIX}) From 3f22464e5b84f9288f95299d6815ae649efdc703 Mon Sep 17 00:00:00 2001 From: fundawang Date: Sat, 23 Aug 2025 09:33:51 +0800 Subject: [PATCH 2/2] use Full dir for include --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad9d78cb4..c7e4b0b5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,7 @@ endif() ######## Directory set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX}) -set (DIR_INCLUDE ${CMAKE_INSTALL_INCLUDEDIR}) +set (DIR_INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR}) set (DIR_SHARE ${CMAKE_INSTALL_DATAROOTDIR}) set (DIR_ETC ${CMAKE_INSTALL_SYSCONFDIR}) set (DIR_LIBRARY ${CMAKE_INSTALL_FULL_LIBDIR})