From 65a3e3a6c3e303057d9eb3f4124a486b741d445d Mon Sep 17 00:00:00 2001 From: Chad Elliott Date: Wed, 26 Oct 2022 07:38:44 -0500 Subject: Replaced hard-coded calls to find_package() with "packages" template variable to allow for multiple user-determined packages. --- templates/cmake.mpd | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'templates') diff --git a/templates/cmake.mpd b/templates/cmake.mpd index 262758aa..fa2d6ffb 100644 --- a/templates/cmake.mpd +++ b/templates/cmake.mpd @@ -7,21 +7,10 @@ option(BUILD_SHARED_LIBS "Build using shared libraries" <%if(need_staticflags)%> <%if(pre_find_package)%> <%pre_find_package%> <%endif%> -<%if(contains(env_includes, DDS_ROOT))%> -find_package(OpenDDS REQUIRED) - -<%else%> -<%if(contains(env_includes, TAO_ROOT))%> -find_package(TAO REQUIRED) - -<%else%> -<%if(contains(env_includes, ACE_ROOT))%> -find_package(ACE REQUIRED) +<%foreach(packages)%> +find_package(<%package%> REQUIRED) +<%endfor%> -<%else%> -<%endif%> -<%endif%> -<%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%>${LIBRARY_DECORATOR}<%lib_modifier%><%endfor%>><%fornotlast("\n")%><%endfor%><%endif%><%if(lit_libs)%> <%lit_libs%><%endif%><%if(pure_libs)%> <%pure_libs%><%endif%>) -- cgit v1.2.1