ded/beerlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Submodule components was added

Browse Source
This commit is contained in:
Denis V. Dedkov
2023-04-13 08:36:14 +02:00
parent e9fc872466
commit 89bf4511e0
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@@ -0,0 +1,3 @@
[submodule "components"]
path = components
url = ssh://git@rpi2.local/git/components.git

11
CMakeLists.txt
View File

@@ -12,6 +12,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick WebSockets LinguistTools) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick WebSockets LinguistTools)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick WebSockets LinguistTools) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick WebSockets LinguistTools)
set(QML_IMPORT_PATH ${CMAKE_BINARY_DIR} CACHE STRING "" FORCE)
set(TS_FILES beerlog_ru_RU.ts) set(TS_FILES beerlog_ru_RU.ts)
set(PROJECT_SOURCES set(PROJECT_SOURCES
@@ -56,14 +57,10 @@ else()
qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES}) qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
endif() endif()
add_subdirectory(components)
target_link_libraries(beerlog target_link_libraries(beerlog
PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::WebSockets) PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::WebSockets componentsplugin)
if (ANDROID)
set_property(TARGET beerlog APPEND PROPERTY QT_ANDROID_EXTRA_LIBS ${COMPONENTS_LIB})
endif()
target_link_libraries(beerlog PRIVATE ${COMPONENTS_LIB})
set_target_properties(beerlog PROPERTIES set_target_properties(beerlog PROPERTIES
MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com

1
components Submodule

Submodule components added at 6c447e6b00