[Cmake-commits] CMake branch, master, updated. v3.3.1-1081-gd17ecf1

2015-09-06 Thread Kitware Robot
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  d17ecf1164148072d03a0a3ff2da96b4f5d2b806 (commit)
  from  9e64fda6a77b49b394835dadba0e2951580eb86b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d17ecf1164148072d03a0a3ff2da96b4f5d2b806
commit d17ecf1164148072d03a0a3ff2da96b4f5d2b806
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Mon Sep 7 00:01:04 2015 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Sep 7 00:01:04 2015 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 978c8a2..bbd740a 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 3)
-set(CMake_VERSION_PATCH 20150906)
+set(CMake_VERSION_PATCH 20150907)
 #set(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits


[Cmake-commits] CMake branch, next, updated. v3.3.1-2773-gcfbf387

2015-09-06 Thread Gregor Jasny via Cmake-commits
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  cfbf38704d2ee4caedf3fff51244855b076a152d (commit)
   via  9cdf6ef48d62fed477cc9cf48995d7c91382f5f6 (commit)
   via  1aa29f0db614f1292cff24633d61218d82490d1e (commit)
  from  6985b37195c2b0336f3702cba64fb83d52a7d2b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfbf38704d2ee4caedf3fff51244855b076a152d
commit cfbf38704d2ee4caedf3fff51244855b076a152d
Merge: 6985b37 9cdf6ef
Author: Gregor Jasny 
AuthorDate: Sun Sep 6 13:20:30 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 6 13:20:30 2015 -0400

Merge topic 'more-swift2-fixes' into next

9cdf6ef4 Swift: Add proper Swift compiler test
1aa29f0d Swift: Remove positive Swift language tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cdf6ef48d62fed477cc9cf48995d7c91382f5f6
commit 9cdf6ef48d62fed477cc9cf48995d7c91382f5f6
Author: Gregor Jasny 
AuthorDate: Sun Sep 6 18:19:18 2015 +0200
Commit: Gregor Jasny 
CommitDate: Sun Sep 6 18:19:18 2015 +0200

Swift: Add proper Swift compiler test

This catches for example the unavailability of Swift with
Xcode Beta6 and macosx10.10 SDK.

diff --git a/Modules/CMakeTestSwiftCompiler.cmake 
b/Modules/CMakeTestSwiftCompiler.cmake
index 9186426..89849fb 100644
--- a/Modules/CMakeTestSwiftCompiler.cmake
+++ b/Modules/CMakeTestSwiftCompiler.cmake
@@ -12,4 +12,54 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-set(CMAKE_Swift_COMPILER_WORKS 1)
+if(CMAKE_Swift_COMPILER_FORCED)
+  # The compiler configuration was forced by the user.
+  # Assume the user has configured all compiler information.
+  set(CMAKE_Swift_COMPILER_WORKS TRUE)
+  return()
+endif()
+
+include(CMakeTestCompilerCommon)
+
+# Remove any cached result from an older CMake version.
+# We now store this in CMakeSwiftCompiler.cmake.
+unset(CMAKE_Swift_COMPILER_WORKS CACHE)
+
+# This file is used by EnableLanguage in cmGlobalGenerator to
+# determine that that selected C++ compiler can actually compile
+# and link the most basic of programs.   If not, a fatal error
+# is set and cmake stops processing commands and will not generate
+# any makefiles or projects.
+if(NOT CMAKE_Swift_COMPILER_WORKS)
+  PrintTestCompilerStatus("Swift" "")
+  file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/main.swift
+"import Foundation\n"
+"print(\"CMake\")\n")
+  try_compile(CMAKE_Swift_COMPILER_WORKS ${CMAKE_BINARY_DIR}
+${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/main.swift
+OUTPUT_VARIABLE __CMAKE_Swift_COMPILER_OUTPUT)
+  # Move result from cache to normal variable.
+  set(CMAKE_Swift_COMPILER_WORKS ${CMAKE_Swift_COMPILER_WORKS})
+  unset(CMAKE_Swift_COMPILER_WORKS CACHE)
+  set(Swift_TEST_WAS_RUN 1)
+endif()
+
+if(NOT CMAKE_Swift_COMPILER_WORKS)
+  PrintTestCompilerStatus("Swift" " -- broken")
+  file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+"Determining if the Swift compiler works failed with "
+"the following output:\n${__CMAKE_Swift_COMPILER_OUTPUT}\n\n")
+  message(FATAL_ERROR "The Swift compiler \"${CMAKE_Swift_COMPILER}\" "
+"is not able to compile a simple test program.\nIt fails "
+"with the following output:\n ${__CMAKE_Swift_COMPILER_OUTPUT}\n\n"
+"CMake will not be able to correctly generate this project.")
+else()
+  if(Swift_TEST_WAS_RUN)
+PrintTestCompilerStatus("Swift" " -- works")
+file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+  "Determining if the Swift compiler works passed with "
+  "the following output:\n${__CMAKE_Swift_COMPILER_OUTPUT}\n\n")
+  endif()
+endif()
+
+unset(__CMAKE_Swift_COMPILER_OUTPUT)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1aa29f0db614f1292cff24633d61218d82490d1e
commit 1aa29f0db614f1292cff24633d61218d82490d1e
Author: Gregor Jasny 
AuthorDate: Sun Sep 6 18:14:35 2015 +0200
Commit: Gregor Jasny 
CommitDate: Sun Sep 6 18:14:35 2015 +0200

Swift: Remove positive Swift language tests

It's relatively complex to determine in advance if a Xcode, SDK,
and Deployment Target configuration is capable of running Swift.

For example the following combinations do not work:
 * deployment target < OS X 10.9
 * Xcode 6.2 and macosx10.9 SDK
 * Xcode 7 Beta 6 and macosx10.10 SDK

Until we found out how to query Xcode for Swift support in a reliable

[Cmake-commits] CMake branch, next, updated. v3.3.1-2775-g5259219

2015-09-06 Thread Gregor Jasny via Cmake-commits
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  5259219860a040eb81f50ea05ee47447d8220b4c (commit)
   via  3b906c8003161f704cc33553f98b57d9dda461b9 (commit)
  from  cfbf38704d2ee4caedf3fff51244855b076a152d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5259219860a040eb81f50ea05ee47447d8220b4c
commit 5259219860a040eb81f50ea05ee47447d8220b4c
Merge: cfbf387 3b906c8
Author: Gregor Jasny 
AuthorDate: Sun Sep 6 14:48:57 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 6 14:48:57 2015 -0400

Merge topic 'fix-xcode-gtk2-tests' into next

3b906c80 GTK2: Add --build-project to all GTK2 tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b906c8003161f704cc33553f98b57d9dda461b9
commit 3b906c8003161f704cc33553f98b57d9dda461b9
Author: Gregor Jasny 
AuthorDate: Sun Sep 6 20:41:41 2015 +0200
Commit: Gregor Jasny 
CommitDate: Sun Sep 6 20:41:41 2015 +0200

GTK2: Add --build-project to all GTK2 tests

Otherwise xcodebuild invocation will fail.

diff --git a/Tests/FindGTK2/CMakeLists.txt b/Tests/FindGTK2/CMakeLists.txt
index 1c5987c..0105fae 100644
--- a/Tests/FindGTK2/CMakeLists.txt
+++ b/Tests/FindGTK2/CMakeLists.txt
@@ -9,6 +9,7 @@ if(GTK2_GTK_FOUND)
 "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk"
  ${build_generator_args}
 --build-target gtk-all-libs
+--build-project gtk
 --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk"
 --force-new-ctest-process
 --test-command ${CMAKE_CTEST_COMMAND} -V
@@ -22,6 +23,7 @@ if(GTK2_GTKMM_FOUND)
 "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm"
  ${build_generator_args}
 --build-target gtkmm-all-libs
+--build-project gtkmm
 --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm"
 --force-new-ctest-process
 --test-command ${CMAKE_CTEST_COMMAND} -V
@@ -310,6 +312,7 @@ if(TARGET GTK2::gtkmm)
 "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gtkmm"
  ${build_generator_args}
 --build-target gtkmm-target
+--build-project gtkmm
 --build-exe-dir "${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Targets/gtkmm"
 --force-new-ctest-process
 --test-command ${CMAKE_CTEST_COMMAND} -V

---

Summary of changes:
 Tests/FindGTK2/CMakeLists.txt |3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits