From 13fa9f737d11b5d59d7b941dadd51d8f9be25c52 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 16 Jun 2021 12:17:25 +0200 Subject: [PATCH] Modify defines for CR and RC to work around name collision on Windows --- cmake/utils.cmake | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 29b5a067b..794d73d06 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -254,6 +254,19 @@ function(GenerateNamedObjects sources_in) # now add the object and set the defines set(obj_defines ${defines_in}) + list(FIND obj_defines "RC" def_idx) + if (${def_idx} GREATER -1) + # list(REMOVE_AT ${obj_defines} ${def_idx}) + list (REMOVE_ITEM obj_defines "RC") + list(APPEND obj_defines "RC=RC") + endif () + list(FIND obj_defines "CR" def_idx) + if (${def_idx} GREATER -1) + # list(REMOVE_AT ${obj_defines} ${def_idx}) + list (REMOVE_ITEM obj_defines "CR") + list(APPEND obj_defines "CR=CR") + endif () + if (use_cblas) set(obj_name "cblas_${obj_name}") list(APPEND obj_defines "CBLAS")