Skip to content

Commit 9ce8c2b

Browse files
committed
Fix 2 bugs in MSVC build.
修改: CMakeLists.txt 修改: ChangeLog 修改: windows/libcppp-reiconv.rc.in
1 parent 9fe83be commit 9ce8c2b

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

CMakeLists.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,22 @@ include("tests/tests.cmake")
8585
# PERMISSIONS 0644
8686
install(TARGETS libcppp-reiconv.static
8787
DESTINATION "${install_staticdir}"
88-
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ )
88+
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
89+
LIBRARY DESTINATION "${install_shareddir}"
90+
ARCHIVE DESTINATION "${install_staticdir}"
91+
RUNTIME DESTINATION "${install_bindir}"
92+
INCLUDES DESTINATION "${install_includedir}" )
8993

9094
# Shared
9195
# PERMISSIONS 0755
9296
install(TARGETS libcppp-reiconv.shared
9397
EXPORT libcppp-reiconv-export
9498
DESTINATION "${install_shareddir}"
95-
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
99+
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
100+
LIBRARY DESTINATION "${install_shareddir}"
101+
ARCHIVE DESTINATION "${install_staticdir}"
102+
RUNTIME DESTINATION "${install_bindir}"
103+
INCLUDES DESTINATION "${install_includedir}" )
96104

97105
# Includes
98106
# install includes

ChangeLog

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2023-07-16 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>
2+
3+
Fix encoding bug in Windows Resource '(C)' character.
4+
Fix shared library runtime and archive install destination problem.
5+
6+
2023-07-15 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>
7+
8+
Fix macro bug in MSVC resource build.
9+
Add GitHub build CI for Linux and macOS.
10+
111
2023-07-12 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>
212

313
Change `int` to 'unsigned short' in canonical headers.

windows/libcppp-reiconv.rc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ BEGIN
2929
VALUE "FileDescription", "LGPLed cppp-reiconv for Windows\0"
3030
VALUE "FileVersion", PROJECT_VERSION "\0"
3131
VALUE "InternalName", "libcppp-reiconv.dll\0"
32-
VALUE "LegalCopyright", "Copyright © 2023\0"
32+
VALUE "LegalCopyright", "Copyright (C) 2023\0"
3333
VALUE "LegalTrademarks", "\0"
3434
VALUE "OriginalFilename", "libcppp-reiconv.dll\0"
3535
VALUE "ProductName", "cppp-reiconv: character set conversion library\0"

0 commit comments

Comments
 (0)