Merge pull request #18 from vincentlaucsb/cxx11

C+14 compatibility
vincentlaucsb · Mar 30, 2019 · 749e423 · 749e423
2 parents 47e3b17 + bbd9dea
commit 749e423
Show file tree

Hide file tree

Showing 11 changed files with 1,486 additions and 141 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,9 @@ project(csv_parser)
 set(CMAKE_CXX_STANDARD 17)
 
 if (MSVC)
+	# Make Visual Studio report accurate C++ version
+	# See: https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
+	set(CMAKE_CXX_FLAGS "/Zc:__cplusplus")
 else()
 	set(CMAKE_CXX_FLAGS "-pthread")
 	set(CMAKE_CXX_FLAGS_RELEASE "-O3")
@@ -15,6 +18,7 @@ set(TEST_DIR ${CMAKE_CURRENT_LIST_DIR}/tests)
 
 # file(GLOB_RECURSE SOURCES include/ *.hpp *.cpp)
 set(SOURCES
+	${CMAKE_CURRENT_LIST_DIR}/include/external/string_view.hpp
 	${SOURCE_DIR}/csv_reader.cpp
 	${SOURCE_DIR}/csv_reader_iterator.cpp
 	${SOURCE_DIR}/csv_row.cpp

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 BUILD_DIR = build
 TEST_DIR = tests
 IDIR = include/
-CFLAGS = -pthread -std=c++17
+CFLAGS = -pthread -std=c++14
 TFLAGS = -I$(IDIR) -Itests/ $(CFLAGS) -Og -g --coverage
 
 # Main Library

diff --git a/codecov.yml b/codecov.yml
@@ -1,2 +1,3 @@
 ignore:
+	- "include/external"
     - "tests"