diff options
| author | Marcin Junczys-Dowmunt <marcinjd@microsoft.com> | 2021-03-22 01:35:57 +0300 |
|---|---|---|
| committer | Marcin Junczys-Dowmunt <marcinjd@microsoft.com> | 2021-03-22 01:35:57 +0300 |
| commit | 9e36c73fa9016f308e7ae81dcf4c5fd476ce4823 (patch) | |
| tree | 0c3d59c7054ad8e94a14fdd3b049fb4b3b1f40d7 /src | |
| parent | c89efbe9192974664ef8a54b99f2202c0ac12411 (diff) | |
| parent | 326b9400e9b4dfa6bbf445e4cbbc83ea5145b6b7 (diff) | |
Merge branch 'master' into pmaster
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rd_party/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt index c1d7c52f..2bef3129 100644 --- a/src/3rd_party/CMakeLists.txt +++ b/src/3rd_party/CMakeLists.txt @@ -183,6 +183,10 @@ if(CUDA_FOUND) BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/nccl CONFIGURE_COMMAND "" BUILD_COMMAND + # Note: $(MAKE) here causes CMake cache generation via Ninja failing (Windows build with + # CMake only) because Ninja complains about unescaped $ signs. This happens only if + # COMPILE_CUDA=on and because of that, USE_NCCL=off is used in CMakeSettings.json for now. + # @TODO: find proper escaping that works for MSVC builds. "\$(MAKE)" -f ${CMAKE_CURRENT_SOURCE_DIR}/nccl/Makefile src.build BUILDDIR=${CMAKE_BINARY_DIR}/local CUDA_HOME=${CUDA_TOOLKIT_ROOT_DIR} CUDA8_GENCODE=${GENCODE} CXX=${CMAKE_CXX_COMPILER} CXX_FLAGS=${NCCL_FLAGS} |