Skip to content

Commit a5c8a2c

Browse files
authored
Merge pull request #1121 from otegami/support-absolute-path-for-pkg-config
Support absolute path for CMAKE_INSTALL_*DIR
2 parents c31fafb + 4e027b7 commit a5c8a2c

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

CMakeLists.txt

+10-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,16 @@ LIST (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
3030
include(GNUInstallDirs)
3131
SET (prefix ${CMAKE_INSTALL_PREFIX})
3232
SET (exec_prefix ${CMAKE_INSTALL_PREFIX})
33-
SET (libdir ${CMAKE_INSTALL_LIBDIR})
34-
SET (includedir ${CMAKE_INSTALL_INCLUDEDIR})
33+
IF (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
34+
SET (libdir ${CMAKE_INSTALL_LIBDIR})
35+
ELSE ()
36+
SET (libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
37+
ENDIF ()
38+
IF (IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR})
39+
SET (includedir ${CMAKE_INSTALL_INCLUDEDIR})
40+
ELSE ()
41+
SET (includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
42+
ENDIF ()
3543

3644
OPTION (MSGPACK_32BIT "32bit compile" OFF)
3745

msgpack-c.pc.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
prefix=@prefix@
22
exec_prefix=@exec_prefix@
3-
libdir=${prefix}/@libdir@
4-
includedir=${prefix}/@includedir@
3+
libdir=@libdir@
4+
includedir=@includedir@
55

66
Name: MessagePack
77
Description: Binary-based efficient object serialization library

0 commit comments

Comments
 (0)