diff --git a/cmake/QtUtils.cmake b/cmake/QtUtils.cmake index ae8abad..3b1b4e4 100644 --- a/cmake/QtUtils.cmake +++ b/cmake/QtUtils.cmake @@ -57,7 +57,7 @@ endmacro() macro(find_qt5) set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) + #set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) add_definitions(-DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x060000) find_package(Qt5 COMPONENTS ${ARGN}) diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt index ff166d8..8eafe37 100644 --- a/extensions/CMakeLists.txt +++ b/extensions/CMakeLists.txt @@ -4,16 +4,16 @@ find_qt5(Core Widgets) cmake_policy(SET CMP0037 OLD) -add_library(Bing\ Translate SHARED bingtranslate.cpp extensionimpl.cpp) -add_library(Copy\ to\ Clipboard SHARED copyclipboard.cpp extensionimpl.cpp) -add_library(Extra\ Newlines SHARED extranewlines.cpp extensionimpl.cpp) -add_library(Extra\ Window SHARED extrawindow.cpp extensionimpl.cpp) -add_library(Google\ Translate SHARED googletranslate.cpp extensionimpl.cpp) -add_library(Lua SHARED lua.cpp extensionimpl.cpp) -add_library(Regex\ Filter SHARED regexfilter.cpp extensionimpl.cpp) -add_library(Remove\ Repetition SHARED removerepeat.cpp extensionimpl.cpp) -add_library(Replacer SHARED replacer.cpp extensionimpl.cpp) -add_library(Thread\ Linker SHARED threadlinker.cpp extensionimpl.cpp) +add_library(Bing\ Translate MODULE bingtranslate.cpp extensionimpl.cpp) +add_library(Copy\ to\ Clipboard MODULE copyclipboard.cpp extensionimpl.cpp) +add_library(Extra\ Newlines MODULE extranewlines.cpp extensionimpl.cpp) +add_library(Extra\ Window MODULE extrawindow.cpp extensionimpl.cpp) +add_library(Google\ Translate MODULE googletranslate.cpp extensionimpl.cpp) +add_library(Lua MODULE lua.cpp extensionimpl.cpp) +add_library(Regex\ Filter MODULE regexfilter.cpp extensionimpl.cpp) +add_library(Remove\ Repetition MODULE removerepeat.cpp extensionimpl.cpp) +add_library(Replacer MODULE replacer.cpp extensionimpl.cpp) +add_library(Thread\ Linker MODULE threadlinker.cpp extensionimpl.cpp) add_executable(Extension_Tests extensiontester.cpp) diff --git a/texthook/CMakeLists.txt b/texthook/CMakeLists.txt index 5c6c9cf..d59c983 100644 --- a/texthook/CMakeLists.txt +++ b/texthook/CMakeLists.txt @@ -27,6 +27,6 @@ set(texthook_src ) endif() -add_library(texthook SHARED ${texthook_src}) +add_library(texthook MODULE ${texthook_src}) target_link_libraries(texthook minhook)