From bcc5b19744b6b0fb56091ff884da43d2d596633c Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Mon, 9 Dec 2024 11:11:30 +0800
Subject: [PATCH] fix: correct option use_cpm and use_conan (#60)

Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com>
---
 copier.yml                         | 20 ++++++++++++++++----
 includes/copier-answers-sample.yml |  2 --
 template/CMakeLists.txt.jinja      |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/copier.yml b/copier.yml
index 681afb3..8f91953 100644
--- a/copier.yml
+++ b/copier.yml
@@ -146,6 +146,18 @@ compiled:
   help: Whether to add _core compiled module.
   type: bool
 
+use_cpm:
+  default: false
+  help: Whether to use CPM to manage C++ dependencies.
+  type: bool
+  when: '{{ compiled == true }}'
+
+use_conan:
+  default: false
+  help: Whether to use conan to manage C++ dependencies.
+  type: bool
+  when: '{{ compiled == true }}'
+
 use_codecov:
   default: true
   help: 'Whether to add codecov integration:'
@@ -268,13 +280,13 @@ ss_cmake_configure_warnings_and_hardening:
   when: false
 
 ss_cmake_use_cpm:
-  default: false
+  default: '{{ use_cpm }}'
   help: Whether to use CPM to manage C++ dependencies that will break up vcpkg dependency management.
   type: bool
-  when: '{{ compiled == true }}'
+  when: false
 
 ss_cmake_use_conan:
-  default: false
+  default: '{{ use_conan }}'
   help: Whether to use conan to manage C++ dependencies that will break up vcpkg dependency management.
   type: bool
-  when: '{{ compiled == true }}'
+  when: false
diff --git a/includes/copier-answers-sample.yml b/includes/copier-answers-sample.yml
index ca7cdc2..1a3a144 100644
--- a/includes/copier-answers-sample.yml
+++ b/includes/copier-answers-sample.yml
@@ -24,5 +24,3 @@ use_cpm: false
 min_py: '3.8'
 max_py: '3.13'
 default_py: '3.10'
-ss_cmake_use_cpm: false
-ss_cmake_use_conan: false
diff --git a/template/CMakeLists.txt.jinja b/template/CMakeLists.txt.jinja
index f3a1d06..918dad6 100644
--- a/template/CMakeLists.txt.jinja
+++ b/template/CMakeLists.txt.jinja
@@ -38,7 +38,7 @@ include(ConfigureVersion)
 [%- if use_cpm == true %]
 include(ConfigureCPMDependencies)
 [%- endif %]
-[%- if use_cpm == true %]
+[%- if use_conan == true %]
 include(ConfigureConanDependencies)
 [%- endif %]
 [%- if compiled == true %]