From 916bc985f01128670c6325bf95a487ccc769777f Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 25 Aug 2016 05:00:31 +0000 Subject: [PATCH] goodbye custom flags, Mac OS X build is broken cuz frameworks Signed-off-by: Ivailo Monev --- cmake/modules/KatieBuildMacros.cmake | 23 +------------- mkspecs/darwin/darwin.cmake | 7 ----- mkspecs/freebsd/freebsd.cmake | 5 --- mkspecs/linux/linux.cmake | 15 --------- mkspecs/mac/mac.cmake | 42 ------------------------- src/shared/bootstrap.cmake | 2 -- tests/benchmarks/core/tools/qstring/qstring.pro | 4 --- 7 files changed, 1 insertion(+), 97 deletions(-) delete mode 100644 tests/benchmarks/core/tools/qstring/qstring.pro diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake index 45d43feab..13c78f3ff 100644 --- a/cmake/modules/KatieBuildMacros.cmake +++ b/cmake/modules/KatieBuildMacros.cmake @@ -94,9 +94,7 @@ endmacro() # null so that when it is passed to another function/macro it does not complain # about inproper number of arguments and (2) it joins the input which if quoted # has semicolons in it (if it is a list) that the sub-command (e.g. gcc) can -# not handle. that's a dirty hack to support gcc and clang at the same time -# along with custom target COMPILE_FLAGS/LINK_FLAGS without doing compiler -# checks all over the place. +# not handle. function(KATIE_FIXUP_STRING INSTR OUTSTR) string(STRIP "${INSTR}" instrtrimmed) if("${instrtrimmed}" STREQUAL "") @@ -107,25 +105,6 @@ function(KATIE_FIXUP_STRING INSTR OUTSTR) endif() endfunction() -macro(KATIE_SETUP_FLAGS FORTARGET) - katie_fixup_string("${KATIE_CXXFLAGS}" KATIE_CXXFLAGS) - katie_fixup_string("${KATIE_LDFLAGS}" KATIE_LDFLAGS) - - # since some compilers choke CXX flags when building C sources just filter - # the C++-specific flags instead of using KATIE_CFLAGS due to lack of - # per-language properties (e.g. CXX_COMPILE_FLAGS) - set(KATIE_CFILTER "-fvisibility-inlines-hidden" CACHE STRING "C flags to filter from the C++ flags") - set(modflags "${KATIE_CXXFLAGS}") - foreach(cxxflag ${KATIE_CFILTER}) - string(REPLACE "${cxxflag}" " " modflags "${modflags}") - endforeach() - - set_target_properties(${FORTARGET} PROPERTIES - COMPILE_FLAGS "${modflags}" - LINK_FLAGS "${KATIE_LDFLAGS}" - ) -endmacro() - function(KATIE_SETUP_TARGET FORTARGET) set(resourcesdep "${CMAKE_CURRENT_BINARY_DIR}/${FORTARGET}_resources.cpp") if(NOT EXISTS "${resourcesdep}") diff --git a/mkspecs/darwin/darwin.cmake b/mkspecs/darwin/darwin.cmake index ce61e063d..602cd3fb7 100644 --- a/mkspecs/darwin/darwin.cmake +++ b/mkspecs/darwin/darwin.cmake @@ -1,8 +1 @@ -set(KATIE_LDFLAGS - ${KATIE_LDFLAGS} - -headerpad_max_install_names - -current_version" " - -compatibility_version" " -) - add_definitions(-D__USE_WS_X11__) diff --git a/mkspecs/freebsd/freebsd.cmake b/mkspecs/freebsd/freebsd.cmake index 4af3cf3f5..6aff4c79b 100644 --- a/mkspecs/freebsd/freebsd.cmake +++ b/mkspecs/freebsd/freebsd.cmake @@ -2,11 +2,6 @@ if("${KATIE_COMPILER}" MATCHES "(gcc|clang)") set(QT_VISIBILITY_AVAILABLE TRUE) endif() -set(KATIE_CXXFLAGS - ${KATIE_CXXFLAGS} - -pthread -) - add_definitions(-D_THREAD_SAFE) set(QT_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}") diff --git a/mkspecs/linux/linux.cmake b/mkspecs/linux/linux.cmake index 1185f070a..580eca68d 100644 --- a/mkspecs/linux/linux.cmake +++ b/mkspecs/linux/linux.cmake @@ -1,19 +1,4 @@ if("${KATIE_COMPILER}" MATCHES "(gcc|clang)") - set(KATIE_CXXFLAGS - ${KATIE_CXXFLAGS} - -fvisibility=hidden -fvisibility-inlines-hidden - -Wformat -Werror=format-security - -Wall -Wundef -Wunused - # -fno-strict-aliasing -Wcast-align - # -Wmissing-noreturn -Winit-self -Winline -Wcast-qual - ) - set(KATIE_LDFLAGS - ${KATIE_LDFLAGS} - -Wl,-O1 - -Wl,--no-undefined - -Wl,-Bsymbolic-functions - # -Wl,--dynamic-list - ) set(QT_VISIBILITY_AVAILABLE TRUE) endif() diff --git a/mkspecs/mac/mac.cmake b/mkspecs/mac/mac.cmake index 51cb6ccc9..9032058c5 100644 --- a/mkspecs/mac/mac.cmake +++ b/mkspecs/mac/mac.cmake @@ -2,49 +2,7 @@ if("${KATIE_COMPILER}" STREQUAL "gcc") add_dependencies(-D__APPLE__ -D__GNUC__) endif() -if("${KATIE_ARCHITECTURE}" STREQUAL "i386") - set(KATIE_CXXFLAGS - ${KATIE_CXXFLAGS} - -arch i386 - ) -elseif("${KATIE_ARCHITECTURE}" STREQUAL "x86_64") - set(KATIE_CXXFLAGS - ${KATIE_CXXFLAGS} - -arch i386 - ) - if("${KATIE_COMPILER}" STREQUAL "gcc") - set(KATIE_CXXFLAGS - ${KATIE_CXXFLAGS} - -Xarch_x86_64 -mmacosx-version-min=10.5 - ) - endif() -elseif("${KATIE_ARCHITECTURE}" STREQUAL "ppc") - set(KATIE_CXXFLAGS - ${KATIE_CXXFLAGS} - -arch ppc - ) -elseif("${KATIE_ARCHITECTURE}" STREQUAL "ppc64") - set(KATIE_CXXFLAGS - ${KATIE_CXXFLAGS} - -arch ppc64 - ) - if("${KATIE_COMPILER}" STREQUAL "gcc") - set(KATIE_CXXFLAGS - ${KATIE_CXXFLAGS} - -Xarch_ppc64 -mmacosx-version-min=10.5 - ) - endif() -endif() - if("${KATIE_COMPILER}" MATCHES "(gcc|clang)") - set(KATIE_CXXFLAGS - ${KATIE_CXXFLAGS} - -fvisibility=hidden -fvisibility-inlines-hidden - -Wformat -Werror=format-security - -Wall -Wundef -Wunused - # -fno-strict-aliasing -Wcast-align - # -Wmissing-noreturn -Winit-self -Winline -Wcast-qual - ) set(QT_VISIBILITY_AVAILABLE TRUE) endif() diff --git a/src/shared/bootstrap.cmake b/src/shared/bootstrap.cmake index 857d04d3e..ee31d2f4e 100644 --- a/src/shared/bootstrap.cmake +++ b/src/shared/bootstrap.cmake @@ -116,5 +116,3 @@ endif() add_library(bootstrap OBJECT ${BOOTSTRAP_SOURCES}) target_compile_definitions(bootstrap PRIVATE ${BOOTSTRAP_DEFINITIONS}) target_include_directories(bootstrap PRIVATE ${BOOTSTRAP_INCLUDES}) - -katie_setup_flags(bootstrap) diff --git a/tests/benchmarks/core/tools/qstring/qstring.pro b/tests/benchmarks/core/tools/qstring/qstring.pro deleted file mode 100644 index 417961e8c..000000000 --- a/tests/benchmarks/core/tools/qstring/qstring.pro +++ /dev/null @@ -1,4 +0,0 @@ -sse4:QMAKE_CXXFLAGS += -msse4 -else:ssse3:QMAKE_FLAGS += -mssse3 -else:sse2:QMAKE_CXXFLAGS += -msse2 -neon:QMAKE_CXXFLAGS += -mfpu=neon -- 2.11.0