Move csv.hpp to contrib

reverendbedford · Jun 23, 2024 · 84a866a · 84a866a
1 parent abb2858
commit 84a866a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/include/neml2/contrib/csv.hpp → contrib/csvparser/csv.hpp b/include/neml2/contrib/csv.hpp → contrib/csvparser/csv.hpp
diff --git a/include/neml2/base/Sequence.h b/include/neml2/base/Sequence.h
@@ -28,7 +28,7 @@
 #include <string>
 
 #include "neml2/misc/parser_utils.h"
-#include "neml2/contrib/csv.hpp"
+#include "csvparser/csv.hpp"
 
 namespace neml2
 {

diff --git a/src/neml2/CMakeLists.txt b/src/neml2/CMakeLists.txt
@@ -34,7 +34,7 @@ register_unity_group(neml2 .)
 
 # NEML2 headers
 file(GLOB_RECURSE _NEML2_HEADERS ${NEML2_SOURCE_DIR}/include/*.h)
-target_include_directories(neml2 PUBLIC ${NEML2_SOURCE_DIR}/include ${NEML2_BINARY_DIR}/include)
+target_include_directories(neml2 PUBLIC ${NEML2_SOURCE_DIR}/include ${NEML2_SOURCE_DIR}/contrib)
 target_sources(neml2
   PUBLIC
   FILE_SET HEADERS
@@ -43,6 +43,7 @@ target_sources(neml2
   ${_NEML2_HEADERS}
 )
 install(TARGETS neml2 COMPONENT Development FILE_SET HEADERS)
+install(DIRECTORY ${NEML2_SOURCE_DIR}/contrib/csvparser TYPE INCLUDE)
 
 # torch
 target_include_directories(neml2 SYSTEM PUBLIC ${Torch_INCLUDE_DIRECTORIES})