github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

CMake: read version from configure.ac 

Instead of using hardcoded major/minor version in config-msvc.h,
use the values from configure.ac.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
pull/428/head
Lev Stipakov 2021-05-24 12:03:33 +03:00 committed by Selva Nair
parent 438ea865c8
commit 8d878e8f7b
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -25,8 +25,6 @@ add_executable(${PROJECT_NAME} WIN32
viewlog.c viewlog.c
res/openvpn-gui-res.rc) res/openvpn-gui-res.rc)
configure_file(config-msvc.h config.h COPYONLY)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
target_link_libraries(${PROJECT_NAME} OpenSSL::SSL target_link_libraries(${PROJECT_NAME} OpenSSL::SSL
Wtsapi32.lib Wtsapi32.lib
@ -48,6 +46,17 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
set(CMAKE_RC_FLAGS "/D \"HAVE_CONFIG_H\" /D \"_MSC_VER\"") set(CMAKE_RC_FLAGS "/D \"HAVE_CONFIG_H\" /D \"_MSC_VER\"")
function(get_version_from_configure regex_arg ret)
file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" VERSION_STR REGEX ${regex_arg})
string(REGEX MATCH ${regex_arg} VERSION_STR "${VERSION_STR}")
set("${ret}" ${CMAKE_MATCH_1} PARENT_SCOPE)
endfunction()
get_version_from_configure("_GUI_VERSION_MAJOR\\], \\[([0-9]+)\\]" GUI_VERSION_MAJOR)
get_version_from_configure("_GUI_VERSION_MINOR\\], \\[([0-9]+)\\]" GUI_VERSION_MINOR)
configure_file(config-msvc.h.in config.h)
target_compile_definitions(${PROJECT_NAME} PRIVATE target_compile_definitions(${PROJECT_NAME} PRIVATE
_UNICODE _UNICODE
UNICODE UNICODE

4
config-msvc.h → config-msvc.h.in
View File

@ -22,7 +22,7 @@
#define PACKAGE_VERSION "11" #define PACKAGE_VERSION "11"
/* Version in windows resource format */ /* Version in windows resource format */
#define PACKAGE_VERSION_RESOURCE 11,14,0,0 #define PACKAGE_VERSION_RESOURCE @GUI_VERSION_MAJOR@,@GUI_VERSION_MINOR@,0,0
/* Version as a string */ /* Version as a string */
#define PACKAGE_VERSION_RESOURCE_STR "11.14.0.0" #define PACKAGE_VERSION_RESOURCE_STR "@GUI_VERSION_MAJOR@.@GUI_VERSION_MINOR@.0.0"