diff options
| author | Tor Egge <Tor.Egge@online.no> | 2023-03-13 12:15:02 +0000 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2023-03-13 12:15:02 +0000 |
| commit | e77611a6e5ac63f48929e68357f11aeba21c7a77 (patch) | |
| tree | d0466362423303dc0c727c6ace21f9f92c4b6d9f | |
| parent | e73005677cdbc12d1cb613e3020b4fa0dbaef268 (diff) | |
Adjust default build settings for Ubuntu 22.04.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | default_build_settings.cmake | 4 | ||||
| -rw-r--r-- | searchlib/src/tests/engine/proto_converter/CMakeLists.txt | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c995007663d..11fc48647c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,6 +54,8 @@ find_package(GTest REQUIRED) set(PYBIND11_FIND_PYTHON ON) find_package(pybind11 CONFIG REQUIRED) +find_package(Protobuf REQUIRED) + include(build_settings.cmake) # Enable CTest unit testing diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 72998003338..c82bb91accc 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -208,6 +208,10 @@ function(vespa_use_default_cxx_compiler) elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "amzn 2") set(DEFAULT_CMAKE_C_COMPILER "/usr/bin/gcc10-gcc") set(DEFAULT_CMAKE_CXX_COMPILER "/usr/bin/gcc10-g++") + elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "ubuntu 22.04" AND + EXISTS "/usr/bin/gcc-12" AND EXISTS "/usr/bin/g++-12") + set(DEFAULT_CMAKE_C_COMPILER "/usr/bin/gcc-12") + set(DEFAULT_CMAKE_CXX_COMPILER "/usr/bin/g++-12") endif() elseif(VESPA_COMPILER_VARIANT STREQUAL "clang") if(APPLE) diff --git a/searchlib/src/tests/engine/proto_converter/CMakeLists.txt b/searchlib/src/tests/engine/proto_converter/CMakeLists.txt index 7b545beb544..34223f25f9a 100644 --- a/searchlib/src/tests/engine/proto_converter/CMakeLists.txt +++ b/searchlib/src/tests/engine/proto_converter/CMakeLists.txt @@ -7,3 +7,6 @@ vespa_add_executable(searchlib_engine_proto_converter_test_app TEST GTest::GTest ) vespa_add_test(NAME searchlib_engine_proto_converter_test_app COMMAND searchlib_engine_proto_converter_test_app) +if(Protobuf_VERSION VERSION_LESS_EQUAL 3.12.4) + set_source_files_properties(proto_converter_test.cpp PROPERTIES COMPILE_OPTIONS "-Wno-inline") +endif() |