aboutsummaryrefslogtreecommitdiffstats
path: root/default_build_settings.cmake
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2020-01-24 14:57:54 +0100
committerTor Egge <Tor.Egge@broadpark.no>2020-01-24 14:57:54 +0100
commit49f7e740df92ac3e4a54cff0e3be77cf84747271 (patch)
tree2b02d4975a7e73c48ba23d33afe3ecb6c722257f /default_build_settings.cmake
parente25239aeca66039d5b64ee2193760511bb5e52e7 (diff)
VESPA_CPU_ARCH_FLAGS now includes tune setting.
Diffstat (limited to 'default_build_settings.cmake')
-rw-r--r--default_build_settings.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake
index a99a391e81a..21622ade9fc 100644
--- a/default_build_settings.cmake
+++ b/default_build_settings.cmake
@@ -169,7 +169,9 @@ function(vespa_use_default_build_settings)
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")
+ set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=westmere -mtune=haswell")
+ else()
+ set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-mtune=intel")
endif()
endif()
if(DEFINED DEFAULT_CMAKE_INSTALL_PREFIX)
@@ -190,9 +192,7 @@ 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()
+ message("-- DEFAULT_VESPA_CPU_ARCH_FLAGS is ${DEFAULT_VESPA_CPU_ARCH_FLAGS}")
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)