Merge https://github.com/Microsoft/vcpkg

4 files changed, 86 insertions, 15 deletions

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index d3e1e814a..513c33ecb 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -1,6 +1,5 @@
 # Mark variables as used so cmake doesn't complain about them
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_TOOLCHAIN_FILE})
-
 if(NOT VCPKG_TOOLCHAIN)
     if(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$")
         set(_VCPKG_TARGET_TRIPLET_ARCH x86)
@@ -55,7 +54,6 @@ if(NOT VCPKG_TOOLCHAIN)
         endif()
     endwhile()
     set(_VCPKG_ROOT_DIR ${_VCPKG_ROOT_DIR_CANDIDATE})
-
     set(_VCPKG_INSTALLED_DIR ${_VCPKG_ROOT_DIR}/installed)
 
     if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE)
@@ -103,6 +101,12 @@ if(NOT VCPKG_TOOLCHAIN)
     )
 
     set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools)
+    file(GLOB _VCPKG_TOOLS_DIRS ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/*)
+    foreach(_VCPKG_TOOLS_DIR ${_VCPKG_TOOLS_DIRS})
+        if(IS_DIRECTORY ${_VCPKG_TOOLS_DIR})
+            set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_TOOLS_DIR})
+        endif()
+    endforeach()
 
     option(VCPKG_APPLOCAL_DEPS "Automatically copy dependencies into the output directory for executables." ON)
     function(add_executable name)
diff --git a/scripts/cmake/vcpkg_acquire_depot_tools.cmake b/scripts/cmake/vcpkg_acquire_depot_tools.cmake
new file mode 100644
index 000000000..1cc375725
--- /dev/null
+++ b/scripts/cmake/vcpkg_acquire_depot_tools.cmake
@@ -0,0 +1,48 @@
+function(vcpkg_acquire_depot_tools PATH_TO_ROOT_OUT)
+  set(TOOLPATH ${DOWNLOADS}/tools/depot_tools)
+  set(URL "https://storage.googleapis.com/chrome-infra/depot_tools.zip")
+  set(ARCHIVE "depot_tools.zip")
+  set(STAMP "initialized-depot-tools.stamp")
+  set(downloaded_file_path ${DOWNLOADS}/${ARCHIVE})
+
+  if(NOT EXISTS "${TOOLPATH}/${STAMP}")
+
+    message(STATUS "Acquiring Depot Tools...")
+
+    if(EXISTS ${downloaded_file_path})
+      message(STATUS "Using cached ${downloaded_file_path}")
+    else()
+      if(_VCPKG_NO_DOWNLOADS)
+        message(FATAL_ERROR "Downloads are disabled, but '${downloaded_file_path}' does not exist.")
+      endif()
+      file(DOWNLOAD ${URL} ${downloaded_file_path} STATUS download_status)
+      list(GET download_status 0 status_code)
+      if (NOT "${status_code}" STREQUAL "0")
+        message(STATUS "Downloading ${URL}... Failed. Status: ${download_status}")
+        file(REMOVE ${downloaded_file_path})
+        set(download_success 0)
+      else()
+        message(STATUS "Downloading ${URL}... OK")
+        set(download_success 1)
+      endif()
+
+      if (NOT ${download_success})
+        message(FATAL_ERROR
+          "\n"
+          "    Failed to download file.\n"
+        "    Add mirrors or submit an issue at https://github.com/Microsoft/vcpkg/issues\n")
+      endif()
+    endif()
+
+
+    file(REMOVE_RECURSE ${TOOLPATH})
+    file(MAKE_DIRECTORY ${TOOLPATH})
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E tar xzf ${DOWNLOADS}/${ARCHIVE}
+      WORKING_DIRECTORY ${TOOLPATH}
+    )
+    file(WRITE "${TOOLPATH}/${STAMP}" "0")
+    message(STATUS "Acquiring Depot Tools... OK")
+  endif()
+  set(${PATH_TO_ROOT_OUT} ${TOOLPATH} PARENT_SCOPE)
+endfunction()
diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake
index a0e9633c3..29f0f8dff 100644
--- a/scripts/cmake/vcpkg_common_functions.cmake
+++ b/scripts/cmake/vcpkg_common_functions.cmake
@@ -19,4 +19,5 @@ include(vcpkg_copy_pdbs)
 include(vcpkg_copy_tool_dependencies)
 include(vcpkg_get_program_files_32_bit)
 include(vcpkg_get_program_files_platform_bitness)
-include(vcpkg_get_windows_sdk)
\ No newline at end of file
+include(vcpkg_get_windows_sdk)
+include(vcpkg_acquire_depot_tools)
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index 7d43336de..07acfc8ea 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -109,11 +109,26 @@ function(vcpkg_configure_cmake)
         list(APPEND _csc_OPTIONS -DBUILD_SHARED_LIBS=OFF)
     endif()
 
+    if((NOT DEFINED VCPKG_CXX_FLAGS_DEBUG AND NOT DEFINED VCPKG_C_FLAGS_DEBUG) OR
+        (DEFINED VCPKG_CXX_FLAGS_DEBUG AND DEFINED VCPKG_C_FLAGS_DEBUG))
+    else()
+        message(FATAL_ERROR "You must set both the VCPKG_CXX_FLAGS_DEBUG and VCPKG_C_FLAGS_DEBUG")
+    endif()
+    if((NOT DEFINED VCPKG_CXX_FLAGS_RELEASE AND NOT DEFINED VCPKG_C_FLAGS_RELEASE) OR
+        (DEFINED VCPKG_CXX_FLAGS_RELEASE AND DEFINED VCPKG_C_FLAGS_RELEASE))
+    else()
+        message(FATAL_ERROR "You must set both the VCPKG_CXX_FLAGS_RELEASE and VCPKG_C_FLAGS_RELEASE")
+    endif()
+    if((NOT DEFINED VCPKG_CXX_FLAGS AND NOT DEFINED VCPKG_C_FLAGS) OR
+        (DEFINED VCPKG_CXX_FLAGS AND DEFINED VCPKG_C_FLAGS))
+    else()
+        message(FATAL_ERROR "You must set both the VCPKG_CXX_FLAGS and VCPKG_C_FLAGS")
+    endif()
 
     list(APPEND _csc_OPTIONS
         "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}"
-        "-DCMAKE_CXX_FLAGS= /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP"
-        "-DCMAKE_C_FLAGS= /DWIN32 /D_WINDOWS /W3 /utf-8 /MP"
+        "-DCMAKE_CXX_FLAGS= /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP ${VCPKG_CXX_FLAGS}"
+        "-DCMAKE_C_FLAGS= /DWIN32 /D_WINDOWS /W3 /utf-8 /MP ${VCPKG_C_FLAGS}"
         "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
         "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"
         "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON"
@@ -123,28 +138,31 @@ function(vcpkg_configure_cmake)
         "-DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/buildsystems/vcpkg.cmake"
         "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON"
     )
+
     if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic)
         list(APPEND _csc_OPTIONS_DEBUG
-            "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1"
-            "-DCMAKE_C_FLAGS_DEBUG=/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1"
+            "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}"
+            "-DCMAKE_C_FLAGS_DEBUG=/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}"
         )
         list(APPEND _csc_OPTIONS_RELEASE
-            "-DCMAKE_CXX_FLAGS_RELEASE=/MD /O2 /Oi /Gy /DNDEBUG /Zi"
-            "-DCMAKE_C_FLAGS_RELEASE=/MD /O2 /Oi /Gy /DNDEBUG /Zi"
+            "-DCMAKE_CXX_FLAGS_RELEASE=/MD /O2 /Oi /Gy /DNDEBUG /Zi ${VCPKG_CXX_FLAGS_RELEASE}"
+            "-DCMAKE_C_FLAGS_RELEASE=/MD /O2 /Oi /Gy /DNDEBUG /Zi ${VCPKG_C_FLAGS_RELEASE}"
         )
+
     elseif(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL static)
         list(APPEND _csc_OPTIONS_DEBUG
-            "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1"
-            "-DCMAKE_C_FLAGS_DEBUG=/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1"
+            "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}"
+            "-DCMAKE_C_FLAGS_DEBUG=/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}"
         )
         list(APPEND _csc_OPTIONS_RELEASE
-            "-DCMAKE_CXX_FLAGS_RELEASE=/MT /O2 /Oi /Gy /DNDEBUG /Zi"
-            "-DCMAKE_C_FLAGS_RELEASE=/MT /O2 /Oi /Gy /DNDEBUG /Zi"
+            "-DCMAKE_CXX_FLAGS_RELEASE=/MT /O2 /Oi /Gy /DNDEBUG /Zi ${VCPKG_CXX_FLAGS_RELEASE}"
+            "-DCMAKE_C_FLAGS_RELEASE=/MT /O2 /Oi /Gy /DNDEBUG /Zi ${VCPKG_C_FLAGS_RELEASE}"
         )
     endif()
+
     list(APPEND _csc_OPTIONS_RELEASE
-        "-DCMAKE_SHARED_LINKER_FLAGS_RELEASE=/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF"
-        "-DCMAKE_EXE_LINKER_FLAGS_RELEASE=/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF"
+        "-DCMAKE_SHARED_LINKER_FLAGS_RELEASE=/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS}"
+        "-DCMAKE_EXE_LINKER_FLAGS_RELEASE=/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF ${VCPKG_LINKER_FLAGS}"
     )
 
     message(STATUS "Configuring ${TARGET_TRIPLET}-rel")