Skip to content

Commit 46da3dc

Browse files
committed
This is to address relative and absolute installation folders
1 parent 61c05d0 commit 46da3dc

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

CMakeLists.txt

+11-4
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,17 @@ install(DIRECTORY src/core/common/
161161
install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc"
162162
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
163163

164-
set(PKG_CONFIG_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
165-
set(PKG_CONFIG_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
166-
set(PKG_CONFIG_LIBS "-L\${libdir} -lopenjph")
167-
set(PKG_CONFIG_CFLAGS "-I\${includedir}")
164+
if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
165+
set(PKG_CONFIG_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
166+
else()
167+
set(PKG_CONFIG_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
168+
endif()
169+
170+
if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
171+
set(PKG_CONFIG_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
172+
else()
173+
set(PKG_CONFIG_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
174+
endif()
168175

169176
configure_file(
170177
"${CMAKE_CURRENT_SOURCE_DIR}/src/pkg-config.pc.cmake"

src/core/common/ojph_version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535

3636
#define OPENJPH_VERSION_MAJOR 0
3737
#define OPENJPH_VERSION_MINOR 14
38-
#define OPENJPH_VERSION_PATCH 1
38+
#define OPENJPH_VERSION_PATCH 2

src/pkg-config.pc.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ Requires: @PKG_CONFIG_REQUIRES@
55
prefix=@CMAKE_INSTALL_PREFIX@
66
includedir=@PKG_CONFIG_INCLUDEDIR@
77
libdir=@PKG_CONFIG_LIBDIR@
8-
Libs: @PKG_CONFIG_LIBS@
9-
Cflags: @PKG_CONFIG_CFLAGS@
8+
Libs: -L${libdir} -lopenjph
9+
Cflags: -I${includedir}

0 commit comments

Comments
 (0)