QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-07 23:19:35 +00:00
Code Issues Projects Releases Wiki Activity

fix default deploy stem for linux

Browse Source
This commit is contained in:
Andrei Yankovich 2022-08-13 21:37:08 +03:00
parent 4e561ecd26
commit 6c041e4376
8 changed files with 16 additions and 44 deletions

2
.gitignore vendored

@ -87,4 +87,4 @@ CTestTestfile.cmake
_deps
src/LibDeploy/src/deploy_global.h
src/QtELFReader/src/elfreader_global.h
src/CQtDeployer/Deploy/CQtDeployer.json

6
CMakeLists.txt

@ -19,9 +19,10 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(BUILD_SHARED_LIBS ON)
if (ANDROID OR IOS)
set(BUILD_SHARED_LIBS ON)
if (IOS)
set(BUILD_SHARED_LIBS OFF)
endif()
if (NOT QT_VERSION_MAJOR)
@ -50,7 +51,6 @@ make_directory(Distro)
initAll()
add_subdirectory(submodules/QuasarAppLib)
add_subdirectory(src/QtELFReader)
option(BUILD_COMMAND_LINE_TOOLS "Build Command Line Tools" OFF)

9
src/CQtDeployer/CMakeLists.txt

@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.18)
get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME)
set(CURRENT_PROJECT "${PROJECT_NAME}${CURRENT_PROJECT_DIR}")
set(CURRENT_PROJECT "${PROJECT_NAME}")
option(SIGN_APP "This option enable od disabled sign apk and aab files" ON)
file(GLOB_RECURSE SOURCE_CPP
@ -28,7 +28,6 @@ set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Private")
updateGitVars()
if (${QT_VERSION_MAJOR} EQUAL 6)
@ -43,7 +42,7 @@ else()
endif()
target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME}LibDeploy)
target_link_libraries(${CURRENT_PROJECT} PUBLIC LibDeploy)
target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR})
@ -71,4 +70,6 @@ set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts
prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}")
set(global_file "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployer.json")
configure_file("${global_file}.in" ${global_file} @ONLY)
addDeployFromCustomFile(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployer.json")

27
src/CQtDeployer/Deploy/CQtDeployer.json

@ -1,27 +0,0 @@
{
"bin": [
"src/build/Debug/CQtDeployerEaxample",
"src/build/Debug/CQtDeployerEaxample.exe"
],
"clear": true,
"binPrefix": "/media/D/builds/build-CQtDeployerCmakePort-Desktop_Qt_5_15_2_GCC_64bit-Debug",
"libDir": [
"/media/D/builds/CQtDeployerCmakePort",
"/home/andrei/Qt/5.15.2/gcc_64",
"/media/D/builds/build-CQtDeployerCmakePort-Desktop_Qt_5_15_2_GCC_64bit-Debug"
],
"recursiveDepth": "10",
"deploySystem": false,
"qmlDir": "../",
"deb": true,
"qif": true,
"zip": true,
"ignoreEnv": [
"/media/D/builds/CQtDeployerCmakePort/Distro"
],
"extraLib": "crypto",
"targetDir": "/media/D/builds/CQtDeployerCmakePort/Distro",
"deployVersion": "",
}

8
src/CQtDeployer/Deploy/CQtDeployer.json.in

@ -1,7 +1,7 @@
{
"bin": [
"src/build/Debug/CQtDeployerEaxample",
"src/build/Debug/CQtDeployerEaxample.exe"
"src/CQtDeployer/CQtDeployer",
"src/CQtDeployer/CQtDeployer.exe"
],
"clear": true,
"binPrefix": "@CMAKE_BINARY_DIR@",
@ -12,16 +12,14 @@
],
"recursiveDepth": "10",
"deploySystem": false,
"qmlDir": "../",
"deb": true,
"qif": true,
"zip": true,
"ignoreEnv": [
"@CMAKE_SOURCE_DIR@/Distro"
],
"extraLib": "crypto",
"targetDir": "@CMAKE_SOURCE_DIR@/Distro",
"deployVersion": "@CQtDeployer_VERSION@",
"deployVersion": "@CQtDeployer_VERSION@"
}

2
src/LibDeploy/CMakeLists.txt

@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.18)
get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME)
set(CURRENT_PROJECT "${PROJECT_NAME}${CURRENT_PROJECT_DIR}")
set(CURRENT_PROJECT "${CURRENT_PROJECT_DIR}")
add_definitions(-DCQT_DEPLOYER_LIBRARY)

2
submodules/QuasarAppLib

@ -1 +1 @@
Subproject commit 00cdfae297832196ef1d4268c7bfcdbbb20eaf19
Subproject commit 5bf7366b6dcd57720f5d145ed987134a61aaf2e5

4
tests/CMakeLists.txt

@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.18)
get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME)
set(CURRENT_PROJECT "${PROJECT_NAME}${CURRENT_PROJECT_DIR}")
set(CURRENT_PROJECT "${PROJECT_NAME}-${CURRENT_PROJECT_DIR}")
file(GLOB_RECURSE SOURCE_CPP
"*.cpp" "*.h" "*.qrc"
@ -24,7 +24,7 @@ add_definitions(-DQT_BASE_DIR="${QT_QT_ROOT}")
add_definitions(-DTEST_BIN_DIR="${CMAKE_CURRENT_LIST_DIR}")
add_executable(${CURRENT_PROJECT} ${SOURCE_CPP})
target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test ${PROJECT_NAME}LibDeploy)
target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test LibDeploy)
target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})