Browse Source

FetchContent: Relay CMAKE_GENERATOR_INSTANCE

If set, relay `CMAKE_GENERATOR_INSTANCE`.  It may affect compiler
detection in the subbuild folder.

Fixes: #24404
Máté Ferenc Nagy-Egri 2 years ago
parent
commit
9af0e67ee5
1 changed files with 3 additions and 1 deletions
  1. 3 1
      Modules/FetchContent.cmake

+ 3 - 1
Modules/FetchContent.cmake

@@ -1536,7 +1536,9 @@ ExternalProject_Add_Step(${contentName}-populate copyfile
     if(CMAKE_GENERATOR_TOOLSET)
       list(APPEND subCMakeOpts "-T${CMAKE_GENERATOR_TOOLSET}")
     endif()
-
+    if(CMAKE_GENERATOR_INSTANCE)
+      list(APPEND subCMakeOpts "-DCMAKE_GENERATOR_INSTANCE:INTERNAL=${CMAKE_GENERATOR_INSTANCE}")
+    endif()
     if(CMAKE_MAKE_PROGRAM)
       list(APPEND subCMakeOpts "-DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM}")
     endif()