Fix race condition when building multiple IDL files (#40130)

* Fix race condition when building multiple IDL files

* Use the header as output

* Use a single target

* Use a separate command to set the stamp file

* Remove stamp file

Author: OneBlue

cmake/FindIDL.cmake

@@ -11,6 +11,7 @@ function(add_idl target idl_files_with_proxy idl_files_no_proxy)
     endforeach()
 
     string(TOLOWER ${TARGET_PLATFORM} IDL_ENV)
+    set(PREVIOUS_OUTPUT "")
 
     foreach(idl_file ${idl_files_with_proxy})
 
@@ -27,15 +28,16 @@ function(add_idl target idl_files_with_proxy idl_files_no_proxy)
         set(MIDL_OUTPUT ${IDL_HEADER} ${IDL_I} ${IDL_P} ${IDL_DLLDATA})
 
         add_custom_command(
-            OUTPUT ${MIDL_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}/CmakeFiles/${target}
+            OUTPUT ${MIDL_OUTPUT}
             COMMAND midl /nologo /target NT100 /env "${IDL_ENV}" /Zp8 /char unsigned /ms_ext /c_ext /h ${IDL_HEADER} /iid ${IDL_I} /proxy ${IDL_P} /dlldata ${IDL_DLLDATA} ${idl_file} ${IDL_DEFINITIONS}
-            COMMAND ${CMAKE_COMMAND} -E touch "${CMAKE_CURRENT_BINARY_DIR}/CmakeFiles/${target}"
             WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-            DEPENDS ${idl_file}
+            DEPENDS ${idl_file} ${PREVIOUS_OUTPUT}
             MAIN_DEPENDENCY ${idl_file}
             VERBATIM
         )
 
+        set(PREVIOUS_OUTPUT ${IDL_HEADER})
+
         set_source_files_properties(${MIDL_OUTPUT} PROPERTIES GENERATED TRUE)
         list(APPEND TARGET_OUTPUTS ${MIDL_OUTPUT})
 
@@ -48,9 +50,8 @@ function(add_idl target idl_files_with_proxy idl_files_no_proxy)
         set(IDL_HEADER ${OUTPUT_DIR}/${IDL_NAME}.h)
 
         add_custom_command(
-            OUTPUT ${IDL_HEADER} ${CMAKE_CURRENT_BINARY_DIR}/CmakeFiles/${target}
+            OUTPUT ${IDL_HEADER}
             COMMAND midl /nologo /target NT100 /env "${IDL_ENV}" /Zp8 /char unsigned /ms_ext /c_ext /h ${IDL_HEADER} ${idl_file} ${IDL_DEFINITIONS}
-            COMMAND ${CMAKE_COMMAND} -E touch "${CMAKE_CURRENT_BINARY_DIR}/CmakeFiles/${target}"
             WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
             DEPENDS ${idl_file}
             MAIN_DEPENDENCY ${idl_file}

src/windows/WslcSDK/CMakeLists.txt

@@ -15,7 +15,7 @@ set(HEADERS
 
 add_library(wslcsdk SHARED ${SOURCES} ${HEADERS} wslcsdk.def)
 set_target_properties(wslcsdk PROPERTIES EXCLUDE_FROM_ALL FALSE)
-add_dependencies(wslcsdk wslcidl)
+add_dependencies(wslcsdk wslserviceidl)
 target_link_libraries(wslcsdk ${COMMON_LINK_LIBRARIES} legacy_stdio_definitions common)
 target_precompile_headers(wslcsdk REUSE_FROM common)
 set_target_properties(wslcsdk PROPERTIES FOLDER windows)

src/windows/common/CMakeLists.txt

@@ -133,7 +133,7 @@ set(HEADERS
     )
 
 add_library(common STATIC ${SOURCES} ${HEADERS})
-add_dependencies(common wslserviceidl wslcidl localization wslservicemc wslinstalleridl)
+add_dependencies(common wslserviceidl localization wslservicemc wslinstalleridl)
 
 target_precompile_headers(common PRIVATE precomp.h)
 set_target_properties(common PROPERTIES FOLDER windows)

src/windows/service/exe/CMakeLists.txt

@@ -56,7 +56,7 @@ set(HEADERS
     WSLCSessionManagerFactory.h)
 
 add_executable(wslservice ${SOURCES} ${HEADERS})
-add_dependencies(wslservice wslserviceidl wslcidl wslservicemc)
+add_dependencies(wslservice wslserviceidl wslservicemc)
 add_compile_definitions(__WRL_CLASSIC_COM__)
 add_compile_definitions(__WRL_DISABLE_STATIC_INITIALIZE__)
 add_compile_definitions(USE_COM_CONTEXT_DEF=1)

src/windows/service/inc/CMakeLists.txt

@@ -1,4 +1,3 @@
-add_idl(wslserviceidl "wslservice.idl" "windowsdefs.idl")
-add_idl(wslcidl "wslc.idl" "")
+add_idl(wslserviceidl "wslservice.idl;wslc.idl" "windowsdefs.idl")
+
 set_target_properties(wslserviceidl PROPERTIES FOLDER windows)
-set_target_properties(wslcidl PROPERTIES FOLDER windows)

src/windows/service/stub/CMakeLists.txt

@@ -10,6 +10,6 @@ set(SOURCES
 set_source_files_properties(${SOURCES} PROPERTIES GENERATED TRUE)
 
 add_library(wslserviceproxystub SHARED ${SOURCES})
-add_dependencies(wslserviceproxystub wslserviceidl wslcidl)
+add_dependencies(wslserviceproxystub wslserviceidl)
 target_link_libraries(wslserviceproxystub ${COMMON_LINK_LIBRARIES})
 set_target_properties(wslserviceproxystub PROPERTIES FOLDER windows)

src/windows/wslcsession/CMakeLists.txt

@@ -45,7 +45,7 @@ set(HEADERS
     WSLCVolumeMetadata.h)
 
 add_executable(wslcsession WIN32 ${SOURCES} ${HEADERS})
-add_dependencies(wslcsession wslcidl)
+add_dependencies(wslcsession wslserviceidl)
 add_compile_definitions(__WRL_CLASSIC_COM__)
 add_compile_definitions(USE_COM_CONTEXT_DEF=1)
 target_link_libraries(wslcsession