switching to msbuild for conda windows (#448)

8f426250 · Quan (Andy) Gan · GitHub · 13272628 · 8f426250 · 8f426250
Unverified Commit 8f426250 authored Mar 13, 2019 by Quan (Andy) Gan Committed by GitHub Mar 13, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 9 deletions

conda/dgl/bld.bat conda/dgl/bld.bat +6 -6

conda/dgl/meta.yaml conda/dgl/meta.yaml +2 -3

No files found.
--- a/conda/dgl/bld.bat
+++ b/conda/dgl/bld.bat
+REM Needs vcvars64.bat to be called
 git submodule init
 git submodule update
 md build
 cd build
-cmake -DCMAKE_CXX_FLAGS="-DDMLC_LOG_STACK_TRACE=0 -DDGL_EXPORTS" -DCMAKE_MAKE_PROGRAM=mingw32-make .. -G "MinGW Makefiles"
+cmake -DCMAKE_CXX_FLAGS="/DDGL_EXPORTS" -DCMAKE_CONFIGURATION_TYPES="Release" .. -G "Visual Studio 15 2017 Win64" || EXIT /B 1
-if errorlevel 1 exit 1
+msbuild dgl.sln || EXIT /B 1
-mingw32-make
+COPY Release\dgl.dll .
-if errorlevel 1 exit 1
 cd ..\python
-"%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt
+"%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt || EXIT /B 1
-if errorlevel 1 exit 1
+EXIT /B
--- a/conda/dgl/meta.yaml
+++ b/conda/dgl/meta.yaml
@@ -3,7 +3,7 @@ package:
  version: "0.2"
 source:
-  git_rev: 0.1.x
+  git_rev: 0.2.x
  git_url: https://github.com/dmlc/dgl.git
 requirements:
@@ -12,8 +12,7 @@ requirements:
    - setuptools
    - cmake
    - git
-    - m2w64-gcc         # [win]
+    - cython
-    - m2w64-make        # [win]
  run:
    - python
    - numpy