From 9e4a2931c4828eae90904c18c4b0cf1c884761c3 Mon Sep 17 00:00:00 2001 From: zhupengfei Date: Sun, 17 May 2020 09:32:37 +0800 Subject: [PATCH] Revert "Try move static to the project scope" This reverts commit afc7a2cbe068659ad0d73a35e1af25e4b0f557aa. --- CMakeLists.txt | 13 ------------- src/CMakeLists.txt | 12 ++++++++++++ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ba38c4..49363f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,19 +128,6 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$") set(PLATFORM_LIBRARIES rt) endif() - -if (MINGW) - add_definitions(-DMINGW_HAS_SECURE_API) - if (COMPILE_WITH_DWARF) - add_compile_options("-gdwarf") - endif() - - if (MINGW_STATIC_BUILD) - add_definitions(-DQT_STATICPLUGIN) - add_compile_options("-static") - endif() -endif() - # Include source code # =================== add_subdirectory(externals) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eac129e..00f31f8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -96,6 +96,18 @@ else() add_definitions(-D_FILE_OFFSET_BITS=64) endif() + if (MINGW) + add_definitions(-DMINGW_HAS_SECURE_API) + if (COMPILE_WITH_DWARF) + add_compile_options("-gdwarf") + endif() + + if (MINGW_STATIC_BUILD) + add_definitions(-DQT_STATICPLUGIN) + add_compile_options("-static") + endif() + endif() + # if (NOT DEBUG) # add_compile_options("-flto") # endif()