From 8f98ddec2eb7a2eeefb0e21bdb0243b2dbe8a3e8 Mon Sep 17 00:00:00 2001 From: EndrII Date: Fri, 16 Apr 2021 16:40:24 +0300 Subject: [PATCH] simple fixex --- CMakeLists.txt | 7 +++++++ example/CMakeLists.txt | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea0cc94..d6472eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,9 +16,16 @@ endif() if (NOT DEFINED LOGINVIEW_EXAMPLES) set(LOGINVIEW_EXAMPLES ON) + if (DEFINED TARGET_PLATFORM_TOOLCHAIN) + if (${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32") + set(LOGINVIEW_EXAMPLES OFF) + endif() + endif() + if (ANDROID) set(LOGINVIEW_EXAMPLES OFF) endif() + endif() include(CMake/QuasarAppCITargets.cmake) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index fc4a3da..2bd9639 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -18,13 +18,11 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -include(${CMAKE_CURRENT_SOURCE_DIR}/../CMake/ProjectOut.cmake) - find_package(QT NAMES Qt6 Qt5 COMPONENTS Core QuickControls2 REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core QuickControls2 REQUIRED) if(ANDROID) - add_library(${PROJECT_NAME} SHARED + add_library(${PROJECT_NAME} main.cpp lv_example_res.qrc )