Merge pull request #293 from aminya/policy

aminya · web-flow · commit 76fc42c0d22d · 2026-02-24T00:02:18.000-08:00
fix: enable CMP0177 + update CI versions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,10 +15,9 @@ jobs:
         os:
           - windows-2022
           - ubuntu-22.04
-          - macos-13
-          # - macos-14
+          - macos-14
         compiler:
-          - llvm
+          - llvm-19
           - gcc
         vcvarsall:
           - true
@@ -63,7 +62,7 @@ jobs:
           cmake: true
           ninja: true
           vcpkg: true
-          conan: 2.6.0
+          conan: true
           cppcheck: true
           cmakelang: true
           clang-tidy: true
diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ include(${_project_options_SOURCE_DIR}/Index.cmake)
 # install vcpkg dependencies: - should be called before defining project()
 run_vcpkg(
     VCPKG_URL "https://github.com/microsoft/vcpkg.git"
-    VCPKG_REV "86a181505ac6460f98496a79abdee6a0f49905ec"
+    VCPKG_REV "0cb95c860ea83aafc1b24350510b30dec535989a"
 )
 # Install conan dependencies: - should be called before defining project()
 run_conan()
diff --git a/cspell.config.yaml b/cspell.config.yaml
@@ -11,6 +11,7 @@ allowCompoundWords: true
 enableGlobDot: true
 words:
   - aarch
+  - cmakelang
   - aminya
   - Amnet
   - anotherproj
diff --git a/docs/src/project_options_example.md b/docs/src/project_options_example.md
@@ -30,7 +30,7 @@ include(${_project_options_SOURCE_DIR}/Index.cmake)
 # install vcpkg dependencies: - should be called before defining project()
 run_vcpkg(
     VCPKG_URL "https://github.com/microsoft/vcpkg.git"
-    VCPKG_REV "86a181505ac6460f98496a79abdee6a0f49905ec"
+    VCPKG_REV "0cb95c860ea83aafc1b24350510b30dec535989a"
 )
 # Install conan dependencies: - should be called before defining project()
 run_conan()
diff --git a/src/Index.cmake b/src/Index.cmake
@@ -18,6 +18,11 @@ if(POLICY CMP0141)
   cmake_policy(SET CMP0141 NEW)
 endif()
 
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.31.0")
+  # normalize install directories
+  cmake_policy(SET CMP0177 NEW)
+endif()
+
 # only useable here
 set(ProjectOptions_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
diff --git a/src/Vcpkg.cmake b/src/Vcpkg.cmake
@@ -170,7 +170,7 @@ Or by specifying the options
 
    run_vcpkg(
        VCPKG_URL "https://github.com/microsoft/vcpkg.git"
-       VCPKG_REV "86a181505ac6460f98496a79abdee6a0f49905ec"
+       VCPKG_REV "0cb95c860ea83aafc1b24350510b30dec535989a"
        ENABLE_VCPKG_UPDATE
    )
 
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/install/vcpkg.json b/tests/install/vcpkg.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "another-project",
   "version-string": "0.1.0",
-  "builtin-baseline": "86a181505ac6460f98496a79abdee6a0f49905ec",
+  "builtin-baseline": "0cb95c860ea83aafc1b24350510b30dec535989a",
   "dependencies": [
     {
       "name": "eigen3",
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/CMakeLists.txt b/tests/myproj/CMakeLists.txt
@@ -18,7 +18,7 @@ if(ENABLE_CROSS_COMPILING)
 endif()
 
 run_vcpkg(VCPKG_URL "https://github.com/microsoft/vcpkg.git" VCPKG_REV
-          "86a181505ac6460f98496a79abdee6a0f49905ec" ENABLE_VCPKG_UPDATE
+          "0cb95c860ea83aafc1b24350510b30dec535989a" ENABLE_VCPKG_UPDATE
 )
 run_conan()
 
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/myproj/vcpkg.json b/tests/myproj/vcpkg.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "myproject",
   "version-string": "0.1.0",
-  "builtin-baseline": "86a181505ac6460f98496a79abdee6a0f49905ec",
+  "builtin-baseline": "0cb95c860ea83aafc1b24350510b30dec535989a",
   "dependencies": [
     {
       "name": "eigen3",
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
`@@ -77,7 +77,7 @@ include(${_project_options_SOURCE_DIR}/Index.cmake)`
`77`	`77`	`# install vcpkg dependencies: - should be called before defining project()`
`78`	`78`	`run_vcpkg(`
`79`	`79`	`VCPKG_URL "https://github.com/microsoft/vcpkg.git"`
`80`		`- VCPKG_REV "86a181505ac6460f98496a79abdee6a0f49905ec"`
	`80`	`+ VCPKG_REV "0cb95c860ea83aafc1b24350510b30dec535989a"`
`81`	`81`	`)`
`82`	`82`	`# Install conan dependencies: - should be called before defining project()`
`83`	`83`	`run_conan()`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ include(${_project_options_SOURCE_DIR}/Index.cmake)`
`30`	`30`	`# install vcpkg dependencies: - should be called before defining project()`
`31`	`31`	`run_vcpkg(`
`32`	`32`	`VCPKG_URL "https://github.com/microsoft/vcpkg.git"`
`33`		`- VCPKG_REV "86a181505ac6460f98496a79abdee6a0f49905ec"`
	`33`	`+ VCPKG_REV "0cb95c860ea83aafc1b24350510b30dec535989a"`
`34`	`34`	`)`
`35`	`35`	`# Install conan dependencies: - should be called before defining project()`
`36`	`36`	`run_conan()`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ Or by specifying the options`
`170`	`170`
`171`	`171`	`run_vcpkg(`
`172`	`172`	`VCPKG_URL "https://github.com/microsoft/vcpkg.git"`
`173`		`- VCPKG_REV "86a181505ac6460f98496a79abdee6a0f49905ec"`
	`173`	`+ VCPKG_REV "0cb95c860ea83aafc1b24350510b30dec535989a"`
`174`	`174`	`ENABLE_VCPKG_UPDATE`
`175`	`175`	`)`
`176`	`176`
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
`@@ -2,7 +2,7 @@`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",`
`3`	`3`	`"name": "another-project",`
`4`	`4`	`"version-string": "0.1.0",`
`5`		`- "builtin-baseline": "86a181505ac6460f98496a79abdee6a0f49905ec",`
	`5`	`+ "builtin-baseline": "0cb95c860ea83aafc1b24350510b30dec535989a",`
`6`	`6`	`"dependencies": [`
`7`	`7`	`{`
`8`	`8`	`"name": "eigen3",`
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`	`}`