[CMake] Don't install macros from the main CMake invocation

Author: rintaro

Sources/CMakeLists.txt

@@ -41,7 +41,7 @@ if(SwiftTesting_MACRO STREQUAL "<auto>")
   endif()
 
   # Build and install the plugin into the current build directry.
-  set(SwiftTesting_MACRO_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/plugin")
+  set(SwiftTesting_MACRO_INSTALL_PREFIX "${CMAKE_BINARY_DIR}")
 
   ExternalProject_Add(TestingMacros
     PREFIX "tm"
@@ -65,17 +65,11 @@ if(SwiftTesting_MACRO STREQUAL "<auto>")
   # properties of its targets here.
   if(NOT SwiftTesting_BuildMacrosAsExecutables)
     if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-      set(SwiftTesting_MACRO_PATH "${SwiftTesting_MACRO_INSTALL_PREFIX}/lib/libTestingMacros.dylib")
-      install(PROGRAMS "${SwiftTesting_MACRO_PATH}"
-        DESTINATION lib/swift/host/plugins/testing)
+      set(SwiftTesting_MACRO_PATH "${SwiftTesting_MACRO_INSTALL_PREFIX}/lib/swift/host/plugins/testing/libTestingMacros.dylib")
     elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
-      set(SwiftTesting_MACRO_PATH "${SwiftTesting_MACRO_INSTALL_PREFIX}/lib/libTestingMacros.so")
-      install(PROGRAMS "${SwiftTesting_MACRO_PATH}"
-        DESTINATION lib/swift/host/plugins)
+      set(SwiftTesting_MACRO_PATH "${SwiftTesting_MACRO_INSTALL_PREFIX}/lib/swift/host/plugins/libTestingMacros.so")
     elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
       set(SwiftTesting_MACRO_PATH "${SwiftTesting_MACRO_INSTALL_PREFIX}/bin/TestingMacros.dll")
-      install(PROGRAMS "${SwiftTesting_MACRO_PATH}"
-        DESTINATION bin)
     else()
       message(FATAL_ERROR "Unable to determine the library name for TestingMacros based on system name: ${CMAKE_HOST_SYSTEM_NAME}")
     endif()

Sources/TestingMacros/CMakeLists.txt

@@ -65,13 +65,15 @@ else()
   set_property(TARGET TestingMacros PROPERTY INSTALL_RPATH)
   set_property(TARGET TestingMacros PROPERTY BUILD_WITH_INSTALL_RPATH YES)
 
-  if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    install(TARGETS TestingMacros
-      RUNTIME DESTINATION bin)
+  if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(plugin_destination_dir "lib/swift/host/plugins/testing")
   else()
-    # Other platforms, TestingMacros is installed by the parent project.
-    install(TARGETS TestingMacros)
+    set(plugin_destination_dir "lib/swift/host/plugins")
   endif()
+
+  install(TARGETS TestingMacros
+    LIBRARY DESTINATION "${plugin_destination_dir}"
+    RUNTIME DESTINATION bin)
 endif()
 
 target_sources(TestingMacros PRIVATE