Skip to content

Add support for absolute CMAKE_INSTALL_*DIR #1

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

Draft
wants to merge 1 commit into
base: c_master
Choose a base branch
from
Draft

Add support for absolute CMAKE_INSTALL_*DIR #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,16 @@ SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION})

LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
include(GNUInstallDirs)
SET (prefix ${CMAKE_INSTALL_PREFIX})
SET (exec_prefix ${CMAKE_INSTALL_PREFIX})
SET (libdir ${CMAKE_INSTALL_LIBDIR})
SET (includedir ${CMAKE_INSTALL_INCLUDEDIR})
if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
set(MSGPACK_PKG_CONFIG_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
else()
set(MSGPACK_PKG_CONFIG_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
endif()
if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
set(MSGPACK_PKG_CONFIG_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
else()
set(MSGPACK_PKG_CONFIG_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
endif()

OPTION (MSGPACK_32BIT "32bit compile" OFF)

Expand Down
7 changes: 3 additions & 4 deletions msgpack-c.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
Copy link
Owner Author

@otegami otegami Apr 24, 2024

Choose a reason for hiding this comment

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

exec_prefix は利用されていないかつ、どちらもCMAKE_INSTALL_PREFIXを参照ているので必要ないと判断しました。

Copy link

@kou kou Apr 25, 2024

Choose a reason for hiding this comment

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

https://github.com/otegami/msgpack-c/pull/1/files#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20aR34 で参照しているのでこれだと壊れない？

libdir=@libdir@
includedir=@includedir@
prefix=@CMAKE_INSTALL_PREFIX@
includedir=@MSGPACK_PKG_CONFIG_INCLUDEDIR@
libdir=@MSGPACK_PKG_CONFIG_LIBDIR@

Name: MessagePack
Description: Binary-based efficient object serialization library
Expand Down