Improved CMakeConfig.cmd to work better across multiple versions of

Visual Studio.
microsoft · Jun 10, 2019 · 21f4cdc · 21f4cdc
1 parent 4882cda
commit 21f4cdc
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/native/src/CMakeConfig.cmd b/native/src/CMakeConfig.cmd
@@ -36,14 +36,6 @@ if not exist "%CMAKEPATH%" (
 
 echo Found CMake at %CMAKEPATH%
 
-cd %~dp0
-if not exist ".config" (
-	mkdir .config
-)
-cd .config
-
-echo Running CMake configuration in %cd%
-
 rem Identify Visual Studio version and set CMake generator accordingly.
 set CMAKEGEN=""
 if "%VSVERSION%"=="15.0" (
@@ -57,8 +49,16 @@ if "%VSVERSION%"=="15.0" (
 	exit 1
 )
 
+set CONFIGDIR=".config\%VSVERSION%"
+cd %~dp0
+if not exist %CONFIGDIR% (
+	mkdir %CONFIGDIR%
+)
+cd %CONFIGDIR%
+echo Running CMake configuration in %cd%
+
 rem Call CMake.
-"%CMAKEPATH%" ..	                            ^
+"%CMAKEPATH%" ..\..	                            ^
 	-G %CMAKEGEN%                               ^
 	-A x64                                      ^
 	-DALLOW_COMMAND_LINE_BUILD=1                ^