Update following cmake_common changes.

This commit is contained in:
Mikaël Capelle
2022-04-19 23:30:01 +02:00
parent aa1b0d725c
commit 8d4c514c4d
4 changed files with 8 additions and 70 deletions
+4 -6
View File
@@ -1,12 +1,10 @@
cmake_minimum_required(VERSION 3.16)
project(diagnose_basic)
set(project_type plugin)
set(enable_warnings OFF)
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(diagnose_basic)
add_subdirectory(src)
+4 -5
View File
@@ -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()
add_library(diagnose_basic SHARED)
mo2_configure_plugin(diagnose_basic WARNINGS OFF PRIVATE_DEPENDS boost)
mo2_install_target(diagnose_basic)
-24
View File
@@ -1,24 +0,0 @@
Import('qt_env')
env = qt_env.Clone()
env.AppendUnique(CPPDEFINES = [
'DIAGNOSEBASIC_LIBRARY',
'NOMINMAX',
# suppress a few warnings caused by boost vs vc++ paranoia
'_SCL_SECURE_NO_WARNINGS'
])
# Boost produces very long names with msvc truncates. Doesn't seem to cause
# problems.
env.AppendUnique(CPPFLAGS = [ '-wd4503' ])
env.AppendUnique(CPPPATH = [
'${BOOSTPATH}'
])
lib = env.SharedLibrary('diagnoseBasic', env.Glob('*.cpp'))
env.InstallModule(lib)
res = env['QT_USED_MODULES']
Return('res')
-35
View File
@@ -1,35 +0,0 @@
#-------------------------------------------------
#
# Project created by QtCreator 2013-04-05T21:08:10
#
#-------------------------------------------------
TARGET = diagnoseBasic
TEMPLATE = lib
CONFIG += plugins
CONFIG += dll
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
DEFINES += DIAGNOSEBASIC_LIBRARY
DEFINES += NOMINMAX
# suppress a few warnings caused by boost vs vc++ paranoia
DEFINES += _SCL_SECURE_NO_WARNINGS
SOURCES += diagnosebasic.cpp
HEADERS += diagnosebasic.h
include(../plugin_template.pri)
INCLUDEPATH += "$${BOOSTPATH}"
#CONFIG += dll
#DEFINES += INIEDITOR_LIBRARY
OTHER_FILES += \
diagnosebasic.json\
SConscript