4
0
mirror of https://github.com/QuasarApp/QuasarAppLib.git synced 2025-05-04 13:39:42 +00:00

Merge branch 'wasm_32'

This commit is contained in:
Andrei Yankovich 2020-09-21 20:20:52 +03:00
commit c4a1b14149
2 changed files with 4 additions and 4 deletions

2
CMake

@ -1 +1 @@
Subproject commit a10b5073fea0b0d6012ac7d6aee3b77a2c6cbf82
Subproject commit 104b9eab5d710977be485139918f8f15e3970a34

@ -12,7 +12,7 @@ else()
add_definitions(-DQUASARAPP_LIBRARY)
endif()
project(QuasarApp LANGUAGES CXX)
project(QuasarApp)
if(TARGET ${PROJECT_NAME})
message("The ${PROJECT_NAME} arledy included in main Project")
@ -20,7 +20,7 @@ if(TARGET ${PROJECT_NAME})
endif()
cmake_minimum_required(VERSION 3.1)
include(CMake/crossplatform/crossplatform.cmake)
#include(CMake/crossplatform/crossplatform.cmake)
include(CMake/ProjectOut.cmake)
@ -40,7 +40,7 @@ file(GLOB SOURCE_CPP
"*.cpp"
)
add_library(${PROJECT_NAME} SHARED ${SOURCE_CPP})
add_library(${PROJECT_NAME} ${SOURCE_CPP})
target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})