summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Elliott <elliottc@objectcomputing.com>2022-10-25 13:19:35 -0500
committerChad Elliott <elliottc@objectcomputing.com>2022-10-25 13:19:35 -0500
commitf93e5681a97795bc4a870c6cdcda69877d0636c4 (patch)
tree28efdd7f7dad9897316737a346e072b4c21873b0
parent75f1165efc6dda4c9f76013a7fbf918b4b2a28c5 (diff)
downloadMPC-f93e5681a97795bc4a870c6cdcda69877d0636c4.tar.gz
Moved the configurable library decorator into the project target name and out of the target property. Having it in the target property caused CMake to lose all of the project dependencies.
-rw-r--r--templates/cmake.mpd4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/cmake.mpd b/templates/cmake.mpd
index 8c305482..262758aa 100644
--- a/templates/cmake.mpd
+++ b/templates/cmake.mpd
@@ -26,7 +26,7 @@ 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%>${LIBRARY_DECORATOR}<%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%>)
+set(PROJECT_TARGET <%if(exename)%><%exename%><%else%><%if(sharedname)%><%sharedname%>${LIBRARY_DECORATOR}<%else%><%if(staticname)%><%staticname%>${LIBRARY_DECORATOR}<%else%><%project_name%>${LIBRARY_DECORATOR}<%endif%><%endif%><%endif%>)
<%marker(macros)%>
<%if(exeout)%>
@@ -110,7 +110,7 @@ add_compile_definitions(<%staticflags%>)
<%if(use_lib_modifier)%>
<%foreach(configurations)%>
<%if(lib_modifier)%>
-set_target_properties(${PROJECT_TARGET} PROPERTIES <%uc(configuration)%>_POSTFIX "${LIBRARY_DECORATOR}<%lib_modifier%>")
+set_target_properties(${PROJECT_TARGET} PROPERTIES <%uc(configuration)%>_POSTFIX "<%lib_modifier%>")
<%endif%>
<%endfor%>
<%endif%>