Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/download-native-wireguard-config-on-connect
This commit is contained in:
commit
7665bb863a
52 changed files with 813 additions and 332 deletions
|
|
@ -1,4 +1,4 @@
|
|||
cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
|
||||
cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
|
||||
|
||||
set(PROJECT service)
|
||||
project(${PROJECT})
|
||||
|
|
@ -12,4 +12,4 @@ endif()
|
|||
|
||||
if(WIN32)
|
||||
add_subdirectory(wireguard-service)
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
|
||||
cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
|
||||
|
||||
set(PROJECT AmneziaVPN-service)
|
||||
project(${PROJECT})
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
|
||||
cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
|
||||
|
||||
set(PROJECT wireguard-service)
|
||||
project(${PROJECT} LANGUAGES CXX)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue