From bb37a07a663f6e8a64ef098edb995adc150519db Mon Sep 17 00:00:00 2001 From: EndrII Date: Fri, 16 Apr 2021 16:38:22 +0300 Subject: [PATCH] fix example --- CMakeLists.txt | 1 - Examples/CMakeLists.txt | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ce9b112..809e7a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,5 +46,4 @@ endif() initAll() - addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 3144f78..804a889 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -9,17 +9,12 @@ cmake_minimum_required(VERSION 3.5) project(ViewSolutionsExamples LANGUAGES CXX) -include(../ViewSolutions/CMake/ProjectOut.cmake) - set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED) - file(GLOB SOURCE_CPP "src/*.cpp" "src/*.qrc" @@ -27,7 +22,7 @@ file(GLOB SOURCE_CPP ) if(ANDROID) - add_library(${PROJECT_NAME} SHARED ${SOURCE_CPP}) + add_library(${PROJECT_NAME} ${SOURCE_CPP}) else() add_executable(${PROJECT_NAME} ${SOURCE_CPP}) endif()