Solving bugs from core_plugin.

metacall · Aug 3, 2022 · e03afe2 · e03afe2
1 parent 0e2f483
commit e03afe2
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/source/cli/plugins/core_plugin/CMakeLists.txt b/source/cli/plugins/core_plugin/CMakeLists.txt
@@ -101,11 +101,32 @@ generate_export_header(${target}
 # Project options
 #
 
+set(CUSTOM_OUTPUT_DIRECTORY "${PROJECT_OUTPUT_DIR}/plugins/${target}")
+
 set_target_properties(${target}
 	PROPERTIES
 	${DEFAULT_PROJECT_OPTIONS}
 	FOLDER "${IDE_FOLDER}"
 	BUNDLE $<$<BOOL:${APPLE}>:$<$<VERSION_GREATER:${PROJECT_OS_VERSION},8>>>
+
+	# Define custom build output directory
+	LIBRARY_OUTPUT_DIRECTORY "${CUSTOM_OUTPUT_DIRECTORY}"
+	LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CUSTOM_OUTPUT_DIRECTORY}"
+	LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CUSTOM_OUTPUT_DIRECTORY}"
+	LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CUSTOM_OUTPUT_DIRECTORY}"
+	LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${CUSTOM_OUTPUT_DIRECTORY}"
+
+	RUNTIME_OUTPUT_DIRECTORY "${CUSTOM_OUTPUT_DIRECTORY}"
+	RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CUSTOM_OUTPUT_DIRECTORY}"
+	RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CUSTOM_OUTPUT_DIRECTORY}"
+	RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CUSTOM_OUTPUT_DIRECTORY}"
+	RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CUSTOM_OUTPUT_DIRECTORY}"
+
+	ARCHIVE_OUTPUT_DIRECTORY "${CUSTOM_OUTPUT_DIRECTORY}"
+	ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CUSTOM_OUTPUT_DIRECTORY}"
+	ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CUSTOM_OUTPUT_DIRECTORY}"
+	ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CUSTOM_OUTPUT_DIRECTORY}"
+	ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL "${CUSTOM_OUTPUT_DIRECTORY}"
 )
 
 #
@@ -188,21 +209,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

diff --git a/source/tests/metacall_plugin_extension_destroy_order_test/CMakeLists.txt b/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
 )
 
 #