From 5a6d97ffb164bedab3a6bbe3c926e617b6dfd48e Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 21 Sep 2020 20:26:40 +0300 Subject: [PATCH] fix wasm --- CMakeLists.txt | 4 ++++ Site/BaseFront/CMakeLists.txt | 2 +- Site/BaseFront/Front/CMakeLists.txt | 2 +- Site/CMakeLists.txt | 3 ++- Site/QuasarAppLib | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d475891..510d5b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,11 @@ cmake_minimum_required(VERSION 3.5) +set(BUILD_SHARED_LIBS ON) + include(Site/QuasarAppLib/CMake/ccache.cmake) +include(Site/QuasarAppLib/CMake/crossplatform/crossplatform.cmake) + # Add sub directories add_subdirectory(Site) diff --git a/Site/BaseFront/CMakeLists.txt b/Site/BaseFront/CMakeLists.txt index a74f7e4..97e8919 100644 --- a/Site/BaseFront/CMakeLists.txt +++ b/Site/BaseFront/CMakeLists.txt @@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.5) include(../../Site/QuasarAppLib/CMake/ccache.cmake) # Add sub directories -project(BaseFront LANGUAGES CXX) +project(BaseFront) if(TARGET ${PROJECT_NAME}) message("The ${PROJECT_NAME} arledy included in main Project") return() diff --git a/Site/BaseFront/Front/CMakeLists.txt b/Site/BaseFront/Front/CMakeLists.txt index 7cee4f3..4b6db1c 100644 --- a/Site/BaseFront/Front/CMakeLists.txt +++ b/Site/BaseFront/Front/CMakeLists.txt @@ -28,7 +28,7 @@ file(GLOB SOURCE_CPP ) -add_library(${CURRENT_PROJECT} SHARED ${SOURCE_CPP}) +add_library(${CURRENT_PROJECT} ${SOURCE_CPP}) target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt5::Core Qt5::Quick QuasarApp ) target_include_directories(${CURRENT_PROJECT} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src") diff --git a/Site/CMakeLists.txt b/Site/CMakeLists.txt index 18b1912..d148e69 100644 --- a/Site/CMakeLists.txt +++ b/Site/CMakeLists.txt @@ -7,12 +7,13 @@ cmake_minimum_required(VERSION 3.5) -project(Site LANGUAGES CXX) +project(Site) if(TARGET ${PROJECT_NAME}) message("The ${PROJECT_NAME} arledy included in main Project") return() endif() + add_subdirectory(QuasarAppLib) add_subdirectory(ViewSolutions) add_subdirectory(BaseFront) diff --git a/Site/QuasarAppLib b/Site/QuasarAppLib index bb6ced3..fec2b1d 160000 --- a/Site/QuasarAppLib +++ b/Site/QuasarAppLib @@ -1 +1 @@ -Subproject commit bb6ced3b798d2b7ad11b0563b387cebd51d9c436 +Subproject commit fec2b1d13b4b80aeda0d64ca9760e044fd878535