From 547d6a4a8ed5ac2e8d922c0c7cfb294e0a3ceed4 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 23 Oct 2018 11:53:50 +0200 Subject: Fix link errors --- 3rd-party/SingleApplication/meson.build | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to '3rd-party') diff --git a/3rd-party/SingleApplication/meson.build b/3rd-party/SingleApplication/meson.build index a52df27..54ef8e4 100644 --- a/3rd-party/SingleApplication/meson.build +++ b/3rd-party/SingleApplication/meson.build @@ -6,7 +6,8 @@ SingleApplication_moc = qt5.preprocess( ) SingleApplication_lib = static_library('SingleApplication', - ['SingleApplication.git/singleapplication.cpp', 'SingleApplication.git/singleapplication_p.cpp'], + ['SingleApplication.git/singleapplication.cpp', 'SingleApplication.git/singleapplication_p.cpp', SingleApplication_moc], + include_directories: SingleApplication_inc, cpp_args : '-DQAPPLICATION_CLASS=QApplication', dependencies: dep_qt5 ) @@ -16,10 +17,6 @@ dep_SingleApplication = declare_dependency( link_with: SingleApplication_lib ) -# target_include_directories(['SingleApplication', 'PUBLIC', 'SingleApplication.git']) -# target_link_libraries(['SingleApplication', 'Qt5::Core', 'Qt5::Network', 'Qt5::Widgets']) -# target_compile_definitions(['SingleApplication', 'PRIVATE', 'QAPPLICATION_CLASS=QApplication']) - #if cmake_system_name, 'MATCHES', 'Windows' # target_link_libraries(['SingleApplication', 'Advapi32']) #endif -- cgit v1.2.1