Solving bugs from core_plugin.

Author: viferga

source/cli/plugins/core_plugin/CMakeLists.txt

@@ -106,6 +106,13 @@ set_target_properties(${target}
 ${DEFAULT_PROJECT_OPTIONS}
 FOLDER "${IDE_FOLDER}"
 BUNDLE $<$<BOOL:${APPLE}>:$<$<VERSION_GREATER:${PROJECT_OS_VERSION},8>>>
+
+# Define custom build output directory
+LIBRARY_OUTPUT_DIRECTORY "${PROJECT_OUTPUT_DIR}/plugins/${target}"
+LIBRARY_OUTPUT_DIRECTORY_DEBUG "${PROJECT_OUTPUT_DIR}/plugins/${target}"
+LIBRARY_OUTPUT_DIRECTORY_RELEASE "${PROJECT_OUTPUT_DIR}/plugins/${target}"
+LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${PROJECT_OUTPUT_DIR}/plugins/${target}"
+LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${PROJECT_OUTPUT_DIR}/plugins/${target}"
 )
 
 #
@@ -188,21 +195,27 @@ target_link_libraries(${target}
 # Define dependencies
 #
 
+# Copy metacall.json
+add_custom_target(${target}-create-plugin-dir ALL
+WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_OUTPUT_DIR}/plugins/core_plugin
+COMMAND ${CMAKE_COMMAND} -E copy ${source_path}/metacall.json ${PROJECT_OUTPUT_DIR}/plugins/core_plugin
+)
+
+set_target_properties(${target}-create-plugin-dir
+PROPERTIES
+FOLDER "${IDE_FOLDER}"
+)
+
 add_dependencies(${target}
+${target}-create-plugin-dir
 plugin_extension
 )
 
 #
 # Deployment
 #
 
-# Copy metacall-*.json
-add_custom_target(${target}-create-plugin-dir ALL
-WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_OUTPUT_DIR}/plugins/core_plugin
-COMMAND ${CMAKE_COMMAND} -E copy ${source_path}/metacall.json ${PROJECT_OUTPUT_DIR}/plugins/core_plugin
-)
-
 # Library
 install(TARGETS ${target}
 EXPORT "${target}-export"COMPONENT dev

source/tests/metacall_plugin_extension_destroy_order_test/CMakeLists.txt

@@ -1,5 +1,5 @@
 # Check if this loader is enabled
-if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_EXT OR NOT OPTION_BUILD_EXTENSIONS)
+if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_EXT OR NOT OPTION_BUILD_EXTENSIONS OR NOT OPTION_BUILD_CLI)
 return()
 endif()
 
@@ -130,6 +130,7 @@ add_test(NAME ${target}
 add_dependencies(${target}
 ext_loader
 plugin_extension
+core_plugin # Requires core_plugin (from CLI) for reproducing it
 )
 
 #