build script now uses cmake, also:

- fixed linking qt6keychain and SortFilterProxyModel
- added translations
This commit is contained in:
vladimir.kuznetsov 2022-11-15 23:31:55 +03:00
parent 663861dc09
commit 2564430046
4 changed files with 22 additions and 17 deletions

View file

@ -59,7 +59,8 @@ set(PUBLIC_HEADERS ${PUBLIC_HEADERS}
${CMAKE_CURRENT_LIST_DIR}/sshconnection.h
)
set(HEADERS ${HEADERS} ${PUBLIC_HEADERS}
set(HEADERS ${HEADERS}
${PUBLIC_HEADERS}
${CMAKE_CURRENT_LIST_DIR}/sshsendfacility_p.h
${CMAKE_CURRENT_LIST_DIR}/sshremoteprocess_p.h
${CMAKE_CURRENT_LIST_DIR}/sshpacketparser_p.h

View file

@ -30,14 +30,17 @@ include(${CMAKE_CURRENT_LIST_DIR}/3rd/QtSsh/src/botan/botan.cmake)
if(NOT IOS AND NOT ANDROID)
include(${CMAKE_CURRENT_LIST_DIR}/3rd/SingleApplication/singleapplication.cmake)
endif()
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/SortFilterProxyModel)
set(LIBS ${LIBS} qt6keychain)
set(LIBS ${LIBS} SortFilterProxyModel)
include(${CMAKE_CURRENT_LIST_DIR}/3rd/qrcodegen/qrcodegen.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/3rd/QSimpleCrypto/QSimpleCrypto.cmake)
set(BUILD_WITH_QT6 ON)
set(BUILD_SHARED_LIBS OFF)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/qtkeychain)
set(LIBS ${LIBS} qt6keychain)
# TODO it seems like i'm doing it wrong
include_directories(
@ -115,8 +118,6 @@ set(SOURCES ${SOURCES}
qt6_add_resources(QRC ${QRC} ${CMAKE_CURRENT_LIST_DIR}/resources.qrc)
#todo add translations
if(WIN32)
add_compile_definitions(MVPN_WINDOWS)
@ -318,6 +319,9 @@ endif()
qt_add_executable(${PROJECT} ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})
qt_add_translations(${PROJECT} TS_FILES
${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts)
if(ANDROID)
add_custom_command(
TARGET ${PROJECT} POST_BUILD