Skip to content
Permalink
Browse files
fix inline-treshold compile flag
  • Loading branch information
PeterPetrik committed Jun 7, 2021
1 parent 2dabe3f commit c37b6c1a44532fd3bb811022ed7af5d81cecb63d
Showing with 1 addition and 8 deletions.
  1. +0 −7 CMakeLists.txt
  2. +1 −1 src/core/CMakeLists.txt
@@ -47,13 +47,6 @@ if (APPLE)
if ( QGIS_MAC_DEPS_DIR )
set(ENV{LIB_DIR} ${QGIS_MAC_DEPS_DIR})
list(APPEND CMAKE_PREFIX_PATH ${QGIS_MAC_DEPS_DIR})

# o2/o3 optimization with clang12 uses too much memory
# see https://github.com/qgis/QGIS-Mac-Packager/issues/132
if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-inline")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-inline")
endif()
endif()
endif()

@@ -1698,7 +1698,7 @@ endif()
if(NOT MSVC)
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo))
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp PROPERTIES COMPILE_FLAGS "-O1")
set_source_files_properties(qgscoordinatereferencesystem.cpp PROPERTIES COMPILE_FLAGS "-mllvm -inline-threshold=128")
set_source_files_properties(proj/qgscoordinatereferencesystem.cpp PROPERTIES COMPILE_FLAGS "-mllvm -inline-threshold=128")
endif()
endif()

0 comments on commit c37b6c1

Please sign in to comment.