|
|
@@ -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${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(PROJECT_SOURCES
|
|
|
@@ -56,14 +57,10 @@ else()
|
|
|
qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
|
|
|
endif()
|
|
|
|
|
|
-target_link_libraries(beerlog
|
|
|
- PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::WebSockets)
|
|
|
-
|
|
|
-if (ANDROID)
|
|
|
- set_property(TARGET beerlog APPEND PROPERTY QT_ANDROID_EXTRA_LIBS ${COMPONENTS_LIB})
|
|
|
-endif()
|
|
|
+add_subdirectory(components)
|
|
|
|
|
|
-target_link_libraries(beerlog PRIVATE ${COMPONENTS_LIB})
|
|
|
+target_link_libraries(beerlog
|
|
|
+ PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::WebSockets componentsplugin)
|
|
|
|
|
|
set_target_properties(beerlog PROPERTIES
|
|
|
MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
|
