Skip to content

Commit 46bd6d0

Browse files
committed
fix pkg-config
1 parent 6991f00 commit 46bd6d0

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.17)
2-
project(cpp-pinyin VERSION 1.0.1.0 LANGUAGES CXX)
2+
project(cpp-pinyin VERSION 1.0.1 LANGUAGES CXX)
33

44
set(CMAKE_CXX_STANDARD 17)
55

@@ -163,9 +163,8 @@ endif ()
163163
# ----------------------------------
164164

165165
set(prefix ${CMAKE_INSTALL_PREFIX})
166-
set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
167166
set(libdir ${CMAKE_INSTALL_LIBDIR})
168-
set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
167+
set(version ${PROJECT_VERSION})
169168

170169
# Configure the .pc file
171170
configure_file(

cmake/winrc.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ set(_rc_content "#include <windows.h>
88
#define STRINGIFY(x) _STRINGIFY(x)
99
1010
VS_VERSION_INFO VERSIONINFO
11-
FILEVERSION ${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},${PROJECT_VERSION_TWEAK}
12-
PRODUCTVERSION ${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},${PROJECT_VERSION_TWEAK}
11+
FILEVERSION ${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH}
12+
PRODUCTVERSION ${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH}
1313
{
1414
BLOCK \"StringFileInfo\"
1515
{

cpp-pinyin.pc.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
prefix=${pcfiledir}/../..
1+
prefix=@prefix@
22

33
# cpp-pinyin pkg-config file
44

5-
exec_prefix=${prefix}/bin
6-
libdir=${exec_prefix}/lib
7-
includedir=${prefix}/include
5+
exec_prefix=@prefix@/bin
6+
libdir=@prefix@/lib
7+
includedir=@prefix@/include
88

9-
dictdir=${prefix}/share/cpp-pinyin/dict
9+
dictdir=@prefix@/share/cpp-pinyin/dict
1010

1111
Name: cpp-pinyin
1212
Description: A lightweight Chinese/Cantonese to Pinyin library.
13-
Version: ${PROJECT_VERSION}
13+
Version: @version@
1414
Requires:
1515
Conflicts:
1616

0 commit comments

Comments
 (0)