From 52a8df8c69b1be05eb48cc6d64dac15ddadf1e30 Mon Sep 17 00:00:00 2001 From: Pascal Serrarens Date: Mon, 1 May 2023 10:17:52 +0200 Subject: [PATCH] Fix platform dependent cmake --- CMakeLists.txt | 78 ++++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 655abe9..6551ddd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,42 +1,52 @@ cmake_minimum_required(VERSION 3.13) # CMake version check -#project(VectorAlgebra) # Create project "simple_example" +if(ESP_PLATFORM) + idf_component_register( + SRC_DIRS "src" + INCLUDE_DIRS "include" + ) +else() + project(VectorAlgebra) # Create project "simple_example" -set(CMAKE_CXX_STANDARD 11) # Enable c++11 standard -set(CMAKE_POSITION_INDEPENDENT_CODE ON) + set(CMAKE_CXX_STANDARD 11) # Enable c++11 standard + set(CMAKE_POSITION_INDEPENDENT_CODE ON) -#add_compile_definitions(GTEST) -#include(FetchContent) -#FetchContent_Declare( -# googletest -# URL https://github.com/google/googletest/archive/refs/heads/main.zip -#) -# 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_compile_definitions(GTEST) + include(FetchContent) + FetchContent_Declare( + googletest + URL https://github.com/google/googletest/archive/refs/heads/main.zip + ) -idf_component_register( - SRC_DIRS "src" - INCLUDE_DIRS "include" -) + # 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" ) + add_library(VectorAlgebra STATIC + "src/FloatSingle.cpp" + "src/Angle.cpp" + "src/Vector2.cpp" + "src/Vector3.cpp" + "src/Quaternion.cpp" + ) -#enable_testing() + enable_testing() -#add_executable( -# VectorAlgebraTest -# "test/Angle_test.cc" -# "test/FloatSingle_test.cc" -# "test/Vector2_test.cc" -# "test/Vector3_test.cc" -# "test/Quaternion_test.cc" -# ) -#target_link_libraries( -# VectorAlgebraTest -# #gtest_main -# VectorAlgebra -#) + add_executable( + VectorAlgebraTest + "test/Angle_test.cc" + "test/FloatSingle_test.cc" + "test/Vector2_test.cc" + "test/Vector3_test.cc" + "test/Quaternion_test.cc" + ) + target_link_libraries( + VectorAlgebraTest + #gtest_main + VectorAlgebra + ) + + include(GoogleTest) + gtest_discover_tests(VectorAlgebraTest) +endif() -#include(GoogleTest) -#gtest_discover_tests(VectorAlgebraTest)