[incubator-mxnet] branch master updated: Don't use FIRST_CUDA on generators which don't support toolsets (#9761)

[cj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cjolivier01 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 08fc71b  Don't use FIRST_CUDA on generators which don't support toolsets (#9761)
08fc71b is described below

commit 08fc71b9ea76b6ccc85f2f140e51877416134515
Author: Pedro Larroy <92...@users.noreply.github.com>
AuthorDate: Sat Feb 10 22:56:50 2018 +0100

    Don't use FIRST_CUDA on generators which don't support toolsets (#9761)
---
 CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7c67be..cddbf72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.0.2)
-
-if((${CMAKE_VERSION} VERSION_GREATER "3.9.0") OR (${CMAKE_VERSION} VERSION_EQUAL "3.9.0"))
+message(STATUS "CMake version '${CMAKE_VERSION}' using generator '${CMAKE_GENERATOR}'")
+if(((${CMAKE_GENERATOR} MATCHES "Visual Studio.*") OR (${CMAKE_GENERATOR} MATCHES "Xcode.*"))
+        AND ((${CMAKE_VERSION} VERSION_GREATER "3.9.0") OR (${CMAKE_VERSION} VERSION_EQUAL "3.9.0")))
+  # Toolsets are only supported for Visual Studio and Xcode
   set(FIRST_CUDA TRUE)
 else()
   set(FIRST_CUDA FALSE)

-- 
To stop receiving notification emails like this one, please contact
cjolivier01@apache.org.