summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorChad Elliott <elliottc@objectcomputing.com>2022-10-21 09:15:23 -0500
committerChad Elliott <elliottc@objectcomputing.com>2022-10-21 09:15:23 -0500
commit3812eb06faaaf511fd53620826b0482aed6d4c3e (patch)
treedaa0bcdb587198d5d74aa18aa0026232a2ecda4b /templates
parent6f8a50e330194e93f43eb0352e8c1c4b18afe598 (diff)
downloadMPC-3812eb06faaaf511fd53620826b0482aed6d4c3e.tar.gz
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.
Diffstat (limited to 'templates')
-rw-r--r--templates/cmake.mpd6
1 files changed, 2 insertions, 4 deletions
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(" ")%>$<$<CONFIG:<%configuration%>>:<%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(" ")%>$<$<CONFIG:<%configuration%>>:<%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%>