Merge pull request #6 from Sinan-Karakaya/feat/cmake

Project structure tweaks

Author: Sinan-Karakaya

CMakeLists.txt

@@ -5,8 +5,18 @@ project(cpp-i18n LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fdiagnostics-color=always")
 
+# Build library
 add_subdirectory(src)
 
+# Fetch dependencies
+include(FetchContent)
+
+FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz)
+FetchContent_MakeAvailable(json)
+
+target_link_libraries(cpp-i18n PRIVATE nlohmann_json::nlohmann_json)
+
+# Build tests
 if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     if (BUILD_TESTING)
         add_subdirectory(tests)

README.md

@@ -34,7 +34,7 @@ FetchContent_MakeAvailable(cpp-i18n)
 
 target_link_libraries(
     ${PROJECT_NAME}
-    PRIVATE 
+    PRIVATE
     cpp-i18n
 )
 ```
@@ -51,12 +51,12 @@ assets/locales/en/basic.json
 ```
 
 ```cpp
-#include <Translator.hpp>
+#include <cpp-i18n/Translator.hpp>
 
 int main()
 {
     i18n::Translator t;
-    
+
     std::cout << t.translate("hello", "basic") << std::endl;    // "Hello, world!"
     // or
     std::cout << t("hello", "basic") << std::endl;              // "Hello, world!"
@@ -81,14 +81,14 @@ assets/locales/fr/basic.json
 ```
 
 ```cpp
-#include <Translator.hpp>
+#include <cpp-i18n/Translator.hpp>
 
 int main()
 {
     i18n::LocaleConfig config;
     config.supportedLocales = {"en", "fr"};
     i18n::Translator t(config);
-    
+
     std::cout << t("hello", "basic") << std::endl;    // "Hello, world!"
     t.setLocale("fr");
     std::cout << t("hello", "basic") << std::endl;    // "Bonjour, monde!"
@@ -113,12 +113,12 @@ assets/locales/en/other.json
 ```
 
 ```cpp
-#include <Translator.hpp>
+#include <cpp-i18n/Translator.hpp>
 
 int main()
 {
     i18n::Translator t;
-    
+
     std::cout << t("hello", "basic") << std::endl;    // "Hello, world!"
     std::cout << t("goodbye", "other") << std::endl;  // "Goodbye, world!"
     return 0;
@@ -135,14 +135,14 @@ path/to/locales/en/basic.json
 ```
 
 ```cpp
-#include <Translator.hpp>
+#include <cpp-i18n/Translator.hpp>
 
 int main()
 {
     i18n::LocaleConfig config;
     config.localesDir = "path/to/locales";
     i18n::Translator t(config);
-    
+
     std::cout << t("hello", "basic") << std::endl;    // "Hello, world!"
     return 0;
 }
@@ -158,12 +158,12 @@ assets/locales/en/parameters.json
 ```
 
 ```cpp
-#include <Translator.hpp>
+#include <cpp-i18n/Translator.hpp>
 
 int main()
 {
     i18n::Translator t;
-    
+
     std::cout << t("hello", "parameters", {{ "name", "John" }}) << std::endl;    // "Hello, my name is John!"
     return 0;
 }

include/Translator.hpp include/cpp-i18n/Translator.hpp

@@ -1,11 +1,4 @@
 cmake_minimum_required(VERSION 3.22.1)
 
 add_library(cpp-i18n Translator.cpp)
-target_include_directories(cpp-i18n PUBLIC ${CMAKE_SOURCE_DIR}/include)
-
-include(FetchContent)
-
-FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz)
-FetchContent_MakeAvailable(json)
-
-target_link_libraries(cpp-i18n PRIVATE nlohmann_json::nlohmann_json)
+target_include_directories(cpp-i18n PRIVATE ${CMAKE_SOURCE_DIR}/include)

src/CMakeLists.txt

@@ -5,7 +5,7 @@
 ** App
 */
 
-#include "Translator.hpp"
+#include <cpp-i18n/Translator.hpp>
 
 namespace i18n
 {

src/Translator.cpp

@@ -1,17 +1,13 @@
 cmake_minimum_required(VERSION 3.22.1)
 
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fdiagnostics-color=always")
-
-include(FetchContent)
 FetchContent_Declare(
         Catch2
         GIT_REPOSITORY https://github.com/catchorg/Catch2.git
         GIT_TAG v3.0.1
 )
 FetchContent_MakeAvailable(Catch2)
 
-add_executable(tests src/basic.cpp src/parameters.cpp)
+add_executable(tests basic.cpp parameters.cpp)
 target_link_libraries(tests PRIVATE nlohmann_json::nlohmann_json)
 target_link_libraries(tests PRIVATE Catch2::Catch2)
 target_link_libraries(tests PRIVATE cpp-i18n)

tests/CMakeLists.txt

@@ -8,7 +8,7 @@
 #define CATCH_CONFIG_MAIN
 #include <catch2/catch.hpp>
 
-#include "Translator.hpp"
+#include <cpp-i18n/Translator.hpp>
 
 TEST_CASE("basic", "[basic]")
 {

tests/src/basic.cpp tests/basic.cpp

@@ -8,7 +8,7 @@
 //#define CATCH_CONFIG_MAIN
 #include <catch2/catch.hpp>
 
-#include "Translator.hpp"
+#include <cpp-i18n/Translator.hpp>
 
 TEST_CASE("Simple parameter", "[parameters]")
 {