From 6797807bf25ec14e16557eefe757849420acd9ea Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 16 Aug 2020 10:58:20 +0400 Subject: [PATCH] Remove DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS since cmake has CMAKE_INTERPROCEDURAL_OPTIMIZATION --- init_target.cmake | 2 +- variables.cmake | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/init_target.cmake b/init_target.cmake index 463545a..936a364 100644 --- a/init_target.cmake +++ b/init_target.cmake @@ -45,7 +45,7 @@ function(init_target target_name) # init_target(my_target folder_name) XCODE_ATTRIBUTE_LLVM_LTO $,NO,YES> ) endif() - if (DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS) + if (DESKTOP_APP_SPECIAL_TARGET AND WIN32) set_target_properties(${target_name} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE True INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO True diff --git a/variables.cmake b/variables.cmake index 94a7244..dfbe70d 100644 --- a/variables.cmake +++ b/variables.cmake @@ -38,12 +38,6 @@ option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundle option(DESKTOP_APP_USE_ENCHANT "Use Enchant instead of bundled Hunspell. (Linux only)" OFF) set(DESKTOP_APP_WEBRTC_LOCATION "" CACHE STRING "WebRTC source root location.") -option(DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS "Enable IPO build optimizations." ${WIN32}) -if (DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS AND CMAKE_CXX_COMPILER_ID MATCHES "Clang") - message(WARNING "Clang cannot build Qt applications with IPO enabled due to upstream bug: https://bugreports.qt.io/browse/QTBUG-61710.") - set(DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS OFF) -endif() - set(disable_autoupdate 0) if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "" OR DESKTOP_APP_SPECIAL_TARGET STREQUAL "uwp" @@ -94,7 +88,7 @@ else() report_bad_special_target() endif() endif() - if (DESKTOP_APP_SPECIAL_TARGET OR DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS) + if (DESKTOP_APP_SPECIAL_TARGET) set(CMAKE_AR "gcc-ar") set(CMAKE_RANLIB "gcc-ranlib") set(CMAKE_NM "gcc-nm")