From 47e922a5232365b29bbde9477a07a9147d6828f4 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Sun, 21 Apr 2024 19:15:03 -0700 Subject: [PATCH 1/3] Try CTest --- .github/workflows/build.yml | 11 ++++++----- CMakeLists.txt | 7 +++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8d9926b..b2b7a88 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,8 +18,9 @@ jobs: - run: | git clone --branch 7.9.0 https://github.com/jtv/libpqxx.git cd libpqxx - CXXFLAGS=-std=c++17 ./configure - make - sudo make install - - run: g++ -std=c++17 -Wall -Wextra -Werror -o test/pqxx test/pqxx_test.cpp -lpqxx -lpq - - run: test/pqxx + cmake -S . -B build -DSKIP_BUILD_TEST=ON + cmake --build build + sudo cmake --install build + - run: cmake -S . -B build + - run: cmake --build build + - run: build/PqxxTest diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c4a469..070a21e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,3 +7,10 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/include/" FILES_MATCHING PATTERN "*.hpp" ) + +include(CTest) +set(CMAKE_CXX_STANDARD 17) +add_executable(TestPqxx test/pqxx_test.cpp) +find_package(libpqxx REQUIRED) +target_link_libraries(TestPqxx PRIVATE pqxx) +add_test(NAME TestPqxx COMMAND TestPqxx) From 532ee3897f3e8d0d13bee5cb2e192d981b4150ac Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Sun, 21 Apr 2024 19:18:31 -0700 Subject: [PATCH 2/3] Added pq --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 070a21e..3a1e9b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,5 +12,5 @@ include(CTest) set(CMAKE_CXX_STANDARD 17) add_executable(TestPqxx test/pqxx_test.cpp) find_package(libpqxx REQUIRED) -target_link_libraries(TestPqxx PRIVATE pqxx) +target_link_libraries(TestPqxx PRIVATE pq pqxx) add_test(NAME TestPqxx COMMAND TestPqxx) From 061e0e08e2583d24c91a81838936115ecaf2ea41 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Sun, 21 Apr 2024 19:23:10 -0700 Subject: [PATCH 3/3] Try again --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a1e9b4..7eeb302 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.14) project(pgvector VERSION 0.1.1 LANGUAGES CXX) @@ -11,6 +11,7 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/include/" include(CTest) set(CMAKE_CXX_STANDARD 17) add_executable(TestPqxx test/pqxx_test.cpp) +find_package(PostgreSQL REQUIRED) find_package(libpqxx REQUIRED) -target_link_libraries(TestPqxx PRIVATE pq pqxx) +target_link_libraries(TestPqxx PRIVATE PostgreSQL::PostgreSQL pqxx) add_test(NAME TestPqxx COMMAND TestPqxx)