Skip to content
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

cmake: fix destination path #34

Merged
merged 3 commits into from
Nov 2, 2023
Merged

cmake: fix destination path #34

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55cf7ba
cmake: fix install path for documents
komainu8 Nov 1, 2023
ebf9a29
cmake: specify CMAKE_LIBDIR
komainu8 Nov 1, 2023
f2884f5
Use CMAKE_INSTALL_* by including GNUInstallDirs
komainu8 Nov 2, 2023
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
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ cmake_minimum_required(VERSION 3.16)
set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
project("${GROONGA_NORMALIZER_MYSQL_PROJECT_NAME}")

if(NOT DEFINED GROONGA_NORMALIZER_MYSQL_DATA_DIR)
set(GROONGA_NORMALIZER_MYSQL_DATA_DIR
"share/${GROONGA_NORMALIZER_MYSQL_PROJECT_NAME}")
if(NOT DEFINED GROONGA_NORMALIZER_MYSQL_DOC_DIR)
set(GROONGA_NORMALIZER_MYSQL_DOC_DIR
"share/doc/${GROONGA_NORMALIZER_MYSQL_PROJECT_NAME}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use CMAKE_INSTALL_DOCDIR by including GNUInstallDirs:

endif()

if(DEFINED GROONGA_NORMALIZER_MYSQL_EMBED)
Expand Down Expand Up @@ -100,4 +100,4 @@ endif()
install(FILES
"README.md"
"doc/text/lgpl-2.0.txt"
DESTINATION "${GROONGA_NORMALIZER_MYSQL_DATA_DIR}")
DESTINATION "${GROONGA_NORMALIZER_MYSQL_DOC_DIR}")
1 change: 1 addition & 0 deletions packages/yum/groonga-normalizer-mysql.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ This package provides development files for groonga-normalizer-mysql.
%cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \
-DCMAKE_LIBDIR=%{_libdir} \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use CMAKE_INSTALL_LIBDIR by including GNUInstallDirs instead of specifying CMAKE_LIBDIR explicitly.

%cmake_build

%install
Expand Down
Loading