mirror of
https://github.com/OpenVPN/openvpn.git
synced 2024-11-27 03:33:55 +08:00
e8881ec6dd
This is based on the initial CMake patch by Arne Schwabe, but extends that to provide a complete replacement for existing MinGW build (autotools based) and MSVC build (openvpn.sln). The following features are added while switching these builds to CMake: - vcpkg support for MinGW build, allowing for trivial cross-compilation on Linux - Add unittests to MSVC build - Rework MSVC config header generation, removing need for separate headers between autotools and MSVC The following advantages are reasons for switching to CMake over the existing MSVC build: - Easier to maintain CMake files without IDE than the sln and vcxproj files - Able to maintain MSVC and MinGW build side-by-side The plan is to completely remove the existing MSVC build system but leave the existing autotools builds in place as-is, including MinGW support. CMake is not the intended build system for Unix-like platforms and there are no current plans to switch to it. v2: - Reduce default warning level for MSVC to /W2. With /W3 the build is just much too noisy, making it difficult to spot new warnings. - Change MSVC CMake presets to have hardcoded build type. When using pkg_search_module MSVC Multi-Config builds do not work correctly at all since PkgConfig doesn't seem to be able to create multi-config libraries like find_package does. - Change minGW presets to be Multi-Config capable. - Remove OPENVPN_VERSION_MAJOR, OPENVPN_VERSION_MINOR, OPENVPN_VERSION_PATCH from config.h.cmake.in. They are not required and cause macro redefinition warnings in MSVC (with openvpn-plugin.h). gcc doesn't warn about this because the definitions are identical so no need to fix this in autoheader config.h.in. v3: - Apply fixes by Lev Stipakov to match MSVC compile options better to previous build. - Apply change by Lev Stipakov to enable generation of PDB files. - Move /Brepro to its own commit. This is a behavior change that should be more visible. - Rebase on top of my dist fixes. Change-Id: I237f28eca618d4fc476225b887c0be26cca362b1 Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> Acked-by: Lev Stipakov <lstipakov@gmail.com> Message-Id: <20230620135310.94455-3-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26754.html Signed-off-by: Gert Doering <gert@greenie.muc.de>
229 lines
6.6 KiB
JSON
229 lines
6.6 KiB
JSON
{
|
|
"version": 3,
|
|
"configurePresets": [
|
|
{
|
|
"name": "base",
|
|
"hidden": true,
|
|
"cacheVariables": {
|
|
"CMAKE_TOOLCHAIN_FILE": {
|
|
"value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
|
|
"type": "FILEPATH"
|
|
},
|
|
"VCPKG_OVERLAY_TRIPLETS": {
|
|
"value": "${sourceDir}/contrib/vcpkg-triplets",
|
|
"type": "FILEPATH"
|
|
},
|
|
"VCPKG_OVERLAY_PORTS": {
|
|
"value": "${sourceDir}/contrib/vcpkg-ports",
|
|
"type": "FILEPATH"
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"name": "base-windows",
|
|
"hidden": true,
|
|
"binaryDir": "${sourceDir}/out/build/${presetName}",
|
|
"generator": "Visual Studio 17 2022",
|
|
"cacheVariables": {
|
|
"VCPKG_MANIFEST_DIR": "${sourceDir}/contrib/vcpkg-manifests/windows",
|
|
"VCPKG_HOST_TRIPLET": "x64-windows"
|
|
},
|
|
"vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { "hostOS": [ "Windows" ] } }
|
|
},
|
|
{
|
|
"name": "base-mingw",
|
|
"hidden": true,
|
|
"generator": "Ninja Multi-Config",
|
|
"cacheVariables": {
|
|
"CMAKE_SYSTEM_NAME": {
|
|
"value": "Windows",
|
|
"type": "STRING"
|
|
},
|
|
"VCPKG_MANIFEST_DIR": "${sourceDir}/contrib/vcpkg-manifests/mingw"
|
|
}
|
|
},
|
|
{
|
|
"name": "x64",
|
|
"hidden": true,
|
|
"architecture": {
|
|
"value": "x64",
|
|
"strategy": "set"
|
|
},
|
|
"cacheVariables": {
|
|
"VCPKG_TARGET_TRIPLET": "x64-windows-ovpn"
|
|
}
|
|
},
|
|
{
|
|
"name": "x64-mingw",
|
|
"hidden": true,
|
|
"binaryDir": "out/build/mingw/x64",
|
|
"cacheVariables": {
|
|
"CMAKE_C_COMPILER": {
|
|
"value": "x86_64-w64-mingw32-gcc",
|
|
"type": "STRING"
|
|
},
|
|
"CMAKE_CXX_COMPILER": {
|
|
"value": "x86_64-w64-mingw32-g++",
|
|
"type": "STRING"
|
|
},
|
|
"VCPKG_TARGET_TRIPLET": "x64-mingw-ovpn"
|
|
}
|
|
},
|
|
{
|
|
"name": "arm64",
|
|
"hidden": true,
|
|
"architecture": {
|
|
"value": "arm64",
|
|
"strategy": "set"
|
|
},
|
|
"cacheVariables": {
|
|
"VCPKG_TARGET_TRIPLET": "arm64-windows-ovpn"
|
|
}
|
|
},
|
|
{
|
|
"name": "x86",
|
|
"hidden": true,
|
|
"architecture": {
|
|
"value": "Win32",
|
|
"strategy": "set"
|
|
},
|
|
"cacheVariables": {
|
|
"VCPKG_TARGET_TRIPLET": "x86-windows-ovpn"
|
|
}
|
|
},
|
|
{
|
|
"name": "i686-mingw",
|
|
"hidden": true,
|
|
"binaryDir": "out/build/mingw/x86",
|
|
"cacheVariables": {
|
|
"CMAKE_C_COMPILER": {
|
|
"value": "i686-w64-mingw32-gcc",
|
|
"type": "STRING"
|
|
},
|
|
"CMAKE_CXX_COMPILER": {
|
|
"value": "i686-w64-mingw32-g++",
|
|
"type": "STRING"
|
|
},
|
|
"VCPKG_TARGET_TRIPLET": "x86-mingw-ovpn"
|
|
}
|
|
},
|
|
{
|
|
"name": "debug",
|
|
"hidden": true,
|
|
"cacheVariables": {
|
|
"CMAKE_BUILD_TYPE": "Debug"
|
|
}
|
|
},
|
|
{
|
|
"name": "release",
|
|
"hidden": true,
|
|
"cacheVariables": {
|
|
"CMAKE_BUILD_TYPE": "Release"
|
|
}
|
|
},
|
|
{
|
|
"name": "mingw-x64",
|
|
"inherits": [ "base", "base-mingw", "x64-mingw" ]
|
|
},
|
|
{
|
|
"name": "mingw-x86",
|
|
"inherits": [ "base", "base-mingw", "i686-mingw" ]
|
|
},
|
|
{
|
|
"name": "win-amd64-release",
|
|
"inherits": [ "base", "base-windows", "x64", "release" ]
|
|
},
|
|
{
|
|
"name": "win-arm64-release",
|
|
"inherits": [ "base", "base-windows", "arm64", "release" ]
|
|
},
|
|
{
|
|
"name": "win-x86-release",
|
|
"inherits": [ "base", "base-windows", "x86", "release" ]
|
|
},
|
|
{
|
|
"name": "win-amd64-debug",
|
|
"inherits": [ "base", "base-windows", "x64", "debug" ]
|
|
},
|
|
{
|
|
"name": "win-arm64-debug",
|
|
"inherits": [ "base", "base-windows", "arm64", "debug" ]
|
|
},
|
|
{
|
|
"name": "win-x86-debug",
|
|
"inherits": [ "base", "base-windows", "x86", "debug" ]
|
|
},
|
|
{
|
|
"name": "unix-native",
|
|
"generator": "Ninja Multi-Config",
|
|
"binaryDir": "out/build/unix"
|
|
}
|
|
],
|
|
"buildPresets": [
|
|
{
|
|
"name": "mingw-x64",
|
|
"configurePreset": "mingw-x64"
|
|
},
|
|
{
|
|
"name": "mingw-x86",
|
|
"configurePreset": "mingw-x86"
|
|
},
|
|
{
|
|
"name": "win-amd64-release",
|
|
"configurePreset": "win-amd64-release",
|
|
"configuration": "Release"
|
|
},
|
|
{
|
|
"name": "win-arm64-release",
|
|
"configurePreset": "win-arm64-release",
|
|
"configuration": "Release"
|
|
},
|
|
{
|
|
"name": "win-x86-release",
|
|
"configurePreset": "win-x86-release",
|
|
"configuration": "Release"
|
|
},
|
|
{
|
|
"name": "win-amd64-debug",
|
|
"configurePreset": "win-amd64-debug",
|
|
"configuration": "Debug"
|
|
},
|
|
{
|
|
"name": "win-arm64-debug",
|
|
"configurePreset": "win-arm64-debug",
|
|
"configuration": "Debug"
|
|
},
|
|
{
|
|
"name": "win-x86-debug",
|
|
"configurePreset": "win-x86-debug",
|
|
"configuration": "Debug"
|
|
},
|
|
{
|
|
"name": "unix-native",
|
|
"configurePreset": "unix-native"
|
|
}
|
|
],
|
|
"testPresets": [
|
|
{
|
|
"name": "win-amd64-release",
|
|
"configurePreset": "win-amd64-release"
|
|
},
|
|
{
|
|
"name": "win-x86-release",
|
|
"configurePreset": "win-x86-release"
|
|
},
|
|
{
|
|
"name": "win-amd64-debug",
|
|
"configurePreset": "win-amd64-debug"
|
|
},
|
|
{
|
|
"name": "win-x86-debug",
|
|
"configurePreset": "win-x86-debug"
|
|
},
|
|
{
|
|
"name": "unix-native",
|
|
"configurePreset": "unix-native"
|
|
}
|
|
]
|
|
}
|