Skip to content

Commit

Permalink
fix: correct typos for ss_cmake_ vars (#11)
Browse files Browse the repository at this point in the history
Signed-off-by: l.feng <[email protected]>
  • Loading branch information
msclock authored Dec 14, 2024
1 parent c19c685 commit 8a96cb0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion template/CMakeLists.txt.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ include(ConfigureCoverage)
[%- if ss_cmake_use_cpm == true %]
include(ConfigureCPMDependencies)
[%- endif %]
[%- if ss_cmake_use_cpm == true %]
[%- if ss_cmake_use_conan == true %]
include(ConfigureConanDependencies)
[%- endif %]

Expand Down
12 changes: 6 additions & 6 deletions template/vcpkg.json.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@
"builtin-baseline": "96b5ced82828ecaf67e6010a892c98d3e96ed1c2",
"homepage": "https://{{ ss_cmake_repo_url }}",
"dependencies": [
[%- if use_conan == true %]
[%- if ss_cmake_use_conan == true %]
"cmake-conan",
[%- endif %]
[%- if use_cpm == true %]
[%- if ss_cmake_use_cpm == true %]
"cmake-cpm",
[%- endif %]
"cmake-modules",
"robotology-cmake-ycm"
],
"overrides": [
[%- if use_conan == true %]
[%- if ss_cmake_use_conan == true %]
{
"name": "cmake-conan",
"version": "0.18.1"
},
[%- endif %]
[%- if use_cpm == true %]
[%- if ss_cmake_use_cpm == true %]
{
"name": "cmake-cpm",
"version": "0.38.6#2"
Expand All @@ -43,10 +43,10 @@
"baseline": "a1d862fc6df3883df4516ccdd0c204d14cf4dc64",
"repository": "https://github.com/msclock/cmake-registry",
"packages": [
[%- if use_conan == true %]
[%- if ss_cmake_use_conan == true %]
"cmake-conan",
[%- endif %]
[%- if use_cpm == true %]
[%- if ss_cmake_use_cpm == true %]
"cmake-cpm",
[%- endif %]
"cmake-modules",
Expand Down

0 comments on commit 8a96cb0

Please sign in to comment.