From bdd4397c8faff8c06de14637681a7dc4b8be44c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Sun, 17 Apr 2022 20:28:28 +0200 Subject: [PATCH] Update following cmake_common changes. --- CMakeLists.txt | 9 ++++----- src/CMakeLists.txt | 9 ++++----- src/SConscript | 11 ----------- src/previewBase.pro | 26 -------------------------- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 src/SConscript delete mode 100644 src/previewBase.pro diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c8cef0..01d0df9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,10 @@ cmake_minimum_required(VERSION 3.16) -project(preview_base) -set(project_type plugin) - if(DEFINED DEPENDENCIES_DIR) - include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/project.cmake) + include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake) else() - include(../cmake_common/project.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake) endif() + +project(preview_base) add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 23d6313..ac53ddf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,5 @@ cmake_minimum_required(VERSION 3.16) -if(DEFINED DEPENDENCIES_DIR) - include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/src.cmake) -else() - include(../../cmake_common/src.cmake) -endif() \ No newline at end of file + +add_library(preview_base SHARED) +mo2_configure_plugin(preview_base WARNINGS OFF) +mo2_install_target(preview_base) diff --git a/src/SConscript b/src/SConscript deleted file mode 100644 index a595d13..0000000 --- a/src/SConscript +++ /dev/null @@ -1,11 +0,0 @@ -Import('qt_env') - -env = qt_env.Clone() - -env.AppendUnique(CPPDEFINES = [ 'PREVIEWBASE_LIBRARY' ]) - -lib = env.SharedLibrary('previewBase', env.Glob('*.cpp')) -env.InstallModule(lib) - -res = env['QT_USED_MODULES'] -Return('res') diff --git a/src/previewBase.pro b/src/previewBase.pro deleted file mode 100644 index 2236510..0000000 --- a/src/previewBase.pro +++ /dev/null @@ -1,26 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2014-01-14T19:50:56 -# -#------------------------------------------------- - -TARGET = previewBase -TEMPLATE = lib - -CONFIG += plugins -CONFIG += dll - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets gui - -DEFINES += PREVIEWBASE_LIBRARY - -SOURCES += previewbase.cpp - -HEADERS += previewbase.h - - -include(../plugin_template.pri) - -OTHER_FILES += \ - previewbase.json\ - SConscript