Prepare project for public API usage

src/Entry.h → include/cppIni/Entry.h

@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include <cppIni/cppini_export.h>
 #include <string>
 
 class Section;
@@ -28,7 +29,7 @@ class Section;
 /// \note The value is stored as a string.
 /// \note The value is copied into the Entry and not moved.
 /// \note The parent Section is a pointer to the Section object that contains this Entry.
-class Entry {
+class CPPINI_EXPORT Entry {
 public:
     constexpr Entry() = default; ///< Default constructor
     virtual ~Entry() = default; ///< Destructor
@@ -105,6 +106,12 @@ inline auto Entry::setData(std::string value) -> void
     m_data = std::move(value);
 }
 
+template<>
+inline auto Entry::setData(std::string_view value) -> void
+{
+    m_data = value;
+}
+
 template<> inline auto Entry::value<char>() const               -> char               { return std::stoi(m_data); }
 template<> inline auto Entry::value<short>() const              -> short              { return std::stoi(m_data); }
 template<> inline auto Entry::value<int>() const                -> int                { return std::stoi(m_data); }

src/File.h → include/cppIni/File.h

@@ -18,13 +18,15 @@
 
 #pragma once
 
-#include "Section.h"
+#include <cppIni/cppini_export.h>
+#include <cppIni/Section.h>
 
+#include <filesystem>
 #include <vector>
 
 /// \brief Represents a file on disk.
 /// A file is a collection of Sections.
-class File {
+class CPPINI_EXPORT File {
 public:
     explicit File(std::string_view filename); ///< Constructor.
     virtual ~File() = default; ///< Destructor.

src/Section.h → include/cppIni/Section.h

@@ -18,14 +18,15 @@
 
 #pragma once
 
-#include "Entry.h"
+#include <cppIni/cppini_export.h>
+#include <cppIni/Entry.h>
 
 #include <unordered_map>
 
 /// \brief Represents a section in a configuration file
 /// \details A section is a collection of Entry objects with a title (e.g. [Section]) in a configuration file
 /// \note A section has a title and a list of Entry objects
-class Section {
+class CPPINI_EXPORT Section {
 public:
     explicit Section(std::string_view title, Section* parent = nullptr); ///< Constructor with title
 

include/cppIni/cppIni.h

@@ -18,6 +18,6 @@
 
 #pragma once
 
-#include <cppIni/cppini_export.h>
-
-int CPPINI_EXPORT one();
+#include <cppIni/File.h>
+#include <cppIni/Section.h>
+#include <cppIni/Entry.h>

src/CMakeLists.txt

@@ -3,25 +3,24 @@ cmake_minimum_required(VERSION 3.24)
 set(CMAKE_DEBUG_POSTFIX d)
 
 set(SOURCES
-    cppIni.cpp
-
     Entry.cpp
     File.cpp
     Section.cpp
 )
 
 set(API_HEADERS
     cppIni.h
-)
-LIST(TRANSFORM API_HEADERS PREPEND ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/)
-
-set(HEADERS
     Entry.h
     File.h
     Section.h
 )
+LIST(TRANSFORM API_HEADERS PREPEND ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/)
+
+set(PRIVATE_HEADERS
+
+)
 
-add_library(${PROJECT_NAME} ${SOURCES} ${API_HEADERS} ${HEADERS})
+add_library(${PROJECT_NAME} ${SOURCES} ${API_HEADERS} ${PRIVATE_HEADERS})
 
 include(GenerateExportHeader)
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)

src/Entry.cpp

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "Entry.h"
-#include "Section.h"
+#include <cppIni/Entry.h>
+#include <cppIni/Section.h>
 
 auto Entry::fqKey() const -> std::string
 {

src/File.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "File.h"
+#include <cppIni/File.h>
 
 #include <fstream>
 #include <stdexcept>

src/Section.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "Section.h"
+#include <cppIni/Section.h>
 
 #include <algorithm>
 

tests/CMakeLists.txt

@@ -3,22 +3,22 @@ cmake_minimum_required(VERSION 3.24)
 find_package(doctest REQUIRED)
 
 set(TEST_SOURCES
-    ConstructionTest.cpp
     EntryTest.cpp
     FileTest.cpp
     SectionTest.cpp
 )
 
 add_executable(${PROJECT_NAME}_tests ${TEST_SOURCES})
-target_link_libraries(${PROJECT_NAME}_tests doctest::doctest cppIni)
+
+target_link_libraries(${PROJECT_NAME}_tests doctest::doctest ${PROJECT_NAME})
 target_compile_definitions(${PROJECT_NAME}_tests
     PUBLIC
         DOCTEST_CONFIG_NO_MULTITHREADING
         DOCTEST_CONFIG_USE_STD_HEADERS
         WORKING_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
 )
 
-target_include_directories(${PROJECT_NAME}
+target_include_directories(${PROJECT_NAME}_tests
     PUBLIC
         ${PROJECT_SOURCE_DIR}/include
         ${DOCTEST_INCLUDE_DIR}
@@ -29,5 +29,5 @@ if(NOT DOCTEST_CMAKE)
     message(FATAL_ERROR "Could not find doctest.cmake")
 else()
     include(${DOCTEST_CMAKE})
-    doctest_discover_tests(${PROJECT_NAME}_tests)
+    doctest_discover_tests(${PROJECT_NAME}_tests WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../src)
 endif()

tests/EntryTest.cpp

@@ -20,7 +20,7 @@
 #include <sstream>
 #include <vector>
 
-#include "../src/Entry.h"
+#include <cppIni/Entry.h>
 
 TEST_SUITE_BEGIN("Entry");
 

tests/FileTest.cpp

@@ -16,10 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+
 #include <doctest/doctest.h>
-#include <cstring>
 
-#include "../src/File.h"
+#include <cppIni/File.h>
 
 using namespace std::literals;
 

tests/SectionTest.cpp

@@ -1,5 +1,5 @@
 /*
- * cppIni - C++17/20/23 library for dealing with settings files
+ * cppIni - C++20/23 library for dealing with settings files
  * Copyright (C) 2023 Nils Hofmann <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 
 #include <doctest/doctest.h>
 
-#include "../src/Section.h"
+#include <cppIni/Section.h>
 
 TEST_SUITE_BEGIN("Section");