diff -Nru cmake-3.5.1/debian/changelog cmake-3.5.1/debian/changelog
--- cmake-3.5.1/debian/changelog	2016-06-29 17:19:44.000000000 +0200
+++ cmake-3.5.1/debian/changelog	2016-09-26 19:39:05.000000000 +0200
@@ -1,3 +1,10 @@
+cmake (3.5.1-1ubuntu3) xenial; urgency=medium
+
+  * cherry-pick from upstream to fix Ninja builds (LP: #1624832):
+    - debian/patches/f6c5958047ee8a9084bf230a6c1acb4801cb2b93.patch:
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 26 Sep 2016 19:38:26 +0200
+
 cmake (3.5.1-1ubuntu2) xenial; urgency=medium
 
   * cherry-picks from upstream to fix a GetProperty() crash (LP: #1564741):
diff -Nru cmake-3.5.1/debian/patches/f6c5958047ee8a9084bf230a6c1acb4801cb2b93.patch cmake-3.5.1/debian/patches/f6c5958047ee8a9084bf230a6c1acb4801cb2b93.patch
--- cmake-3.5.1/debian/patches/f6c5958047ee8a9084bf230a6c1acb4801cb2b93.patch	1970-01-01 01:00:00.000000000 +0100
+++ cmake-3.5.1/debian/patches/f6c5958047ee8a9084bf230a6c1acb4801cb2b93.patch	2016-09-26 19:40:54.000000000 +0200
@@ -0,0 +1,66 @@
+diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
+index 8a68af6..030b094 100644
+--- a/Source/cmLocalNinjaGenerator.cxx
++++ b/Source/cmLocalNinjaGenerator.cxx
+@@ -400,7 +400,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
+ 
+   bool symbolic = false;
+   for (std::vector<std::string>::const_iterator o = outputs.begin();
+-       o != outputs.end(); ++o)
++       !symbolic && o != outputs.end(); ++o)
+     {
+     if (cmSourceFile* sf = this->Makefile->GetSource(*o))
+       {
+@@ -444,7 +444,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
+       this->ConstructComment(ccg),
+       "Custom command for " + ninjaOutputs[0],
+       cc->GetUsesTerminal(),
+-      /*restat*/!symbolic,
++      /*restat*/!symbolic || !byproducts.empty(),
+       ninjaOutputs,
+       ninjaDeps,
+       orderOnlyDeps);
+diff --git a/Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake b/Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake
+new file mode 100644
+index 0000000..6948c35
+--- /dev/null
++++ b/Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake
+@@ -0,0 +1,28 @@
++add_custom_command(
++  OUTPUT gen-byproduct gen-byproduct-stamp
++  BYPRODUCTS byproduct
++  COMMAND ${CMAKE_COMMAND} -E touch gen-byproduct-stamp
++  COMMAND ${CMAKE_COMMAND} -E copy_if_different gen-byproduct-stamp byproduct
++  )
++set_property(SOURCE gen-byproduct PROPERTY SYMBOLIC 1)
++add_custom_target(produce DEPENDS gen-byproduct)
++
++add_custom_command(
++  OUTPUT use-byproduct
++  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/byproduct
++  COMMAND ${CMAKE_COMMAND} -E touch use-byproduct
++  )
++add_custom_target(drive ALL DEPENDS use-byproduct)
++add_dependencies(drive produce)
++
++file(GENERATE OUTPUT check-$<LOWER_CASE:$<CONFIG>>.cmake CONTENT "
++if (check_step EQUAL 1)
++  set(check_pairs
++    \"${CMAKE_CURRENT_BINARY_DIR}/use-byproduct|${CMAKE_CURRENT_BINARY_DIR}/gen-byproduct-stamp\"
++    )
++else()
++  set(check_pairs
++    \"${CMAKE_CURRENT_BINARY_DIR}/gen-byproduct-stamp|${CMAKE_CURRENT_BINARY_DIR}/use-byproduct\"
++    )
++endif()
++")
+diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+index 6b2b85a..8541070 100644
+--- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
++++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+@@ -39,4 +39,5 @@ if(NOT RunCMake_GENERATOR MATCHES "Visual Studio 7|Xcode")
+   unset(run_BuildDepends_skip_step_2)
+ endif()
+ 
++run_BuildDepends(Custom-Symbolic-and-Byproduct)
+ run_BuildDepends(Custom-Always)
diff -Nru cmake-3.5.1/debian/patches/series cmake-3.5.1/debian/patches/series
--- cmake-3.5.1/debian/patches/series	2016-06-29 17:19:44.000000000 +0200
+++ cmake-3.5.1/debian/patches/series	2016-09-26 19:38:26.000000000 +0200
@@ -5,3 +5,4 @@
 ubuntu_cmake-crosscompile.patch
 bc30f8b5e66cb9c15fd224f5e51454c0bc66c67e.patch
 0e44f4894f23d5eccd8d360f3420c832f9433a20.patch
+f6c5958047ee8a9084bf230a6c1acb4801cb2b93.patch