mirror of
https://github.com/OpenVPN/openvpn.git
synced 2024-09-19 19:42:30 +02:00
CMake: various small non-functional improvements
These are based on review comments for the 2.6 backport. But since they apply to the original master implementation as well, I address them in this separate patch. - Add documentation to contrib/cmake/*.py - Fix grammar in README.cmake.md - Update a TODO in CMakeLists.txt to better reflect the status quo - Fix indentation in unit_tests' Makefile.am Change-Id: I4e16767ee221e1aefdd18d13b3411c27d8dd844a Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> Acked-by: Lev Stipakov <lstipakov@gmail.com> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/342 Message-Id: <20230919155635.708557-1-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg27043.html Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
parent
8ae6c48d5d
commit
95cc5faa16
@ -292,7 +292,7 @@ set(HAVE_CONFIG_VERSION_H YES)
|
||||
|
||||
configure_file(config.h.cmake.in config.h)
|
||||
configure_file(include/openvpn-plugin.h.in openvpn-plugin.h)
|
||||
# TODO remove later when msvc-config.h is removed and we can always include config.h
|
||||
# TODO we should remove the need for this, and always include config.h
|
||||
add_definitions(-DHAVE_CONFIG_H)
|
||||
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
@ -24,7 +24,7 @@ MSVC builds
|
||||
-----------
|
||||
|
||||
The following tools are expected to be present on the system, you
|
||||
can them install with a package manager of your choice (e.g.
|
||||
can install them with a package manager of your choice (e.g.
|
||||
chocolatey, winget) or manually:
|
||||
|
||||
* CMake
|
||||
|
@ -22,6 +22,14 @@
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
# Usage: ./git-version.py [directory]
|
||||
# Find a good textual representation of the git commit currently checked out.
|
||||
# Make that representation available as CONFIGURE_GIT_REVISION in
|
||||
# <directory>/config-version.h.
|
||||
# It will prefer a tag name if it is checked out exactly, otherwise will use
|
||||
# the branch name. 'none' if no branch is checked out (detached HEAD).
|
||||
# This is used to enhance the output of openvpn --version with Git information.
|
||||
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
|
@ -22,6 +22,12 @@
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
|
||||
# Usage: ./parse-version.m4.py m4file [directory]
|
||||
# Read <m4file>, extract all lines looking like M4 define(), and translate
|
||||
# them into CMake style set(). Those are then written out to file
|
||||
# <directory>/version.cmake.
|
||||
# Intended to be used on top-level version.m4 file.
|
||||
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
|
@ -110,7 +110,7 @@ tls_crypt_testdriver_LDFLAGS = @TEST_LDFLAGS@ \
|
||||
-Wl,--wrap=parse_line \
|
||||
-Wl,--wrap=rand_bytes
|
||||
tls_crypt_testdriver_SOURCES = test_tls_crypt.c mock_msg.c mock_msg.h \
|
||||
mock_win32_execve.c \
|
||||
mock_win32_execve.c \
|
||||
$(top_srcdir)/src/openvpn/argv.c \
|
||||
$(top_srcdir)/src/openvpn/base64.c \
|
||||
$(top_srcdir)/src/openvpn/buffer.c \
|
||||
|
Loading…
Reference in New Issue
Block a user