Merge pull request #5 from CaptainHorse/master

Handling of manually defined VCPKG_ROOT variable

Author: ataulien

automate-vcpkg.cmake

@@ -81,14 +81,12 @@ if (WIN32)
     endif()
 endif()
 
-if(NOT DEFINED ENV{VCPKG_ROOT})
-    if(WIN32)
-        set(VCPKG_ROOT ${VCPKG_FALLBACK_ROOT})
+if(NOT DEFINED VCPKG_ROOT)
+    if(NOT DEFINED ENV{VCPKG_ROOT})
+	    set(VCPKG_ROOT ${VCPKG_FALLBACK_ROOT})
     else()
-        set(VCPKG_ROOT ${VCPKG_FALLBACK_ROOT})
+        set(VCPKG_ROOT $ENV{VCPKG_ROOT})
     endif()
-else()
-    set(VCPKG_ROOT $ENV{VCPKG_ROOT})
 endif()
 
 # Installs a new copy of Vcpkg or updates an existing one