date:20160221

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-241-g96e6af9

2016-02-21 Thread Rolf Eike Beer

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  96e6af9b42fe723992a877272d03e0a7b14f37cc (commit)
   via  046b2b4d4a42d4e5ebe0a7abc8651163065ed505 (commit)
  from  cf1a414cfb2917588a6eff20cc8cdda4c98264d9 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96e6af9b42fe723992a877272d03e0a7b14f37cc
commit 96e6af9b42fe723992a877272d03e0a7b14f37cc
Merge: cf1a414 046b2b4
Author: Rolf Eike Beer 
AuthorDate: Mon Feb 22 02:08:22 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Feb 22 02:08:22 2016 -0500

Merge topic 'gnu-c-34' into next

046b2b4d Compiler Features: gcc can handle C99 since at least 3.4


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=046b2b4d4a42d4e5ebe0a7abc8651163065ed505
commit 046b2b4d4a42d4e5ebe0a7abc8651163065ed505
Author: Rolf Eike Beer 
AuthorDate: Sat Feb 20 13:59:34 2016 +0100
Commit: Rolf Eike Beer 
CommitDate: Sat Feb 20 13:59:34 2016 +0100

Compiler Features: gcc can handle C99 since at least 3.4

diff --git a/Help/release/dev/gnu-c-34.rst b/Help/release/dev/gnu-c-34.rst
new file mode 100644
index 000..2fab592
--- /dev/null
+++ b/Help/release/dev/gnu-c-34.rst
@@ -0,0 +1,6 @@
+gnu-c-34
+--
+
+* The :manual:`Compile Features ` functionality
+  is now aware that the GNU compilers can handle C99 since at least version
+  3.4.
diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake 
b/Modules/Compiler/GNU-C-FeatureTests.cmake
index b3fe33f..0ab5265 100644
--- a/Modules/Compiler/GNU-C-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-C-FeatureTests.cmake
@@ -1,5 +1,5 @@
 
-set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404")
+set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304")
 
 # GNU 4.7 correctly sets __STDC_VERSION__ to 201112L, but GNU 4.6 sets it
 # to 201000L.  As the former is strictly greater than the latter, test only
@@ -8,10 +8,10 @@ set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) 
>= 404")
 # to the distinction between __cplusplus and __GXX_EXPERIMENTAL_CXX0X__ tests.
 set(GNU46_C11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && 
defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L")
 set(_cmake_feature_test_c_static_assert "${GNU46_C11}")
-# Since 4.4 at least:
-set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && 
defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
-set(_cmake_feature_test_c_restrict "${GNU44_C99}")
-set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}")
+# Since 3.4 at least:
+set(GNU34_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304 && 
defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
+set(_cmake_feature_test_c_restrict "${GNU34_C99}")
+set(_cmake_feature_test_c_variadic_macros "${GNU34_C99}")
 
 set(GNU_C90 "${_cmake_oldestSupported}")
 set(_cmake_feature_test_c_function_prototypes "${GNU_C90}")
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 2c478da..f76e07f 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -4,12 +4,12 @@ __compiler_gnu(C)
 if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90")
   set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90")
-elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89")
   set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu89")
 endif()
 
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99")
   set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99")
 endif()
@@ -22,7 +22,7 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
   set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x")
 endif()
 
-if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   if (NOT CMAKE_C_COMPILER_FORCED)
 if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT)
   message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for 
${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version 
${CMAKE_C_COMPILER_VERSION}")
@@ -48,7 +48,7 @@ macro(cmake_record_c_compile_features)
   if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
 _get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} 
CMAKE_C11_COMPILE_FEATURES)
   endif()
-  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
+  if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
 if (_result EQUAL 0)

[Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-109-gdf246f7

2016-02-21 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  df246f7c7f655f9ea6df0c64e131d2eb0cafd789 (commit)
  from  7e32bd945a9f32144ac63fdcd085197658229f9c (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df246f7c7f655f9ea6df0c64e131d2eb0cafd789
commit df246f7c7f655f9ea6df0c64e131d2eb0cafd789
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Mon Feb 22 00:01:03 2016 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Feb 22 00:01:03 2016 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 4628127..bd244ca 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 5)
-set(CMake_VERSION_PATCH 20160221)
+set(CMake_VERSION_PATCH 20160222)
 #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.5.0-rc3-239-gcf1a414

2016-02-21 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  cf1a414cfb2917588a6eff20cc8cdda4c98264d9 (commit)
   via  c50fefc0ff7680922390879cbdb4fbb9b9c88a7d (commit)
  from  634c78061295a4633b7cdd651cbf6eed98642c84 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf1a414cfb2917588a6eff20cc8cdda4c98264d9
commit cf1a414cfb2917588a6eff20cc8cdda4c98264d9
Merge: 634c780 c50fefc
Author: Gregor Jasny 
AuthorDate: Sun Feb 21 12:54:52 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Feb 21 12:54:52 2016 -0500

Merge topic 'xcode-refactor-xcodeobject' into next

c50fefc0 Refactor XCode block writes to allow any number of nesting.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c50fefc0ff7680922390879cbdb4fbb9b9c88a7d
commit c50fefc0ff7680922390879cbdb4fbb9b9c88a7d
Author: Robert Goulet 
AuthorDate: Fri Feb 19 14:00:19 2016 -0500
Commit: Gregor Jasny 
CommitDate: Sun Feb 21 17:13:26 2016 +0100

Refactor XCode block writes to allow any number of nesting.

diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index 5bc34c1..911e154 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -111,102 +111,102 @@ void cmXCodeObject::Print(std::ostream& out)
   for(i = this->ObjectAttributes.begin();
   i != this->ObjectAttributes.end(); ++i)
 {
-cmXCodeObject* object = i->second;
-if(i->first != "isa")
-  {
-  cmXCodeObject::Indent(3*indentFactor, out);
-  }
-else
-  {
+if(i->first == "isa")
   continue;
-  }
-if(object->TypeValue == OBJECT_LIST)
-  {
-  out << i->first << " = (" << separator;
-  for(unsigned int k = 0; k < i->second->List.size(); k++)
-{
-cmXCodeObject::Indent(4*indentFactor, out);
-out << i->second->List[k]->Id;
-i->second->List[k]->PrintComment(out);
-out << "," << separator;
-}
-  cmXCodeObject::Indent(3*indentFactor, out);
-  out << ");" << separator;
-  }
-else if(object->TypeValue == ATTRIBUTE_GROUP)
+
+PrintAttribute(out, 3, separator, indentFactor, i->first, i->second, this);
+}
+  cmXCodeObject::Indent(2*indentFactor, out);
+  out << "};\n";
+}
+
+void cmXCodeObject::PrintAttribute(std::ostream& out, const int level,
+   const std::string separator,
+   const int factor, const std::string& name,
+   const cmXCodeObject* object,
+   const cmXCodeObject* parent)
+{
+  cmXCodeObject::Indent(level * factor, out);
+  switch(object->TypeValue)
+{
+case OBJECT_LIST:
   {
-  std::map::iterator j;
-  out << i->first << " = {";
-  if(separator == "\n")
+  out << name << " = (";
+  if(parent->TypeValue != ATTRIBUTE_GROUP)
 {
 out << separator;
 }
-  for(j = object->ObjectAttributes.begin(); j !=
-object->ObjectAttributes.end(); ++j)
+  for(unsigned int i = 0; i < object->List.size(); ++i)
 {
-cmXCodeObject::Indent(4 *indentFactor, out);
-
-if(j->second->TypeValue == STRING)
-  {
-  cmXCodeObject::PrintString(out,j->first);
-  out << " = ";
-  j->second->PrintString(out);
-  out << ";";
-  }
-else if(j->second->TypeValue == OBJECT_LIST)
+if(object->List[i]->TypeValue == STRING)
   {
-  cmXCodeObject::PrintString(out,j->first);
-  out << " = (";
-  for(unsigned int k = 0; k < j->second->List.size(); k++)
+  object->List[i]->PrintString(out);
+  if(i+1 < object->List.size())
 {
-if(j->second->List[k]->TypeValue == STRING)
-  {
-  j->second->List[k]->PrintString(out);
-  out << ", ";
-  }
-else
-  {
-  out << "List_" << k << "_TypeValue_IS_NOT_STRING, ";
-  }
+out << ",";
 }
-  out << ");";
   }
 else
   {
-  cmXCodeObject::PrintString(out,j->first);
-  out << " = error_unexpected_TypeValue_" <<
-j->second->TypeValue << ";";
+  cmXCodeObject::Indent((level + 1) * factor, out);
+  out << object->List[i]->Id;
+  object->List[i]->PrintComment(out);
+  out << "," << separator;
   }
+}
+  if(parent->TypeValue !=

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-237-g634c780

2016-02-21 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  634c78061295a4633b7cdd651cbf6eed98642c84 (commit)
   via  c3c9374cd4128b309ca84d4c1629d7c43bbc94ee (commit)
   via  7e32bd945a9f32144ac63fdcd085197658229f9c (commit)
   via  6872a4fde02de182cdec6786d4630387dd22fddf (commit)
  from  9f72e3d53e32af6fe5a7ad76cc8f82f8c13c39cc (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=634c78061295a4633b7cdd651cbf6eed98642c84
commit 634c78061295a4633b7cdd651cbf6eed98642c84
Merge: 9f72e3d c3c9374
Author: Gregor Jasny 
AuthorDate: Sun Feb 21 10:47:45 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Feb 21 10:47:45 2016 -0500

Merge topic 'xcode-remove-reftype' into next

c3c9374c Write refType only for Xcode 1.5
7e32bd94 CMake Nightly Date Stamp
6872a4fd CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3c9374cd4128b309ca84d4c1629d7c43bbc94ee
commit c3c9374cd4128b309ca84d4c1629d7c43bbc94ee
Author: Gregor Jasny 
AuthorDate: Mon Feb 8 19:39:05 2016 +0100
Commit: Gregor Jasny 
CommitDate: Sun Feb 21 16:44:30 2016 +0100

Write refType only for Xcode 1.5

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 526e32f..ef18729 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2805,7 +2805,10 @@ 
cmGlobalXCodeGenerator::CreateXCodeTarget(cmGeneratorTarget* gtgt,
 fullName = gtgt->GetFullName(defConfig.c_str());
 }
   fileRef->AddAttribute("path", this->CreateString(fullName.c_str()));
-  fileRef->AddAttribute("refType", this->CreateString("0"));
+  if(this->XcodeVersion == 15)
+{
+fileRef->AddAttribute("refType", this->CreateString("0"));
+}
   fileRef->AddAttribute("sourceTree",
 this->CreateString("BUILT_PRODUCTS_DIR"));
   fileRef->SetComment(gtgt->GetName().c_str());

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 Source/cmGlobalXCodeGenerator.cxx |5 -
 2 files changed, 5 insertions(+), 2 deletions(-)


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.5.0-rc3-241-g96e6af9

[Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-109-gdf246f7

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-239-gcf1a414

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-237-g634c780

4 matches

Site Navigation

Mail list logo

Footer information