From 37d45cdda59948e6d2bf11ffd6912ca9b3476c2e Mon Sep 17 00:00:00 2001 From: Pascal Serrarens Date: Wed, 3 Jan 2024 11:49:50 +0100 Subject: [PATCH] Moved all source/includes to root --- src/Angle.cpp => Angle.cpp | 0 include/Angle.h => Angle.h | 0 CMakeLists.txt | 17 ++++++++--------- src/FloatSingle.cpp => FloatSingle.cpp | 0 include/FloatSingle.h => FloatSingle.h | 0 src/Polar.cpp => Polar.cpp | 0 include/Polar.h => Polar.h | 0 src/Quaternion.cpp => Quaternion.cpp | 0 include/Quaternion.h => Quaternion.h | 0 src/Vector2.cpp => Vector2.cpp | 0 include/Vector2.h => Vector2.h | 0 src/Vector3.cpp => Vector3.cpp | 0 include/Vector3.h => Vector3.h | 0 component.mk | 2 +- 14 files changed, 9 insertions(+), 10 deletions(-) rename src/Angle.cpp => Angle.cpp (100%) rename include/Angle.h => Angle.h (100%) rename src/FloatSingle.cpp => FloatSingle.cpp (100%) rename include/FloatSingle.h => FloatSingle.h (100%) rename src/Polar.cpp => Polar.cpp (100%) rename include/Polar.h => Polar.h (100%) rename src/Quaternion.cpp => Quaternion.cpp (100%) rename include/Quaternion.h => Quaternion.h (100%) rename src/Vector2.cpp => Vector2.cpp (100%) rename include/Vector2.h => Vector2.h (100%) rename src/Vector3.cpp => Vector3.cpp (100%) rename include/Vector3.h => Vector3.h (100%) diff --git a/src/Angle.cpp b/Angle.cpp similarity index 100% rename from src/Angle.cpp rename to Angle.cpp diff --git a/include/Angle.h b/Angle.h similarity index 100% rename from include/Angle.h rename to Angle.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 3014480..7938f0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.13) # CMake version check if(ESP_PLATFORM) idf_component_register( - SRC_DIRS "src" - INCLUDE_DIRS "include" + SRC_DIRS "." + INCLUDE_DIRS "." ) else() project(VectorAlgebra) # Create project "simple_example" @@ -20,15 +20,14 @@ else() # For Windows: Prevent overriding the parent project's compiler/linker settings set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) FetchContent_MakeAvailable(googletest) - include_directories(include) add_library(VectorAlgebra STATIC - "src/FloatSingle.cpp" - "src/Angle.cpp" - "src/Vector2.cpp" - "src/Vector3.cpp" - "src/Quaternion.cpp" - "src/Polar.cpp" + "FloatSingle.cpp" + "Angle.cpp" + "Vector2.cpp" + "Vector3.cpp" + "Quaternion.cpp" + "Polar.cpp" ) enable_testing() diff --git a/src/FloatSingle.cpp b/FloatSingle.cpp similarity index 100% rename from src/FloatSingle.cpp rename to FloatSingle.cpp diff --git a/include/FloatSingle.h b/FloatSingle.h similarity index 100% rename from include/FloatSingle.h rename to FloatSingle.h diff --git a/src/Polar.cpp b/Polar.cpp similarity index 100% rename from src/Polar.cpp rename to Polar.cpp diff --git a/include/Polar.h b/Polar.h similarity index 100% rename from include/Polar.h rename to Polar.h diff --git a/src/Quaternion.cpp b/Quaternion.cpp similarity index 100% rename from src/Quaternion.cpp rename to Quaternion.cpp diff --git a/include/Quaternion.h b/Quaternion.h similarity index 100% rename from include/Quaternion.h rename to Quaternion.h diff --git a/src/Vector2.cpp b/Vector2.cpp similarity index 100% rename from src/Vector2.cpp rename to Vector2.cpp diff --git a/include/Vector2.h b/Vector2.h similarity index 100% rename from include/Vector2.h rename to Vector2.h diff --git a/src/Vector3.cpp b/Vector3.cpp similarity index 100% rename from src/Vector3.cpp rename to Vector3.cpp diff --git a/include/Vector3.h b/Vector3.h similarity index 100% rename from include/Vector3.h rename to Vector3.h diff --git a/component.mk b/component.mk index 001e0c8..58f4b33 100644 --- a/component.mk +++ b/component.mk @@ -1 +1 @@ -COMPONENT_ADD_INCLUDEDIRS = include \ No newline at end of file +COMPONENT_ADD_INCLUDEDIRS = . \ No newline at end of file