Review of PR #298

Author: viferga

source/cli/plugins/CMakeLists.txt

@@ -6,8 +6,8 @@ endif()
 # Extension sub-projects
 add_subdirectory(core_plugin)
 
-#Install plugin directory
+# Install plugin directory
 install(DIRECTORY ${PROJECT_OUTPUT_DIR}/plugins
-	DESTINATION ${INSTALL_LIB}
+	DESTINATION ${INSTALL_LIB}/plugins
 	PATTERN "test[-_]*" EXCLUDE
 )

source/cli/plugins/core_plugin/CMakeLists.txt

@@ -196,17 +196,17 @@ add_dependencies(${target}
 # Deployment
 #
 
-#Copy metacall-*.json
+# 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-core_plugin.json ${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
-	RUNTIME DESTINATION ${INSTALL_BIN}	COMPONENT runtime
+	RUNTIME DESTINATION ${INSTALL_BIN}		COMPONENT runtime
 	LIBRARY DESTINATION ${INSTALL_SHARED}	COMPONENT runtime
-	ARCHIVE DESTINATION ${INSTALL_LIB}	COMPONENT dev
+	ARCHIVE DESTINATION ${INSTALL_LIB}		COMPONENT dev
 )

source/cli/plugins/core_plugin/source/metacall-core_plugin.json renamed to source/cli/plugins/core_plugin/source/metacall.json

@@ -95,6 +95,8 @@ target_link_libraries(${target}
 target_compile_definitions(${target}
 	PRIVATE
 	${DEFAULT_COMPILE_DEFINITIONS}
+
+	CORE_PLUGIN_PATH="${PROJECT_OUTPUT_DIR}/plugins/core_plugin/metacall.json"
 )
 
 #
@@ -106,12 +108,6 @@ target_compile_options(${target}
 	${DEFAULT_COMPILE_OPTIONS}
 )
 
-#
-#Define Macros
-#
-
-add_compile_definitions(CORE_PLUGIN_PATH="${PROJECT_OUTPUT_DIR}/plugins/core_plugin/metacall-core_plugin.json")
-
 #
 # Linker options
 #