File tree 3 files changed +14
-7
lines changed
3 files changed +14
-7
lines changed Original file line number Diff line number Diff line change @@ -161,10 +161,17 @@ install(DIRECTORY src/core/common/
161
161
install (FILES "${CMAKE_BINARY_DIR} /${PROJECT_NAME} .pc"
162
162
DESTINATION ${CMAKE_INSTALL_LIBDIR} /pkgconfig)
163
163
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 ()
168
175
169
176
configure_file (
170
177
"${CMAKE_CURRENT_SOURCE_DIR} /src/pkg-config.pc.cmake"
Original file line number Diff line number Diff line change 35
35
36
36
#define OPENJPH_VERSION_MAJOR 0
37
37
#define OPENJPH_VERSION_MINOR 14
38
- #define OPENJPH_VERSION_PATCH 1
38
+ #define OPENJPH_VERSION_PATCH 2
Original file line number Diff line number Diff line change @@ -5,5 +5,5 @@ Requires: @PKG_CONFIG_REQUIRES@
5
5
prefix =@CMAKE_INSTALL_PREFIX @
6
6
includedir=@PKG_CONFIG_INCLUDEDIR@
7
7
libdir=@PKG_CONFIG_LIBDIR@
8
- Libs: @PKG_CONFIG_LIBS@
9
- Cflags: @PKG_CONFIG_CFLAGS@
8
+ Libs: -L ${libdir} -lopenjph
9
+ Cflags: -I ${includedir}
You can’t perform that action at this time.
0 commit comments