Merge branch 'main' into feature/add_test

FeignClaims · FeignClaims · commit 9170c3b7b5e6 · 2024-02-09T17:40:40.000+08:00
diff --git a/src/Common.cmake b/src/Common.cmake
@@ -1,5 +1,7 @@
 include_guard()
 
+set(ProjectOptions_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}")
+
 # This function sets ProjectOptions_SRC_DIR using the current lists path
 macro(set_project_options_src_dir)
   get_directory_property(LISTFILE_STACK LISTFILE_STACK)
diff --git a/src/CrossCompiler.cmake b/src/CrossCompiler.cmake
@@ -1,5 +1,7 @@
 include_guard()
 
+set(ProjectOptions_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}")
+
 #[[.rst:
 
 ``enable_cross_compiler``
diff --git a/src/DetectCompiler.cmake b/src/DetectCompiler.cmake
@@ -1,5 +1,7 @@
 include_guard()
 
+set(ProjectOptions_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}")
+
 # includes a separate CMakeLists.txt file to detect the CXX/C compilers before project is called
 # Using a separate file ensures that the current scope is not contaminated by the variable
 macro(detect_compiler)
diff --git a/src/Doxygen.cmake b/src/Doxygen.cmake
@@ -80,8 +80,11 @@ function(enable_doxygen DOXYGEN_THEME)
 
   # find doxygen and dot if available
   find_package(Doxygen OPTIONAL_COMPONENTS dot)
-  if (NOT Doxygen_FOUND)
-    message(WARNING "Doxygen not found, install doxygen and try again. Documentation will not be generated.")
+  if(NOT Doxygen_FOUND)
+    message(
+      WARNING
+        "Doxygen not found, install doxygen and try again. Documentation will not be generated."
+    )
     return()
   endif()
 
diff --git a/src/Index.cmake b/src/Index.cmake
@@ -10,29 +10,29 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
 endif()
 
 # only useable here
-set(ProjectOptions_SRC_DIR ${CMAKE_CURRENT_LIST_DIR})
+set(ProjectOptions_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
 # include the files to allow calling individual functions (including the files does not run any code.)
-include("${CMAKE_CURRENT_LIST_DIR}/Common.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/Utilities.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/Git.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/SystemLink.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/Cuda.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/PackageProject.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/Optimization.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/Cache.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/Linker.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/CompilerWarnings.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/Tests.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/Sanitizers.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/Doxygen.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/StaticAnalyzers.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/VCEnvironment.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/MinGW.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/DetectCompiler.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/CrossCompiler.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/DynamicProjectOptions.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/Hardening.cmake")
+include("${ProjectOptions_SRC_DIR}/Common.cmake")
+include("${ProjectOptions_SRC_DIR}/Utilities.cmake")
+include("${ProjectOptions_SRC_DIR}/Git.cmake")
+include("${ProjectOptions_SRC_DIR}/SystemLink.cmake")
+include("${ProjectOptions_SRC_DIR}/Cuda.cmake")
+include("${ProjectOptions_SRC_DIR}/PackageProject.cmake")
+include("${ProjectOptions_SRC_DIR}/Optimization.cmake")
+include("${ProjectOptions_SRC_DIR}/Cache.cmake")
+include("${ProjectOptions_SRC_DIR}/Linker.cmake")
+include("${ProjectOptions_SRC_DIR}/CompilerWarnings.cmake")
+include("${ProjectOptions_SRC_DIR}/Tests.cmake")
+include("${ProjectOptions_SRC_DIR}/Sanitizers.cmake")
+include("${ProjectOptions_SRC_DIR}/Doxygen.cmake")
+include("${ProjectOptions_SRC_DIR}/StaticAnalyzers.cmake")
+include("${ProjectOptions_SRC_DIR}/VCEnvironment.cmake")
+include("${ProjectOptions_SRC_DIR}/MinGW.cmake")
+include("${ProjectOptions_SRC_DIR}/DetectCompiler.cmake")
+include("${ProjectOptions_SRC_DIR}/CrossCompiler.cmake")
+include("${ProjectOptions_SRC_DIR}/DynamicProjectOptions.cmake")
+include("${ProjectOptions_SRC_DIR}/Hardening.cmake")
 
 # Include msvc toolchain on windows if the generator is not visual studio. Should be called before run_vcpkg and run_conan to be effective
 if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
@@ -41,8 +41,8 @@ else()
   message(STATUS "project_options: skipping msvc_toolchain as CMAKE_TOOLCHAIN_FILE is set")
 endif()
 
-include("${CMAKE_CURRENT_LIST_DIR}/Conan.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/Vcpkg.cmake")
+include("${ProjectOptions_SRC_DIR}/Conan.cmake")
+include("${ProjectOptions_SRC_DIR}/Vcpkg.cmake")
 
 #[[.rst:
 
diff --git a/src/MinGW.cmake b/src/MinGW.cmake
@@ -1,5 +1,7 @@
 include_guard()
 
+set(ProjectOptions_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}")
+
 # detect mingw
 function(is_mingw value)
   if(USE_CROSSCOMPILER_MINGW)
diff --git a/src/VCEnvironment.cmake b/src/VCEnvironment.cmake
@@ -1,6 +1,7 @@
 include_guard()
 
-include("${CMAKE_CURRENT_LIST_DIR}/Utilities.cmake")
+set(ProjectOptions_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}")
+include("${ProjectOptions_SRC_DIR}/Utilities.cmake")
 
 # detect if the compiler is msvc
 function(is_msvc value)
@@ -58,8 +59,7 @@ macro(msvc_toolchain)
       message(STATUS "Using Windows Windows toolchain")
       include(FetchContent)
       FetchContent_Declare(
-        _msvc_toolchain
-        GIT_REPOSITORY "https://github.com/MarkSchofield/WindowsToolchain.git"
+        _msvc_toolchain GIT_REPOSITORY "https://github.com/MarkSchofield/WindowsToolchain.git"
         GIT_TAG "17c6d4ff6531ee268b9a22a8bcfbb3809e970e4e"
       )
       FetchContent_MakeAvailable(_msvc_toolchain)
diff --git a/tests/emscripten/main.cpp b/tests/emscripten/main.cpp
@@ -13,6 +13,6 @@
 #endif
 
 int main() {
-  printf("hello, world!\n");
-  return 0;
+    printf("hello, world!\n");
+    return 0;
 }
diff --git a/tests/install/src/another_main.cpp b/tests/install/src/another_main.cpp
@@ -2,6 +2,6 @@
 #include <mylib2/lib.hpp>
 
 int main() {
-  some_fun2();
-  return some_fun2();
+    some_fun2();
+    return some_fun2();
 }
diff --git a/tests/minimal/main.cpp b/tests/minimal/main.cpp
@@ -1,6 +1,6 @@
 #include <fmt/core.h>
 
 int main() {
-  fmt::print("Hello World!");
-  return 0;
+    fmt::print("Hello World!");
+    return 0;
 }
diff --git a/tests/myproj/include/mylib/lib.hpp b/tests/myproj/include/mylib/lib.hpp
@@ -18,13 +18,13 @@
 #include <cstring>
 
 int some_fun() {
-  fmt::print("Hello from fmt{}", "!");
+    fmt::print("Hello from fmt{}", "!");
 
-  // populate an Eigen vector with the values
-  auto eigen_vec = Eigen::VectorXd::LinSpaced(10, 0, 1);
+    // populate an Eigen vector with the values
+    auto eigen_vec = Eigen::VectorXd::LinSpaced(10, 0, 1);
 
-  // print the vector
-  fmt::print("[{}]", fmt::join(eigen_vec, ", "));
+    // print the vector
+    fmt::print("[{}]", fmt::join(eigen_vec, ", "));
 
-  return 0;
+    return 0;
 }
diff --git a/tests/myproj/libs/mythirdpartylib/include/Foo.hpp b/tests/myproj/libs/mythirdpartylib/include/Foo.hpp
@@ -8,18 +8,18 @@
 namespace mythirdpartylib {
 
 class MYTHIRDPARTYLIB_EXPORT Foo {
-public:
-  Foo() = default;
+  public:
+    Foo() = default;
 
-  /*implicit*/ Foo(int a) : m_a(a) {}
+    /*implicit*/ Foo(int a) : m_a(a) {}
 
-  int a() const { return m_a; }
+    int a() const { return m_a; }
 
-  void update(bool b, bool c, bool d);
-  void bad(std::vector<std::string> &v);
+    void update(bool b, bool c, bool d);
+    void bad(std::vector<std::string> &v);
 
-private:
-  int m_a;
+  private:
+    int m_a;
 };
 
-} // namespace mythirdpartylib
+}// namespace mythirdpartylib
diff --git a/tests/myproj/libs/mythirdpartylib/src/Foo.cpp b/tests/myproj/libs/mythirdpartylib/src/Foo.cpp
@@ -3,22 +3,22 @@
 namespace mythirdpartylib {
 
 void Foo::update(bool b, bool c, bool d) {
-  int e = b + d;
-  m_a = e;
+    int e = b + d;
+    m_a = e;
 }
 
 void Foo::bad(std::vector<std::string> &v) {
-  std::string val = "hello";
-  int index = -1; // bad, plus should use gsl::index
-  for (int i = 0; i < v.size(); ++i) {
-    if (v[i] == val) {
-      index = i;
-      break;
+    std::string val = "hello";
+    int index = -1;// bad, plus should use gsl::index
+    for (int i = 0; i < v.size(); ++i) {
+        if (v[i] == val) {
+            index = i;
+            break;
+        }
     }
-  }
 }
 
 static Foo foo(5);
 static Foo bar = 42;
 
-} // namespace mythirdpartylib
+}// namespace mythirdpartylib
diff --git a/tests/myproj/src/main/main.cpp b/tests/myproj/src/main/main.cpp
@@ -16,20 +16,20 @@
 #include <cstring>
 
 int main() {
-  fmt::print("Hello from fmt{}", "!");
+    fmt::print("Hello from fmt{}", "!");
 
-  Eigen::VectorXd eigen_vec = Eigen::Vector3d(1, 2, 3);
-  fmt::print("[{}]", fmt::join(eigen_vec, ", "));
+    Eigen::VectorXd eigen_vec = Eigen::Vector3d(1, 2, 3);
+    fmt::print("[{}]", fmt::join(eigen_vec, ", "));
 
-#if !defined(__MINGW32__) && !defined(__MSYS__) // TODO fails
-  Eigen::VectorXd eigen_vec2 = Eigen::VectorXd::LinSpaced(10, 0, 1);
-  fmt::print("[{}]", fmt::join(eigen_vec2, ", "));
+#if !defined(__MINGW32__) && !defined(__MSYS__)// TODO fails
+    Eigen::VectorXd eigen_vec2 = Eigen::VectorXd::LinSpaced(10, 0, 1);
+    fmt::print("[{}]", fmt::join(eigen_vec2, ", "));
 #endif
 
-  // trigger address sanitizer
-  // int *p = nullptr;
-  // *p = 1;
+    // trigger address sanitizer
+    // int *p = nullptr;
+    // *p = 1;
 
-  // trigger compiler warnings, clang-tidy, and cppcheck
-  int a;
+    // trigger compiler warnings, clang-tidy, and cppcheck
+    int a;
 }
diff --git a/tests/myproj/src/mylib2/lib.cpp b/tests/myproj/src/mylib2/lib.cpp
@@ -16,15 +16,15 @@
 #include <cstring>
 
 int some_fun2() {
-  fmt::print("Hello from fmt{}", "!");
+    fmt::print("Hello from fmt{}", "!");
 
-  Eigen::VectorXd eigen_vec = Eigen::Vector3d(1, 2, 3);
-  fmt::print("[{}]", fmt::join(eigen_vec, ", "));
+    Eigen::VectorXd eigen_vec = Eigen::Vector3d(1, 2, 3);
+    fmt::print("[{}]", fmt::join(eigen_vec, ", "));
 
-#if !defined(__MINGW32__) && !defined(__MSYS__) // TODO fails
-  Eigen::VectorXd eigen_vec2 = Eigen::VectorXd::LinSpaced(10, 0, 1);
-  fmt::print("[{}]", fmt::join(eigen_vec2, ", "));
+#if !defined(__MINGW32__) && !defined(__MSYS__)// TODO fails
+    Eigen::VectorXd eigen_vec2 = Eigen::VectorXd::LinSpaced(10, 0, 1);
+    fmt::print("[{}]", fmt::join(eigen_vec2, ", "));
 #endif
 
-  return 0;
+    return 0;
 }
diff --git a/tests/rpi3/main.c b/tests/rpi3/main.c
@@ -5,11 +5,11 @@ char uart_getc() { return 'a'; }
 void uart_puts(char *s) {}
 
 void main() {
-  uart_init();
+    uart_init();
 
-  uart_puts("Hello World!\n");
+    uart_puts("Hello World!\n");
 
-  while (1) {
-    uart_send(uart_getc());
-  }
+    while (1) {
+        uart_send(uart_getc());
+    }
 }
diff --git a/tests/rpi3/main.cpp b/tests/rpi3/main.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 
 int main() {
-  std::cout << "Hello World!";
-  return 0;
+    std::cout << "Hello World!";
+    return 0;
 }
diff --git a/tests/rpi4-vcpkg/main.cpp b/tests/rpi4-vcpkg/main.cpp
@@ -1,6 +1,6 @@
 #include <fmt/core.h>
 
 int main() {
-  fmt::print("Hello World!");
-  return 0;
+    fmt::print("Hello World!");
+    return 0;
 }
diff --git a/tests/rpi4/main.cpp b/tests/rpi4/main.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 
 int main() {
-  std::cout << "Hello World!";
-  return 0;
+    std::cout << "Hello World!";
+    return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@`
`13`	`13`	`#endif`
`14`	`14`
`15`	`15`	`int main() {`
`16`		`- printf("hello, world!\n");`
`17`		`- return 0;`
	`16`	`+ printf("hello, world!\n");`
	`17`	`+ return 0;`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`#include <mylib2/lib.hpp>`
`3`	`3`
`4`	`4`	`int main() {`
`5`		`- some_fun2();`
`6`		`- return some_fun2();`
	`5`	`+ some_fun2();`
	`6`	`+ return some_fun2();`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#include <fmt/core.h>`
`2`	`2`
`3`	`3`	`int main() {`
`4`		`- fmt::print("Hello World!");`
`5`		`- return 0;`
	`4`	`+ fmt::print("Hello World!");`
	`5`	`+ return 0;`
`6`	`6`	`}`