QuasarApp/CMakeProject
Template
4
0
Fork 0
mirror of https://github.com/QuasarApp/CMakeProject.git synced 2025-05-04 09:19:36 +00:00
Code Issues Projects Releases Wiki Activity

fix deploy

Browse Source
This commit is contained in:
Andrei Yankovich 2021-09-09 20:20:10 +03:00
parent 30bab987a5
commit 09b4c91510
3 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -6,7 +6,7 @@
#
cmake_minimum_required(VERSION 3.14)
project(RENAME_ME)
project(RENAME_ME LANGUAGES CXX)
if(TARGET ${PROJECT_NAME})
message("The ${PROJECT_NAME} arledy included in main Project")
return()

32
src/Example/CMakeLists.txt
View File

@ -47,19 +47,18 @@ target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME})
target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR})
if (${QT_VERSION_MAJOR})
SET(TARGET_DIR "${CMAKE_SOURCE_DIR}/Distro")
file(MAKE_DIRECTORY ${TARGET_DIR})
SET(TARGET_DIR "${CMAKE_SOURCE_DIR}/Distro")
file(MAKE_DIRECTORY ${TARGET_DIR})
if (ANDROID)
if (ANDROID)
set(SNAKE_EXTRA_LIBS
${CURRENT_PROJECT}
# libName
# libName
)
# find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AndroidExtras REQUIRED)
# target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::AndroidExtras)
# find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AndroidExtras REQUIRED)
# target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::AndroidExtras)
addDeployAPK(${CURRENT_PROJECT}
"${CMAKE_CURRENT_LIST_DIR}/android"
@ -83,18 +82,20 @@ if (${QT_VERSION_MAJOR})
SOURCES ${java_files}
)
else()
else()
# Desctop deploying
addDeployFromCustomFile("RENAME_ME" "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/RENAME_ME.json")
addDeployFromCustomFile("RENAME_ME" "${CMAKE_CURRENT_SOURCE_DIR}/../../Deploy/RENAME_ME.json")
endif()
endif()
if(QT_VERSION_MAJOR EQUAL 6)
qt_import_qml_plugins(${CURRENT_PROJECT})
if(QT_VERSION_MAJOR EQUAL 6)
# Add This line if your project use the Quick module
# qt_import_qml_plugins(${CURRENT_PROJECT})
qt_finalize_executable(${CURRENT_PROJECT})
endif()
endif()
set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts
set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts
${CMAKE_CURRENT_SOURCE_DIR}/languages/ru.ts
${CMAKE_CURRENT_SOURCE_DIR}/languages/uk.ts
${CMAKE_CURRENT_SOURCE_DIR}/languages/ja.ts
@ -105,7 +106,6 @@ if (${QT_VERSION_MAJOR})
${CMAKE_CURRENT_SOURCE_DIR}/languages/es.ts
${CMAKE_CURRENT_SOURCE_DIR}/languages/pl.ts)
prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}")
endif()
prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}")

2
src/Library/CMakeLists.txt
View File

@ -31,7 +31,7 @@ set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/private")
add_library(${PROJECT_NAME} ${SOURCE_CPP} ${SOURCE_QRC})
if (${QT_VERSION_MAJOR})
target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Core)
target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Core )
endif()
target_include_directories(${PROJECT_NAME} PUBLIC ${PUBLIC_INCUDE_DIR})