Cleanup plugin, create proper target for link libraries. Remove unused

variables.

1 files changed, 7 insertions, 8 deletions

diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 9daf7d327c..1fa4f0346d 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -20,10 +20,9 @@ if (DARWIN)
   )
 endif (DARWIN)
 
-set_source_files_properties(${SLPlugin_HEADER_FILES}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
-
 if (SLPlugin_HEADER_FILES)
+  set_source_files_properties(${SLPlugin_HEADER_FILES}
+          PROPERTIES HEADER_FILE_ONLY TRUE)
   list(APPEND SLPlugin_SOURCE_FILES ${SLPlugin_HEADER_FILES})
 endif (SLPlugin_HEADER_FILES)
 
@@ -46,11 +45,11 @@ set_target_properties(SLPlugin
 endif ()
 
 target_link_libraries(SLPlugin
-      llplugin
-      llmessage
-      llcommon
-  ${PLUGIN_API_WINDOWS_LIBRARIES}
-)
+        llplugin
+        llmessage
+        llcommon
+        ll::pluginlibraries
+        )
 
 if (DARWIN)
   # Make sure the app bundle has a Resources directory (it will get populated by viewer-manifest.py later)