[vincentlaucsb-csv-parser] update to 3.2.0 (#51120)

This commit is contained in:
toge 2026-04-14 07:26:27 +09:00 committed by GitHub
parent 282705e386
commit b80e006657
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 48 additions and 34 deletions

View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6556ac5..bece9d9 100644
index 3ea14d3..22aedc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,8 @@
@ -8,25 +8,25 @@ index 6556ac5..bece9d9 100644
+include(GNUInstallDirs)
+
+find_package(mio CONFIG REQUIRED)
if(CSV_CXX_STANDARD)
set(CMAKE_CXX_STANDARD ${CSV_CXX_STANDARD})
@@ -66,10 +69,7 @@ set(CSV_TEST_DIR ${CMAKE_CURRENT_LIST_DIR}/tests)
@@ -83,10 +86,7 @@ set(CSV_TEST_DIR ${CMAKE_CURRENT_LIST_DIR}/tests)
include_directories(${CSV_INCLUDE_DIR})
-## Load developer specific CMake settings
-if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
- SET(CSV_DEVELOPER TRUE)
-endif()
+SET(CSV_DEVELOPER OFF)
## Main Library
add_subdirectory(${CSV_SOURCE_DIR})
@@ -86,6 +86,23 @@ if (CSV_BUILD_PROGRAMS)
@@ -102,6 +102,22 @@ option(CSV_BUILD_PROGRAMS "Allow to disable building of programs" ON)
if (CSV_BUILD_PROGRAMS)
add_subdirectory("programs")
endif()
+install(TARGETS csv EXPORT unofficial-vincentlaucsb-csv-parser)
+
+install(
@ -43,29 +43,41 @@ index 6556ac5..bece9d9 100644
+ PATTERN "CMakeLists.txt" EXCLUDE
+ PATTERN "external" EXCLUDE
+)
+
## Developer settings
if (CSV_DEVELOPER)
# Allow for performance profiling
diff --git a/include/internal/CMakeLists.txt b/include/internal/CMakeLists.txt
index 8502088..d4cad4d 100644
index e96cfd0..2f95f90 100644
--- a/include/internal/CMakeLists.txt
+++ b/include/internal/CMakeLists.txt
@@ -28,7 +28,7 @@ target_sources(csv
thread_safe_deque.hpp
)
-set_target_properties(csv PROPERTIES LINKER_LANGUAGE CXX)
+set_target_properties(csv PROPERTIES LINKER_LANGUAGE CXX OUTPUT_NAME "vincentlaucsb-csv-parser-csv")
if(CSV_ENABLE_THREADS)
target_compile_definitions(csv PUBLIC CSV_ENABLE_THREADS=1)
@@ -37,4 +37,7 @@ else()
if(CSV_NO_SIMD)
target_compile_definitions(csv PUBLIC CSV_NO_SIMD=1)
@@ -41,8 +41,6 @@ else()
target_compile_definitions(csv PUBLIC CSV_ENABLE_THREADS=0)
endif()
-target_include_directories(csv INTERFACE ../)
-
# Scalar-only variant of the library: same sources, CSV_NO_SIMD defined.
# Used by csv_bench_no_simd to provide a fair apples-to-apples benchmark.
add_library(csv_no_simd STATIC "")
@@ -56,4 +54,11 @@ if(CSV_ENABLE_THREADS)
else()
target_compile_definitions(csv_no_simd PUBLIC CSV_ENABLE_THREADS=0)
endif()
-target_include_directories(csv_no_simd INTERFACE ../)
+target_include_directories(csv
+ INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/vincentlaucsb-csv-parser>
+)
+target_link_libraries(csv PRIVATE Threads::Threads PUBLIC mio::mio mio::mio-headers)
+target_include_directories(csv_no_simd
+ INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/vincentlaucsb-csv-parser>
+)
+target_link_libraries(csv_no_simd PRIVATE Threads::Threads PUBLIC mio::mio mio::mio-headers)

View File

@ -1,36 +1,33 @@
diff --git a/include/internal/basic_csv_parser.hpp b/include/internal/basic_csv_parser.hpp
index f8b598e..1d352d4 100644
index 3b90b14..5460157 100644
--- a/include/internal/basic_csv_parser.hpp
+++ b/include/internal/basic_csv_parser.hpp
@@ -12,7 +12,7 @@
#include <vector>
#if !defined(__EMSCRIPTEN__)
-#include "../external/mio.hpp"
+#include "mio/mmap.hpp"
#endif
#include "basic_csv_parser_simd.hpp"
#include "col_names.hpp"
#include "common.hpp"
diff --git a/include/internal/common.hpp b/include/internal/common.hpp
index 62f27d5..16ad9f4 100644
index 62f27d5..fc4a0a6 100644
--- a/include/internal/common.hpp
+++ b/include/internal/common.hpp
@@ -97,10 +97,8 @@
@@ -97,7 +97,7 @@
#endif
// Include string_view BEFORE csv namespace to avoid namespace pollution issues
-#ifdef CSV_HAS_CXX17
+#if 1
#include <string_view>
-#else
-#include "../external/string_view.hpp"
#endif
namespace csv {
@@ -122,7 +120,7 @@ namespace csv {
#else
#include "../external/string_view.hpp"
@@ -122,7 +122,7 @@ namespace csv {
#define STATIC_ASSERT(x) static_assert(x, "Assertion failed")
-#ifdef CSV_HAS_CXX17
+#if 1
/** @typedef string_view

View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO vincentlaucsb/csv-parser
REF "${VERSION}"
SHA512 409edec53974ba0358932739bf0872ed98e77f402638712e3b44ec6b8a9f1acf8129f27edc8b64129a8f311ac55e29726c58c6e03256c0f67389195195972ad9
SHA512 4fa877d9957f4daf4708b5512815dba883d742121672fefacf1cd174d568134f2e349177cffd5a70f60fecde61cba881188ac8d208a1ea71840133d7063ddd5b
HEAD_REF master
PATCHES
001-fix-cmake.patch

View File

@ -1,6 +1,6 @@
{
"name": "vincentlaucsb-csv-parser",
"version": "3.1.0",
"version": "3.2.0",
"description": "A modern C++ library for reading, writing, and analyzing CSV (and similar) files.",
"homepage": "https://github.com/vincentlaucsb/csv-parser",
"license": "MIT",

View File

@ -10553,7 +10553,7 @@
"port-version": 1
},
"vincentlaucsb-csv-parser": {
"baseline": "3.1.0",
"baseline": "3.2.0",
"port-version": 0
},
"visit-struct": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2228c83e85483f8788dd115c3865fca2d5e44380",
"version": "3.2.0",
"port-version": 0
},
{
"git-tree": "748651a72b9c64327ed2373d390599bd91988e4a",
"version": "3.1.0",