diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2020-01-09 15:57:05 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-01-09 15:57:05 +0100 |
| commit | b0e4ec4961e1de67730b83d773a2bf7a0e3dca9c (patch) | |
| tree | d47c4dc19724f24a895058bd65f99d042b373747 /default_build_settings.cmake | |
| parent | 316675de61aab9b287de413a5e67b941c9a84c38 (diff) | |
Add default VESPA_CPU_ARCH_FLAGS setting when using clang on Fedora.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index ba961f39be8..a99a391e81a 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -95,6 +95,7 @@ function(vespa_use_default_build_settings) unset(DEFAULT_EXTRA_LINK_DIRECTORY) unset(DEFAULT_EXTRA_INCLUDE_DIRECTORY) unset(DEFAULT_VESPA_USER) + unset(DEFAULT_VESPA_CPU_ARCH_FLAGS) if(NOT DEFINED VESPA_UNPRIVILEGED) message("-- Setting VESPA_UNPRIVILEGED to yes") set(VESPA_UNPRIVILEGED "yes" PARENT_SCOPE) @@ -166,6 +167,11 @@ function(vespa_use_default_build_settings) if(NOT DEFINED DEFAULT_EXTRA_INCLUDE_DIRECTORY) set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include") endif() + if(NOT DEFINED DEFAULT_VESPA_CPU_ARCH_FLAGS) + if(VESPA_OS_DISTRO STREQUAL "fedora" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=westmere") + endif() + endif() if(DEFINED DEFAULT_CMAKE_INSTALL_PREFIX) message("-- DEFAULT_CMAKE_INSTALL_PREFIX is ${DEFAULT_CMAKE_INSTALL_PREFIX}") endif() @@ -184,6 +190,9 @@ function(vespa_use_default_build_settings) if(DEFINED DEFAULT_VESPA_USER) message("-- DEFAULT_VESPA_USER is ${DEFAULT_VESPA_USER}") endif() + if(DEFINED DEFAULT_VESPA_CPU_ARCH_FLAGS) + message("-- DEFAULT_VESPA_CPU_ARCH_FLAGS is ${DEFAULT_VESPA_CPU_ARCH_FLAGS}") + endif() if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND DEFINED DEFAULT_CMAKE_INSTALL_PREFIX) message("-- Setting CMAKE_INSTALL_PREFIX to ${DEFAULT_CMAKE_INSTALL_PREFIX}") set(CMAKE_INSTALL_PREFIX "${DEFAULT_CMAKE_INSTALL_PREFIX}" CACHE PATH "Install prefix for vespa project" FORCE) @@ -232,6 +241,10 @@ function(vespa_use_default_build_settings) message("-- Setting VESPA_USER to ${DEFAULT_VESPA_USER}") set(VESPA_USER "${DEFAULT_VESPA_USER}" PARENT_SCOPE) endif() + if(NOT DEFINED VESPA_CPU_ARCH_FLAGS AND DEFINED DEFAULT_VESPA_CPU_ARCH_FLAGS) + message("-- Setting VESPA_CPU_ARCH_FLAGS to ${DEFAULT_VESPA_CPU_ARCH_FLAGS}") + set(VESPA_CPU_ARCH_FLAGS "${DEFAULT_VESPA_CPU_ARCH_FLAGS}" PARENT_SCOPE) + endif() endfunction() function(vespa_use_default_cxx_compiler) |