From a62ab085871adbe4c2af142137c12141a872ca0c Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Mon, 16 Sep 2024 16:43:45 +0200 Subject: [PATCH 1/3] CMake config: Update the clang-tidy versions we are looking for --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5da692841..12936a09b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,7 +278,7 @@ endif() message(STATUS "Looking for clang-tidy") find_program(CLANG_TIDY - NAMES clang-tidy clang-tidy-16 clang-tidy-15 clang-tidy-14 clang-tidy-13 clang-tidy-12 clang-tidy-11) + NAMES clang-tidy clang-tidy-19 clang-tidy-18 clang-tidy-17 clang-tidy-16 clang-tidy-15) if (CLANG_TIDY) message(STATUS "Looking for clang-tidy - found ${CLANG_TIDY}") From c9c1edd71b7d526aae68c604de8d49ee1f20ded1 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Mon, 16 Sep 2024 16:45:01 +0200 Subject: [PATCH 2/3] CMake config: Also look for PostgresSQL versions 16 and 17 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12936a09b..93467b749 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ endif() set(MINIMUM_POSTGRESQL_SERVER_VERSION "9.6") set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "90600") -set(PostgreSQL_ADDITIONAL_VERSIONS "15" "14" "13" "12" "11" "10" "9.6") +set(PostgreSQL_ADDITIONAL_VERSIONS "17" "16" "15" "14" "13" "12" "11" "10" "9.6") ############################################################# # Version From fb8640cc6fd738ed36c7c48849bb1537a85ac392 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Mon, 16 Sep 2024 15:44:54 +0200 Subject: [PATCH 3/3] Use /utf-8 compiler option for MSVC (needed for newer fmt lib versions) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93467b749..1c73bf341 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) if (MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX) - add_compile_options(-wd4996) + add_compile_options(-wd4996 -utf-8) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099") else() add_compile_options(-Wall)