chore(CPP): fix not finding module libs on linux/windows

Also fix moving window in new account wizzard

Updates: #6321
This commit is contained in:
Stefan 2022-07-27 10:47:13 +02:00 committed by Stefan Dunca
parent d5afd6beac
commit 1f43c541cf
9 changed files with 33 additions and 19 deletions

View File

@ -14,6 +14,8 @@ qt6_standard_project_setup()
qt6_add_qml_module(ApplicationCore
URI Status.ApplicationCore
VERSION 1.0
OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Status/ApplicationCore
)
add_library(Status::ApplicationCore ALIAS ApplicationCore)

View File

@ -59,6 +59,8 @@ Item {
id: swipeView
anchors.fill: parent
interactive: false
Repeater {
id: pageRepeater
model: pagesModel

View File

@ -13,29 +13,31 @@ find_package(GTest REQUIRED)
find_package(Qt6 ${STATUS_QT_VERSION} COMPONENTS Quick Qml REQUIRED)
qt6_standard_project_setup()
qt6_add_qml_module(${PROJECT_NAME}
URI Status.${PROJECT_NAME}
qt6_add_qml_module(OnboardingTestHelpers
URI Status.OnboardingTestHelpers
VERSION 1.0
)
add_library(Status::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
target_include_directories(${PROJECT_NAME}
OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Status/OnboardingTestHelpers/
)
add_library(Status::OnboardingTestHelpers ALIAS OnboardingTestHelpers)
target_include_directories(OnboardingTestHelpers
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_sources(${PROJECT_NAME}
target_sources(OnboardingTestHelpers
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/ScopedTestAccount.h
${CMAKE_CURRENT_SOURCE_DIR}/Constants.h
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/ScopedTestAccount.cpp
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
)
target_link_libraries(${PROJECT_NAME}
target_link_libraries(OnboardingTestHelpers
PUBLIC
Qt6::Quick
Qt6::Qml

View File

@ -9,7 +9,7 @@ set(QT_NO_CREATE_VERSIONLESS_FUNCTIONS true)
find_package(Qt6 ${STATUS_QT_VERSION} COMPONENTS Quick Qml REQUIRED)
qt6_standard_project_setup()
qt6_add_qml_module(${PROJECT_NAME}
qt6_add_qml_module(StatusQ
URI Status
VERSION 1.0
@ -26,7 +26,7 @@ add_subdirectory(qml/Status/Controls)
add_subdirectory(qml/Status/Core)
add_subdirectory(tests)
target_link_libraries(${PROJECT_NAME}
target_link_libraries(StatusQ
PRIVATE
Qt6::Quick
Qt6::Qml
@ -43,6 +43,6 @@ list(REMOVE_DUPLICATES QML_IMPORT_PATH)
install(
TARGETS
${PROJECT_NAME}
StatusQ
RUNTIME
)

View File

@ -21,7 +21,7 @@ qt6_add_qml_module(${PROJECT_NAME}
add_subdirectory(Navigation)
target_link_libraries(${PROJECT_NAME}
target_link_libraries(OnboardingTestHelpers
PRIVATE
Qt6::Quick
Qt6::Qml

View File

@ -13,18 +13,20 @@ find_package(GTest REQUIRED)
find_package(Qt6 ${STATUS_QT_VERSION} COMPONENTS Quick Qml REQUIRED)
qt6_standard_project_setup()
qt6_add_qml_module(${PROJECT_NAME}
URI Status.${PROJECT_NAME}
qt6_add_qml_module(TestHelpers
URI Status.TestHelpers
VERSION 1.0
)
add_library(Status::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
target_include_directories(${PROJECT_NAME}
OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Status/TestHelpers
)
add_library(Status::TestHelpers ALIAS TestHelpers)
target_include_directories(TestHelpers
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_sources(${PROJECT_NAME}
target_sources(TestHelpers
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/MonitorQtOutput.h
${CMAKE_CURRENT_SOURCE_DIR}/IOTestHelpers.h
@ -36,7 +38,7 @@ target_sources(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
)
target_link_libraries(${PROJECT_NAME}
target_link_libraries(TestHelpers
PUBLIC
Qt6::Quick
Qt6::Qml

View File

@ -22,6 +22,8 @@ qt6_add_qml_module(${PROJECT_NAME}
infura_key
node-config.json
RESOURCE_PREFIX ""
OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Status/StaticConfig
)
add_library(Status::${PROJECT_NAME} ALIAS ${PROJECT_NAME})

View File

@ -20,6 +20,8 @@ qt6_add_qml_module(${PROJECT_NAME}
Inter/Inter-Regular.otf
RESOURCE_PREFIX ""
OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Status/FontsAssets
)
target_link_libraries(${PROJECT_NAME}

View File

@ -32,6 +32,8 @@ qt6_add_qml_module(${PROJECT_NAME}
png/status-logo.png
RESOURCE_PREFIX ""
OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Status/UiAssets
)
target_link_libraries(${PROJECT_NAME}