Skip to content

Commit 9fe83be

Browse files
committed
Fix macro bug in MSVC resource build.
修改: CMakeLists.txt 修改: FILELIST 重命名: windows/libcppp-reiconv.rc -> windows/libcppp-reiconv.rc.in
1 parent 9a973e1 commit 9fe83be

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ include("${AUX_DIR}/cppp.cmake")
4040

4141
check_have_visibility()
4242

43+
if(MSVC)
44+
add_compile_options(/wd4018)
45+
endif()
46+
4347
# Generate header file for build
4448
if(WIN32)
4549
set(DLL_VARIABLE "__declspec(dllexport)")
@@ -49,6 +53,7 @@ else()
4953
set(DLL_VARIABLE "")
5054
endif()
5155
configure_file("${srcdir}/include/cppp/reiconv.hpp.in" "${output_includedir}/cppp/reiconv.hpp")
56+
configure_file("${srcdir}/windows/libcppp-reiconv.rc.in" "${outdir}/windows/libcppp-reiconv.rc")
5257

5358
# Generate header file for install
5459
if(WIN32)
@@ -70,7 +75,7 @@ if(ENABLE_EXTRA)
7075
endif()
7176

7277
# Add library
73-
cppp_build_library(${PROJECT_NAME} "${srcdir}/lib/iconv.cpp" TRUE TRUE "${srcdir}/windows/libcppp-reiconv.rc")
78+
cppp_build_library(${PROJECT_NAME} "${srcdir}/lib/iconv.cpp" TRUE TRUE "${outdir}/windows/libcppp-reiconv.rc")
7479

7580
# Include test suite.
7681
include("tests/tests.cmake")

FILELIST

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,5 +551,5 @@ FILELIST
551551
CPPPPKG
552552
cpppdist.py
553553
ChangeLog
554-
windows/libcppp-reiconv.rc
554+
windows/libcppp-reiconv.rc.in
555555
NEWS.md

windows/libcppp-reiconv.rc renamed to windows/libcppp-reiconv.rc.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
#include <winver.h>
44

5+
#define PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
6+
#define PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR@
7+
#define PROJECT_VERSION_PATCH @PROJECT_VERSION_PATCH@
8+
#define PROJECT_VERSION "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@"
9+
510
VS_VERSION_INFO VERSIONINFO
611
FILEVERSION PROJECT_VERSION_MAJOR,PROJECT_VERSION_MINOR,PROJECT_VERSION_PATCH,0
712
PRODUCTVERSION PROJECT_VERSION_MAJOR,PROJECT_VERSION_MINOR,PROJECT_VERSION_PATCH,0

0 commit comments

Comments
 (0)