diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-04-16 19:58:17 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-04-16 19:58:17 +0200 |
| commit | 2c3507a9d2a32749df695ee04f7612c3049c86c8 (patch) | |
| tree | 7fa2f579cb90da0a7750b2cdaa2fbbb149b5d4ac | |
| parent | c7ea88046b8442c2c2bfd34c447adef094a4ee2d (diff) | |
Cleanup plugin, create proper target for link libraries. Remove unused
variables.
| -rw-r--r-- | indra/cmake/PluginAPI.cmake | 6 | ||||
| -rw-r--r-- | indra/llplugin/slplugin/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | indra/media_plugins/cef/CMakeLists.txt | 1 |
3 files changed, 10 insertions, 12 deletions
diff --git a/indra/cmake/PluginAPI.cmake b/indra/cmake/PluginAPI.cmake index d1649e8248..8c29f4a3c8 100644 --- a/indra/cmake/PluginAPI.cmake +++ b/indra/cmake/PluginAPI.cmake @@ -1,7 +1,9 @@ # -*- cmake -*- +create_target( ll::pluginlibraries) + if (WINDOWS) - set(PLUGIN_API_WINDOWS_LIBRARIES + set_target_libraries( ll::pluginlibraries wsock32 ws2_32 psapi @@ -9,8 +11,6 @@ if (WINDOWS) advapi32 user32 ) -else (WINDOWS) - set(PLUGIN_API_WINDOWS_LIBRARIES "") endif (WINDOWS) 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) diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index 94281465e7..c4cf292dde 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -63,7 +63,6 @@ add_library(media_plugin_cef target_link_libraries(media_plugin_cef media_plugin_base cef::cef - ${media_plugin_cef_LINK_LIBRARIES} ) if (WINDOWS) |