From f93e5681a97795bc4a870c6cdcda69877d0636c4 Mon Sep 17 00:00:00 2001 From: Chad Elliott Date: Tue, 25 Oct 2022 13:19:35 -0500 Subject: 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. --- templates/cmake.mpd | 4 ++-- 1 file 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(" ")%>$<$>:<%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%> -- cgit v1.2.1