From 3812eb06faaaf511fd53620826b0482aed6d4c3e Mon Sep 17 00:00:00 2001 From: Chad Elliott Date: Fri, 21 Oct 2022 09:15:23 -0500 Subject: Process escaped characters within forfirst, forlast, fornotfirst, fornotlast, default template variable values, and scope function parameters. Utilize this to correct processing errors in the cmake template. --- templates/cmake.mpd | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/cmake.mpd b/templates/cmake.mpd index 65a175a8..e4d2c290 100644 --- a/templates/cmake.mpd +++ b/templates/cmake.mpd @@ -23,8 +23,7 @@ find_package(ACE REQUIRED) <%endif%> set(SOURCE_FILES <%source_files%>) <%if(libs || lit_libs || pure_libs)%> -set(TARGET_LINK_LIBRARIES<%if(libs)%> <%foreach(configurations)%><%fornotfirst(" ")%>$<$>:<%foreach(libs)%><%fornotfirst(" ")%><%lib%><%lib_modifier%><%endfor%>><%fornotlast(" -")%><%endfor%><%endif%><%if(lit_libs)%> <%lit_libs%><%endif%><%if(pure_libs)%> <%pure_libs%><%endif%>) +set(TARGET_LINK_LIBRARIES<%if(libs)%> <%foreach(configurations)%><%fornotfirst(" ")%>$<$>:<%foreach(libs)%><%fornotfirst(" ")%><%lib%><%lib_modifier%><%endfor%>><%fornotlast("\n")%><%endfor%><%endif%><%if(lit_libs)%> <%lit_libs%><%endif%><%if(pure_libs)%> <%pure_libs%><%endif%>) <%endif%> set(PROJECT_TARGET <%if(exename)%><%exename%><%else%><%if(sharedname)%><%sharedname%><%else%><%if(staticname)%><%staticname%><%else%><%project_name%><%endif%><%endif%><%endif%>) <%marker(macros)%> @@ -137,8 +136,7 @@ include(<%custom_type%> OPTIONAL) <%uc(custom_type)%>_TARGET_SOURCES( ${PROJECT_TARGET} PUBLIC <%custom_type->input_file%> <%foreach(custom_type->input_file->commands)%> - <%uc(custom_type->input_file->command->type)%>_OPTIONS <%custom_type->input_file->command->flags%><%fornotlast(" -")%><%endfor%>) + <%uc(custom_type->input_file->command->type)%>_OPTIONS <%custom_type->input_file->command->flags%><%fornotlast("\n")%><%endfor%>) <%endif%> <%endfor%> -- cgit v1.2.1