Merge pull request #717 from elucideye/pr.android.windows

Android Studio, Windows host
elucideye · Aug 15, 2018 · 8786b23 · 8786b23
2 parents 3de4257 + b4f1ae5
commit 8786b23
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/examples/cmake/HunterGate.cmake b/src/examples/cmake/HunterGate.cmake
@@ -323,7 +323,11 @@ function(hunter_gate_download dir)
   )
 
   if(NOT download_result EQUAL 0)
-    hunter_gate_internal_error("Configure project failed")
+    hunter_gate_internal_error(
+        "Configure project failed."
+        "To reproduce the error run: ${CMAKE_COMMAND} -H${dir} -B${build_dir} -G${CMAKE_GENERATOR} ${toolchain_arg} ${make_arg}"
+        "In directory ${dir}"
+    )
   endif()
 
   hunter_gate_status_print(

diff --git a/src/examples/cmake/include/init.cmake b/src/examples/cmake/include/init.cmake
@@ -2,6 +2,7 @@ set(top_dir "${CMAKE_CURRENT_LIST_DIR}/../..")
 
 if(FACEFILTER_ANDROID_STUDIO)
   set(gen_toolchain "${CMAKE_CURRENT_BINARY_DIR}/generated/toolchain.cmake")
+  file(TO_CMAKE_PATH "${CMAKE_TOOLCHAIN_FILE}" CMAKE_TOOLCHAIN_FILE_CMAKE_PATH)
   configure_file(
     "${top_dir}/cmake/template/toolchain.cmake.in"
     "${gen_toolchain}"

diff --git a/src/examples/cmake/template/toolchain.cmake.in b/src/examples/cmake/template/toolchain.cmake.in
@@ -52,18 +52,18 @@ set(CMAKE_SYSTEM_VERSION "@CMAKE_SYSTEM_VERSION@")
 
 if("@_INTERNAL_ANDROID_STUDIO_ORIGINAL_CMAKE_TOOLCHAIN_FILE@" STREQUAL "")
   # Variable not set, initial project configuration.
-  # Path to original Android NDK toolchain saved in CMAKE_TOOLCHAIN_FILE.
-  if("@CMAKE_TOOLCHAIN_FILE@" STREQUAL "")
-    message(FATAL_ERROR "Unexpected: CMAKE_TOOLCHAIN_FILE is empty")
+  # Path to original Android NDK toolchain saved in CMAKE_TOOLCHAIN_FILE_CMAKE_PATH.
+  if("@CMAKE_TOOLCHAIN_FILE_CMAKE_PATH@" STREQUAL "")
+    message(FATAL_ERROR "Unexpected: CMAKE_TOOLCHAIN_FILE_CMAKE_PATH is empty")
   endif()
 
-  if(NOT EXISTS "@CMAKE_TOOLCHAIN_FILE@")
+  if(NOT EXISTS "@CMAKE_TOOLCHAIN_FILE_CMAKE_PATH@")
     message(
-        FATAL_ERROR "CMAKE_TOOLCHAIN_FILE not found: '@CMAKE_TOOLCHAIN_FILE@'"
+        FATAL_ERROR "File not found: '@CMAKE_TOOLCHAIN_FILE_CMAKE_PATH@'"
     )
   endif()
 
-  set(_original_toolchain_file "@CMAKE_TOOLCHAIN_FILE@")
+  set(_original_toolchain_file "@CMAKE_TOOLCHAIN_FILE_CMAKE_PATH@")
 else()
   set(_original_toolchain_file "@_INTERNAL_ANDROID_STUDIO_ORIGINAL_CMAKE_TOOLCHAIN_FILE@")
 endif()