From f71233ae02f8e8f678ae5a2481a6d25e36554373 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 4 Aug 2024 13:00:00 +0200
Subject: [PATCH] Remove a CMake 3.19 construct

CONFIG supports multiple arguments only as of CMake 3.19, see
https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html#configuration-expressions

Ubuntu focal ships with 3.16 by default, so enable building with that.
Note that there is also the workaround of installing "cmake-mozilla".
---
 CMakeLists.txt   | 3 ++-
 cmake/Rust.cmake | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e470c83b..d8f241bed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,8 @@ function(CREATE_TARGET target)
         env ${VARS_FOR_CARGO}
           ${Rust_CARGO}
             build --bin ${target}
-            $<$<CONFIG:Release,RelWithDebInfo>:--release>
+            $<$<CONFIG:Release>:--release>
+            $<$<CONFIG:RelWithDebInfo>:--release>
             --target ${Rust_CARGO_TARGET}
             ${CARGO_FLAGS}
             ${FEATURES_ARG}
diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
index f8601ef34..36bc34ea3 100644
--- a/cmake/Rust.cmake
+++ b/cmake/Rust.cmake
@@ -19,7 +19,7 @@ else()
 endif()
 
 set(rust_profile $<IF:$<CONFIG:Debug>,debug,release>)
-set(rust_debugflags "$<$<CONFIG:Debug,RelWithDebInfo>:-g>")
+set(rust_debugflags "$<$<CONFIG:Debug>:-g>$<$<CONFIG:RelWithDebInfo>:-g>")
 
 
 # Temporary hack to propogate CMake flags/options to build.rs. We need to get CMake to evaluate the