diff options
author | Brad King <brad.king@kitware.com> | 2023-02-24 13:36:17 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-24 13:36:25 (GMT) |
commit | d6831f99fafa44433212fc5f2fa8b6f4420a1fda (patch) | |
tree | bc1a3712e6ca79ada826cfe190277d85ac7c5eb6 /Modules | |
parent | 88b75204e51751cbf8203e27505aee04ca51eb93 (diff) | |
parent | 9af0e67ee506b81421169c1828a558a71941b13c (diff) | |
download | CMake-d6831f99fafa44433212fc5f2fa8b6f4420a1fda.zip CMake-d6831f99fafa44433212fc5f2fa8b6f4420a1fda.tar.gz CMake-d6831f99fafa44433212fc5f2fa8b6f4420a1fda.tar.bz2 |
Merge topic 'FetchContent-generator-instance'
9af0e67ee5 FetchContent: Relay CMAKE_GENERATOR_INSTANCE
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8195
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/FetchContent.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FetchContent.cmake b/Modules/FetchContent.cmake index 8afb9bc..a6250cc 100644 --- a/Modules/FetchContent.cmake +++ b/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() |