Skip to content

Use idiomatic GNUInstallDirs for all install paths; fix pkg-config and relocatability #1063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BYVoid merged 8 commits into from
Mar 25, 2026
Merged

Use idiomatic GNUInstallDirs for all install paths; fix pkg-config and relocatability #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
43c0ffb
Initial plan
Copilot Mar 25, 2026
d02e583
Refactor CMakeLists directory settings to use GNUInstallDirs variables
Copilot Mar 25, 2026
863d33c
Add GNUInstallDirs docs link and parity comments to CMakeLists.txt
Copilot Mar 25, 2026
31771ff
Address all reviewer concerns: consistent relative DIR_*, restore LIB…
Copilot Mar 25, 2026
a382ca8
Derive DIR_SHARE_OPENCC_FULL/LOCALE_FULL from existing derived vars; …
Copilot Mar 25, 2026
876c024
Remove unused DIR_SHARE_LOCALE and DIR_SHARE_LOCALE_FULL variables
Copilot Mar 25, 2026
4e129b1
Use DIR_SHARE_LOCALE_FULL variable for LOCALEDIR consistency
BYVoid Mar 25, 2026
9fbb3fb
Remove unused DIR_SHARE_LOCALE variable
BYVoid Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 42 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,33 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
endif()

######## Directory
# Installation directories follow GNU Coding Standards via CMake's GNUInstallDirs module:
# https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
#
# Default values and parity with previously hardcoded paths
# (shown for CMAKE_INSTALL_PREFIX=/usr/local and /usr):
#
# CMAKE_INSTALL_INCLUDEDIR "include" -> /usr/local/include or /usr/include
# (replaces: ${CMAKE_INSTALL_PREFIX}/include)
#
# CMAKE_INSTALL_SYSCONFDIR "etc" -> /usr/local/etc or /etc
# (replaces: ${CMAKE_INSTALL_PREFIX}/etc)
# NOTE: when prefix is /usr the full path is /etc per GNU Coding Standards,
# whereas the old code would have produced /usr/etc.
#
# CMAKE_INSTALL_LIBDIR "lib" -> /usr/local/lib or /usr/lib
# (also resolves to lib64 or lib/<multiarch> on applicable platforms)
# (replaces: ${CMAKE_INSTALL_PREFIX}/lib[64])
#
# CMAKE_INSTALL_DATAROOTDIR "share" -> /usr/local/share or /usr/share
# (replaces: ${CMAKE_INSTALL_PREFIX}/share)

set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "")
if(CMAKE_INSTALL_LIBDIR MATCHES "lib64$")
set(LIB_SUFFIX 64)
endif()

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})
# All DIR_* variables use relative paths so that install() destinations and
# CMake package config files remain relocatable.
set (DIR_INCLUDE ${CMAKE_INSTALL_INCLUDEDIR})
set (DIR_ETC ${CMAKE_INSTALL_SYSCONFDIR})
set (DIR_LIBRARY ${CMAKE_INSTALL_LIBDIR})
set (DIR_SHARE ${CMAKE_INSTALL_DATAROOTDIR})

if (DEFINED SHARE_INSTALL_PREFIX)
set (DIR_SHARE ${SHARE_INSTALL_PREFIX})
Expand All @@ -107,7 +123,20 @@ if (DEFINED LIB_INSTALL_DIR)
endif (DEFINED LIB_INSTALL_DIR)

set (DIR_SHARE_OPENCC ${DIR_SHARE}/opencc)
set (DIR_SHARE_LOCALE ${DIR_SHARE}/locale)

# Compute absolute paths needed for compile-time macros (PKGDATADIR/LOCALEDIR)
# and for the pkg-config file. We must handle both the GNUInstallDirs relative
# defaults and user-supplied absolute override paths (SHARE_INSTALL_PREFIX etc.).
foreach (_gnu_dir SHARE INCLUDE LIBRARY)
if (IS_ABSOLUTE "${DIR_${_gnu_dir}}")
set (DIR_${_gnu_dir}_FULL "${DIR_${_gnu_dir}}")
else ()
set (DIR_${_gnu_dir}_FULL "${CMAKE_INSTALL_PREFIX}/${DIR_${_gnu_dir}}")
endif ()
endforeach ()

set (DIR_SHARE_OPENCC_FULL ${DIR_SHARE_FULL}/opencc)
set (DIR_SHARE_LOCALE_FULL ${DIR_SHARE_FULL}/locale)

######## Configuration

Expand Down Expand Up @@ -152,8 +181,8 @@ install(
######## Compiler flags

add_definitions(
-DPKGDATADIR="${DIR_SHARE_OPENCC}"
-DLOCALEDIR="${DIR_SHARE_LOCALE}"
-DPKGDATADIR="${DIR_SHARE_OPENCC_FULL}"
-DLOCALEDIR="${DIR_SHARE_LOCALE_FULL}"
-DVERSION="${OPENCC_VERSION}"
-DPACKAGE_NAME="${PACKAGE_NAME}"
)
Expand Down
6 changes: 3 additions & 3 deletions opencc.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
prefix=@DIR_PREFIX@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=@DIR_LIBRARY@
includedir=@DIR_INCLUDE@
libdir=@DIR_LIBRARY_FULL@
includedir=@DIR_INCLUDE_FULL@

Name: opencc
Description: Open Chinese Convert
Expand Down
Loading