diff options
| -rw-r--r-- | default_build_settings.cmake | 8 | ||||
| -rw-r--r-- | document/src/vespa/document/select/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 5a21d12d0c6..d46b9a71f08 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -25,7 +25,7 @@ function(vespa_use_default_cmake_install_prefix) set(DEFAULT_CMAKE_INSTALL_PREFIX "/opt/vespa") if(COMMAND vespa_use_specific_install_prefix) vespa_use_specific_install_prefix() - endif() + endif() else() set(DEFAULT_CMAKE_INSTALL_PREFIX "$ENV{HOME}/vespa") endif() @@ -129,9 +129,9 @@ function(vespa_use_default_build_settings) if(NOT DEFINED DEFAULT_VESPA_CPU_ARCH_FLAGS) message("-- CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}") if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") - if(VESPA_OS_DISTRO STREQUAL "fedora" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + if(APPLE AND (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang"))) + elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=westmere -mtune=haswell") - elseif(APPLE AND (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang"))) else() set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-mtune=intel") endif() @@ -207,7 +207,7 @@ function(vespa_use_default_cxx_compiler) if(APPLE) set(DEFAULT_CMAKE_C_COMPILER, "/usr/local/opt/llvm/bin/clang") set(DEFAULT_CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++") - elseif(VESPA_OS_DISTRO STREQUAL "fedora") + elseif(EXISTS "/usr/bin/clang" AND EXISTS "/usr/bin/clang++") set(DEFAULT_CMAKE_C_COMPILER "/usr/bin/clang") set(DEFAULT_CMAKE_CXX_COMPILER "/usr/bin/clang++") else() diff --git a/document/src/vespa/document/select/CMakeLists.txt b/document/src/vespa/document/select/CMakeLists.txt index ef486757ea7..5dd274fdb91 100644 --- a/document/src/vespa/document/select/CMakeLists.txt +++ b/document/src/vespa/document/select/CMakeLists.txt @@ -50,4 +50,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set_source_files_properties(${BISON_DocSelParser_OUTPUTS} PROPERTIES COMPILE_FLAGS -Wno-noexcept) elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0) set_source_files_properties(${BISON_DocSelParser_OUTPUTS} PROPERTIES COMPILE_OPTIONS "-Wno-unused-but-set-variable") +elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set_source_files_properties(${BISON_DocSelParser_OUTPUTS} PROPERTIES COMPILE_OPTIONS "-Wno-deprecated-copy-with-user-provided-copy") endif() |