Replace make.bat with make_vcpkg.bat

Author: jimmysoda

.vscode/tasks.json

@@ -7,7 +7,7 @@
             "label": "vcpkg-x64-windows-release",
             "type": "shell",
             "windows": {
-                "command": "${workspaceFolder}\\make_vcpkg.bat"
+                "command": "${workspaceFolder}\\make.bat"
             },
             "options": {
                 "env": {
@@ -27,13 +27,13 @@
             },
             "problemMatcher": [
                 "$msCompile"
-            ]            
+            ]
         },
         {
             "label": "vcpkg-x64-windows-debug",
             "type": "shell",
             "windows": {
-                "command": "${workspaceFolder}\\make_vcpkg.bat"
+                "command": "${workspaceFolder}\\make.bat"
             },
             "options": {
                 "env": {
@@ -51,110 +51,6 @@
                 "reveal": "always",
                 "panel": "new"
             },
-            "problemMatcher": [
-                "$msCompile"
-            ]            
-        },
-        {
-            "label": "pdalc-vc15-release",
-            "type": "shell",
-            "windows": {
-                "command": "${workspaceFolder}\\make.bat"
-            },
-            "options": {
-                "env": {
-                    "BUILD_TYPE": "Release",
-                    "COMPILER_ID": "vc.15",
-                    "OSGEO4W_ROOT": "C:\\OSGeo4W64",
-                    "GENERATOR": "Visual Studio 15 2017 Win64",
-                }
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "presentation": {
-                "reveal": "always",
-                "panel": "new"
-            },
-            "problemMatcher": [
-                "$msCompile"
-            ]            
-        },
-        {
-            "label": "pdalc-vc15-debug",
-            "type": "shell",
-            "windows": {
-                "command": "${workspaceFolder}\\make.bat"
-            },
-            "options": {
-                "env": {
-                    "BUILD_TYPE": "Debug",
-                    "COMPILER_ID": "vc.15",
-                    "OSGEO4W_ROOT": "C:\\OSGeo4W64",
-                    "GENERATOR": "Visual Studio 15 2017 Win64",
-                }
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "presentation": {
-                "reveal": "always",
-                "panel": "new"
-            },
-            "problemMatcher": [
-                "$msCompile"
-            ]
-        },
-        {
-            "label": "pdalc-vc14-release",
-            "type": "shell",
-            "windows": {
-                "command": "${workspaceFolder}\\make.bat"
-            },
-            "options": {
-                "env": {
-                    "BUILD_TYPE": "Release",
-                    "COMPILER_ID": "vc.14",
-                    "OSGEO4W_ROOT": "C:\\OSGeo4W64",
-                    "GENERATOR": "Visual Studio 14 2015 Win64",
-                }
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "presentation": {
-                "reveal": "always",
-                "panel": "new"
-            },
-            "problemMatcher": [
-                "$msCompile"
-            ]            
-        },
-        {
-            "label": "pdalc-vc14-debug",
-            "type": "shell",
-            "windows": {
-                "command": "${workspaceFolder}\\make.bat"
-            },
-            "options": {
-                "env": {
-                    "BUILD_TYPE": "Debug",
-                    "COMPILER_ID": "vc.14",
-                    "OSGEO4W_ROOT": "C:\\OSGeo4W64",
-                    "GENERATOR": "Visual Studio 14 2015 Win64",
-                }
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "presentation": {
-                "reveal": "always",
-                "panel": "new"
-            },
             "problemMatcher": [
                 "$msCompile"
             ]

make.bat

@@ -3,25 +3,29 @@
 :: This script assumes that cmake is in PATH
 :: TODO Auto-detect latest platform
 set SCRIPT_DIR=%~dp0
-if not defined GENERATOR set GENERATOR=Visual Studio 15 2017 Win64
-if not defined COMPILER_ID set COMPILER_ID=vc.15
+
+::cmake .. "-DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake" -G "Sublime Text 2 - Ninja" -DVCPKG_TARGET_TRIPLET=x86-windows-static -DCMAKE_BUILD_TYPE=Debug
+
+if not defined TOOLCHAIN set TOOLCHAIN=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake
 if not defined BUILD_TYPE set BUILD_TYPE=Release
+if not defined ARCH set ARCH=x64
+if not defined TARGET_OS set TARGET_OS=windows
 
-set BUILD_DIR=%SCRIPT_DIR%\build\windows.amd64.%COMPILER_ID%
+set TRIPLET=%ARCH%-%TARGET_OS%
+
+set BUILD_DIR=%SCRIPT_DIR%\build\%TRIPLET%
 
 if exist "%BUILD_DIR%\pdal-c.sln" (
 	pushd "%BUILD_DIR%"
 ) else (
 	mkdir "%BUILD_DIR%"
 	pushd "%BUILD_DIR%"
 
-	mkdir install
-
-	cmake -G "%GENERATOR%" ^
+	cmake ../.. ^
 		-DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
-		-DCMAKE_PREFIX_PATH=%OSGEO4W_ROOT% ^
-		-DCMAKE_INSTALL_PREFIX=./install ^
-		../..
+		-DCMAKE_TOOLCHAIN_FILE=%TOOLCHAIN% ^
+		-DVCPKG_TARGET_TRIPLET=%TRIPLET% ^
+		-DCMAKE_GENERATOR_PLATFORM=%ARCH%
 )
 
 :: Build and install solution