From fa8be29dfa303d74f0279ec8d90c42a4efcce514 Mon Sep 17 00:00:00 2001 From: bjorn Date: Fri, 6 May 2022 11:11:59 -0700 Subject: [PATCH] Use unique subdirectories for plugins in CMake; --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 299434dd..b3571a69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -283,14 +283,15 @@ endif() set(LOVR 1) link_libraries(${LOVR_LUA}) file(GLOB LOVR_PLUGINS ${CMAKE_SOURCE_DIR}/plugins/*) -foreach(plugin ${LOVR_PLUGINS}) - if(IS_DIRECTORY ${plugin} AND EXISTS ${plugin}/CMakeLists.txt) - add_subdirectory(${plugin} "${CMAKE_CURRENT_BINARY_DIR}/plugins/lib") - get_directory_property(PLUGIN_TARGETS DIRECTORY ${plugin} DEFINITION LOVR_PLUGIN_TARGETS) +foreach(PLUGIN_PATH ${LOVR_PLUGINS}) + if(IS_DIRECTORY ${PLUGIN_PATH} AND EXISTS ${PLUGIN_PATH}/CMakeLists.txt) + get_filename_component(PLUGIN "${PLUGIN_PATH}" NAME) + add_subdirectory(${PLUGIN_PATH} "${CMAKE_CURRENT_BINARY_DIR}/plugins/${PLUGIN}") + get_directory_property(PLUGIN_TARGETS DIRECTORY ${PLUGIN_PATH} DEFINITION LOVR_PLUGIN_TARGETS) if(NOT PLUGIN_TARGETS) - get_directory_property(PLUGIN_TARGETS DIRECTORY ${plugin} BUILDSYSTEM_TARGETS) + get_directory_property(PLUGIN_TARGETS DIRECTORY ${PLUGIN_PATH} BUILDSYSTEM_TARGETS) endif() - set_target_properties(${PLUGIN_TARGETS} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/plugins/lib") + set_target_properties(${PLUGIN_TARGETS} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/plugins/${PLUGIN}") list(APPEND ALL_PLUGIN_TARGETS ${PLUGIN_TARGETS}) endif() endforeach()