From 265ee6431767ae38db349704c78a44209851be61 Mon Sep 17 00:00:00 2001
From: Nicolas Grenier <Grenier@users.noreply.github.com>
Date: Mon, 13 Jan 2025 16:20:53 +0100
Subject: [PATCH] fix: cmake samuraiConfig bug (#255)

<!-- Thank you for your contribution to samurai! -->

<!-- Please check the following before submitting your PR -->
- [ x] I have installed [pre-commit](https://pre-commit.com/) locally
and use it to validate my commits.
- [ x] The PR title follows the [conventional
commits](https://www.conventionalcommits.org/en/v1.0.0/) convention.
Available tags: 'build', 'chore', 'ci', 'docs', 'feat', 'fix', 'perf',
'refactor', 'revert', 'style', 'test'
- [ x] This new PR is documented.
- [ x] This new PR is tested.

## Description
Fix the right variable names into samuraiConfig.cmake.in.
Fix also typo in CMakeLists.txt for Field container list (while not yet
encountering issue with these lines).

## Related issue
Before that fix, cmake was complaining "string no output variable
specified" pointing to samuraiConfig.cmake line 81.

## How has this been tested?
<!-- Give the list of files used to test this new implementation. -->

## Code of Conduct
By submitting this PR, you agree to follow our [Code of
Conduct](https://github.com/hpc-maths/samurai/blob/master/docs/CODE_OF_CONDUCT.md)
- [x ] I agree to follow this project's Code of Conduct

Co-authored-by: Nicolas Grenier <nicolas.grenier@lisn.upsaclay.fr>
---
 CMakeLists.txt               | 2 +-
 cmake/samuraiConfig.cmake.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3f91f5f5..1dc957071 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,7 +217,7 @@ if(SAMURAI_CONTAINER_LAYOUT_COL_MAJOR)
 endif()
 
 if(NOT SAMURAI_FIELD_CONTAINER IN_LIST FIELD_CONTAINER_LIST)
-  message(FATAL_ERROR "SAMURAI_FIELD_CONTAINER must be one of: ${FLUX_CONTAINER_LIST}")
+  message(FATAL_ERROR "SAMURAI_FIELD_CONTAINER must be one of: ${FIELD_CONTAINER_LIST}")
 else()
   string(TOUPPER ${SAMURAI_FIELD_CONTAINER} SAMURAI_FIELD_CONTAINER)
   target_compile_definitions(samurai INTERFACE SAMURAI_FIELD_CONTAINER_${SAMURAI_FIELD_CONTAINER})
diff --git a/cmake/samuraiConfig.cmake.in b/cmake/samuraiConfig.cmake.in
index 9910a4f2c..3d81f68c7 100644
--- a/cmake/samuraiConfig.cmake.in
+++ b/cmake/samuraiConfig.cmake.in
@@ -34,6 +34,6 @@ set_property(CACHE SAMURAI_FLUX_CONTAINER PROPERTY STRINGS ${FLUX_CONTAINER_LIST
 if(NOT SAMURAI_FLUX_CONTAINER IN_LIST FLUX_CONTAINER_LIST)
     message(FATAL_ERROR "SAMURAI_FLUX_CONTAINER must be one of: ${FLUX_CONTAINER_LIST}")
 else()
-    string(TOUPPER ${FLUX_CONTAINER} FLUX_CONTAINER)
-    target_compile_definitions(samurai::samurai INTERFACE FLUX_CONTAINER_${FLUX_CONTAINER})
+    string(TOUPPER ${SAMURAI_FLUX_CONTAINER} SAMURAI_FLUX_CONTAINER)
+    target_compile_definitions(samurai::samurai INTERFACE SAMURAI_FLUX_CONTAINER_${SAMURAI_FLUX_CONTAINER})
 endif()