mstd compile definitions fixes

Author: MAIPA01

cmake/pcre2cppConfig.cmake.in

@@ -60,12 +60,16 @@ foreach(comp ${@PROJECT_NAME@_FIND_COMPONENTS})
         elseif(comp STREQUAL "UTF32")
             target_compile_definitions(${comp_target} INTERFACE PCRE2CPP_DISABLE_UTF32)
         elseif(comp STREQUAL "CXX20")
-            target_compile_definitions(${comp_target} INTERFACE PCRE2CPP_ENABLE_CXX20 MSTD_ENABLE_CXX20)
+            target_compile_definitions(${comp_target} INTERFACE PCRE2CPP_ENABLE_CXX20
+                                                                MSTD_ENABLE_CXX20
+            )
             set_target_properties(${comp_target} PROPERTIES
                 INTERFACE_COMPILE_FEATURES cxx_std_20
             )
         elseif(comp STREQUAL "NO_ASSERT_ON_RELEASE")
-            target_compile_definitions(${comp_target} INTERFACE PCRE2CPP_DISABLE_ASSERT_ON_RELEASE MSTD_DISABLE_ASSERT_ON_RELEASE)
+            target_compile_definitions(${comp_target} INTERFACE PCRE2CPP_DISABLE_ASSERT_ON_RELEASE
+                                                                MSTD_DISABLE_ASSERT_ON_RELEASE
+            )
         elseif(comp STREQUAL "EXCEPTIONS")
             set_target_properties(${comp_target} PROPERTIES
                 INTERFACE_COMPILE_DEFINITIONS PCRE2CPP_CHANGE_ASSERTS_TO_EXCEPTIONS

cmake/third_party.cmake

@@ -56,11 +56,7 @@ endif()
 
 # MSTD
 if (DOWNLOAD_MSTD)
-    CPMAddPackage(
-            URI "gh:maipa01/mstd#v1.5.2"
-            OPTIONS "MSTD_ENABLE_CXX20 ${PCRE2CPP_ENABLE_CXX20}"
-                    "MSTD_DISABLE_ASSERT_ON_RELEASE ${PCRE2CPP_DISABLE_ASSERT_ON_RELEASE}"
-    )
+    CPMAddPackage("gh:maipa01/mstd#v1.5.2")
 endif()
 
 # GTEST

pcre2cpp/CMakeLists.txt

@@ -79,9 +79,13 @@ target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE $<BUILD_INTERFACE:${
 
 # region COMPILE_DEFINITIONS
 target_compile_definitions(${PROJECT_NAME} INTERFACE    $<BUILD_INTERFACE:
-                                                            $<$<BOOL:${PCRE2CPP_ENABLE_CXX20}>:PCRE2CPP_ENABLE_CXX20>
+                                                            $<$<BOOL:${PCRE2CPP_ENABLE_CXX20}>: PCRE2CPP_ENABLE_CXX20
+                                                                                                MSTD_ENABLE_CXX20
+                                                            >
                                                             $<$<BOOL:${PCRE2CPP_CHANGE_ASSERTS_TO_EXCEPTIONS}>:PCRE2CPP_CHANGE_ASSERTS_TO_EXCEPTIONS>
-                                                            $<$<BOOL:${PCRE2CPP_DISABLE_ASSERT_ON_RELEASE}>:PCRE2CPP_DISABLE_ASSERT_ON_RELEASE>
+                                                            $<$<BOOL:${PCRE2CPP_DISABLE_ASSERT_ON_RELEASE}>:PCRE2CPP_DISABLE_ASSERT_ON_RELEASE
+                                                                                                            MSTD_DISABLE_ASSERT_ON_RELEASE
+                                                            >
                                                             $<$<BOOL:${PCRE2CPP_DISABLE_UTF8}>:PCRE2CPP_DISABLE_UTF8>
                                                             $<$<BOOL:${PCRE2CPP_DISABLE_UTF16}>:PCRE2CPP_DISABLE_UTF16>
                                                             $<$<BOOL:${PCRE2CPP_DISABLE_UTF32}>:PCRE2CPP_DISABLE_UTF32>