Correct the placement of extension modules in the Windows build tree

TYoung86 · May 19, 2021 · 5a362c3 · 5a362c3
1 parent 7fd53e8
commit 5a362c3
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
@@ -330,17 +330,25 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
    set( DEFINES )
    list( APPEND DEFINES ${ADDITIONAL_DEFINES} )
 
+   # send the file to the proper place in the build tree, by setting the
+   # appropriate property for the platform
+   if (CMAKE_SYSTEM_NAME MATCHES "Windows")
+      set( DIRECTORY_PROPERTY RUNTIME_OUTPUT_DIRECTORY )
+   else ()
+      set( DIRECTORY_PROPERTY LIBRARY_OUTPUT_DIRECTORY )
+   endif ()
+
    if (LIBTYPE STREQUAL "MODULE")
       set( SHAPE "box" )
-      set_target_property_all( ${TARGET} LIBRARY_OUTPUT_DIRECTORY "${_MODDIR}" )
+      set_target_property_all( ${TARGET} ${DIRECTORY_PROPERTY} "${_MODDIR}" )
       set_target_properties( ${TARGET}
          PROPERTIES
             PREFIX ""
             FOLDER "modules" # for IDE organization
       )
    else()
       set( SHAPE "octagon" )
-      set_target_property_all( ${TARGET} LIBRARY_OUTPUT_DIRECTORY "${_EXEDIR}" )
+      set_target_property_all( ${TARGET} ${DIRECTORY_PROPERTY} "${_EXEDIR}" )
       set_target_properties( ${TARGET}
          PROPERTIES
             PREFIX ""