Skip to content

Commit bf1d18e

Browse files
committed
Add support for absolute CMAKE_INSTALL_*DIR
1 parent 5ab83b1 commit bf1d18e

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

CMakeLists.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,16 @@ SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION})
2828

2929
LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
3030
include(GNUInstallDirs)
31-
SET (prefix ${CMAKE_INSTALL_PREFIX})
32-
SET (exec_prefix ${CMAKE_INSTALL_PREFIX})
33-
SET (libdir ${CMAKE_INSTALL_LIBDIR})
34-
SET (includedir ${CMAKE_INSTALL_INCLUDEDIR})
31+
if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
32+
set(MSGPACK_PKG_CONFIG_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
33+
else()
34+
set(MSGPACK_PKG_CONFIG_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
35+
endif()
36+
if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
37+
set(MSGPACK_PKG_CONFIG_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
38+
else()
39+
set(MSGPACK_PKG_CONFIG_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
40+
endif()
3541

3642
OPTION (MSGPACK_32BIT "32bit compile" OFF)
3743

msgpack-c.pc.in

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
prefix=@prefix@
2-
exec_prefix=@exec_prefix@
3-
libdir=@libdir@
4-
includedir=@includedir@
1+
prefix=@CMAKE_INSTALL_PREFIX@
2+
includedir=@MSGPACK_PKG_CONFIG_INCLUDEDIR@
3+
libdir=@MSGPACK_PKG_CONFIG_LIBDIR@
54

65
Name: MessagePack
76
Description: Binary-based efficient object serialization library

0 commit comments

Comments
 (0)