[Cmake-commits] CMake branch, next, updated. v3.5.2-969-g69b7868

[Alexander Neundorf]

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  69b7868da554b594849d5c3d89839ee54d659cd8 (commit)
   via  6e3259705146a62693eef1a7617ebabcc9ac4fa6 (commit)
   via  6f139d31cad75a25c1421b84d5d034cc72081205 (commit)
   via  94179ecf22a819e3f9ae32c9e865c483202b9818 (commit)
  from  2a0451e7f129aa27b824741cb7db3a9e3706b1a7 (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=69b7868da554b594849d5c3d89839ee54d659cd8
commit 69b7868da554b594849d5c3d89839ee54d659cd8
Merge: 2a0451e 6e32597
Author: Alexander Neundorf 
AuthorDate: Sun Apr 17 15:41:37 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Apr 17 15:41:37 2016 -0400

Merge topic 'AddDocumentationForEclipseVariables' into next

6e325970 Add documentation for Eclipse-generator related variables. #15827
6f139d31 CMake Nightly Date Stamp
94179ecf CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e3259705146a62693eef1a7617ebabcc9ac4fa6
commit 6e3259705146a62693eef1a7617ebabcc9ac4fa6
Author: Alex Neundorf 
AuthorDate: Sun Apr 17 21:38:45 2016 +0200
Commit: Alex Neundorf 
CommitDate: Sun Apr 17 21:38:45 2016 +0200

Add documentation for Eclipse-generator related variables. #15827

diff --git a/Help/manual/cmake-variables.7.rst 
b/Help/manual/cmake-variables.7.rst
index 7cf3a3d..3e04763 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -116,6 +116,10 @@ Variables that Change Behavior
/variable/CMAKE_DEBUG_TARGET_PROPERTIES
/variable/CMAKE_DEPENDS_IN_PROJECT_ONLY
/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName
+   /variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES
+   /variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT
+   /variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS
+   /variable/CMAKE_ECLIPSE_VERSION
/variable/CMAKE_ERROR_DEPRECATED
/variable/CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION
/variable/CMAKE_EXPORT_COMPILE_COMMANDS
diff --git a/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst 
b/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
new file mode 100644
index 000..331aae8
--- /dev/null
+++ b/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
@@ -0,0 +1,10 @@
+CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES
+---
+
+This cache variable is used by the Eclipse project generator.  See
+:manual:`cmake-generators(7)`.
+
+The Eclipse project generator generates so-called linked resources
+e.g. to the subproject root dirs in the source tree or to the source files
+of targets.
+This can be disabled by setting this variable to FALSE.
diff --git a/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst 
b/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
new file mode 100644
index 000..7b4367d
--- /dev/null
+++ b/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
@@ -0,0 +1,11 @@
+CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT
+-
+
+This cache variable is used by the Eclipse project generator.  See
+:manual:`cmake-generators(7)`.
+
+If this variable is set to TRUE, the Eclipse project generator will generate
+an Eclipse project in :variable:`CMAKE_SOURCE_DIR` . This project can then
+be used in Eclipse e.g. for the version control functionality.
+:variable:`CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT` defaults to FALSE; so
+nothing is written into the source directory.
diff --git a/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst 
b/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst
new file mode 100644
index 000..6e8a408
--- /dev/null
+++ b/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst
@@ -0,0 +1,9 @@
+CMAKE_ECLIPSE_MAKE_ARGUMENTS
+
+
+This cache variable is used by the Eclipse project generator.  See
+:manual:`cmake-generators(7)`.
+
+This variable holds arguments which are used when Eclipse invokes the make
+tool. By default it is initialized to hold flags to enable parallel builds
+(using -j typically).
diff --git a/Help/variable/CMAKE_ECLIPSE_VERSION.rst 
b/Help/variable/CMAKE_ECLIPSE_VERSION.rst
new file mode 100644
index 000..8cc7882
--- /dev/null
+++ b/Help/variable/CMAKE_ECLIPSE_VERSION.rst
@@ -0,0 +1,10 @@
+CMAKE_ECLIPSE_VERSION
+-
+
+This cache variable is used by the Eclipse project generator.  See
+:manual:`cmake-generators(7)`.
+
+When using the Eclipse project generator, CMake tries to find the Eclipse
+executable and detect the version of it. Depending on the version it finds,
+some features are enabled or disabled. If CMake doesn't find
+Eclipse, it ass

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-280-g892a534

[Alexander Neundorf]

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  892a53437ff2f626fdc19b568dd80eeb7a0a81a5 (commit)
   via  aff38945d64fc56026255c9cc3c1051529887d7b (commit)
   via  6ee6b17ed538989e38efb2eafb7f92c557eca71a (commit)
  from  fda5171148f691addee7d8c735c906d5eb086591 (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=892a53437ff2f626fdc19b568dd80eeb7a0a81a5
commit 892a53437ff2f626fdc19b568dd80eeb7a0a81a5
Merge: fda5171 aff3894
Author: Alexander Neundorf 
AuthorDate: Wed Feb 24 17:10:37 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Feb 24 17:10:37 2016 -0500

Merge topic 'AddNewEclipseVersions' into next

aff38945 Eclipse: only add C/CXX macros if the language is enabled
6ee6b17e Eclipse: add newer version numbers


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aff38945d64fc56026255c9cc3c1051529887d7b
commit aff38945d64fc56026255c9cc3c1051529887d7b
Author: Alex Neundorf 
AuthorDate: Wed Feb 24 22:13:04 2016 +0100
Commit: Alex Neundorf 
CommitDate: Wed Feb 24 22:13:04 2016 +0100

Eclipse: only add C/CXX macros if the language is enabled

With this patch, the builtin macros and include dirs are only
added to the project file if the C/CXX langauges are really enabled.
I.e. before this patch the CXX-stuff was in the project file as soon
as CXX had been enabled at least once for this build tree.
I.e. disabling CXX later on did not remove the CXX macros etc.
from the project file (related to #15150)

Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index aedf6f4..133a85a 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -42,6 +42,8 @@ cmExtraEclipseCDT4Generator
   this->GenerateLinkedResources = true;
   this->SupportsGmakeErrorParser = true;
   this->SupportsMachO64Parser = true;
+  this->CEnabled = false;
+  this->CXXEnabled = false;
 }
 
 //
@@ -64,10 +66,12 @@ void cmExtraEclipseCDT4Generator
   {
   this->Natures.insert("org.eclipse.cdt.core.ccnature");
   this->Natures.insert("org.eclipse.cdt.core.cnature");
+  this->CXXEnabled = true;
   }
 else if (*lit == "C")
   {
   this->Natures.insert("org.eclipse.cdt.core.cnature");
+  this->CEnabled = true;
   }
 else if (*lit == "Java")
   {
@@ -890,7 +894,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
   // add system defined c macros
   const char* cDefs=mf->GetDefinition(
   "CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS");
-  if(cDefs)
+  if(this->CEnabled && cDefs)
 {
 // Expand the list.
 std::vector defs;
@@ -925,7 +929,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
   // add system defined c++ macros
   const char* cxxDefs = mf->GetDefinition(
 "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS");
-  if(cxxDefs)
+  if(this->CXXEnabled && cxxDefs)
 {
 // Expand the list.
 std::vector defs;
@@ -979,7 +983,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
   // CMakeSystemSpecificInformation.cmake. This makes Eclipse find the
   // standard headers.
   std::string compiler = mf->GetSafeDefinition("CMAKE_C_COMPILER");
-  if (!compiler.empty())
+  if (this->CEnabled && !compiler.empty())
 {
 std::string systemIncludeDirs = mf->GetSafeDefinition(
 "CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS");
@@ -988,7 +992,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
 this->AppendIncludeDirectories(fout, dirs, emmited);
 }
   compiler = mf->GetSafeDefinition("CMAKE_CXX_COMPILER");
-  if (!compiler.empty())
+  if (this->CXXEnabled && !compiler.empty())
 {
 std::string systemIncludeDirs = mf->GetSafeDefinition(
   "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS");
diff --git a/Source/cmExtraEclipseCDT4Generator.h 
b/Source/cmExtraEclipseCDT4Generator.h
index 16675f2..1da2077 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -116,6 +116,8 @@ private:
   bool SupportsVirtualFolders;
   bool SupportsGmakeErrorParser;
   bool SupportsMachO64Parser;
+  bool CEnabled;
+  bool 

[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-248-g4cbf56e

[Alexander Neundorf]

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  4cbf56e98c7c3ad3365350bd7ef9314263bb8862 (commit)
   via  84ccd4f7461ac2c2ee471a4d77f3e184c676c276 (commit)
  from  564c9c7b888fdfb156ed5b71de6172a032720c81 (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=4cbf56e98c7c3ad3365350bd7ef9314263bb8862
commit 4cbf56e98c7c3ad3365350bd7ef9314263bb8862
Merge: 564c9c7 84ccd4f
Author: Alexander Neundorf 
AuthorDate: Tue Feb 23 16:45:28 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Feb 23 16:45:28 2016 -0500

Merge topic 'CodeBlocksParallelFlag' into next

84ccd4f7 CodeBlocks: generate parallel project files (make -j)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84ccd4f7461ac2c2ee471a4d77f3e184c676c276
commit 84ccd4f7461ac2c2ee471a4d77f3e184c676c276
Author: Alex Neundorf 
AuthorDate: Tue Feb 23 22:37:44 2016 +0100
Commit: Alex Neundorf 
CommitDate: Tue Feb 23 22:37:44 2016 +0100

CodeBlocks: generate parallel project files (make -j)

This is done the same way as for Eclipse: cmake tries to determine
the number of CPUs, and then adds the respective -jN to the make
invocations in the project file.

Alex

diff --git a/Modules/CMakeFindCodeBlocks.cmake 
b/Modules/CMakeFindCodeBlocks.cmake
index f8d8d59..bf85ea0 100644
--- a/Modules/CMakeFindCodeBlocks.cmake
+++ b/Modules/CMakeFindCodeBlocks.cmake
@@ -23,3 +23,18 @@ endif()
 
 # Determine builtin macros and include dirs:
 
include(${CMAKE_CURRENT_LIST_DIR}/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake)
+
+# Try to find out how many CPUs we have and set the -j argument for make 
accordingly
+set(_CMAKE_CODEBLOCKS_INITIAL_MAKE_ARGS "")
+
+include(ProcessorCount)
+processorcount(_CMAKE_CODEBLOCKS_PROCESSOR_COUNT)
+
+# Only set -j if we are under UNIX and if the make-tool used actually has 
"make" in the name
+# (we may also get here in the future e.g. for ninja)
+if("${_CMAKE_CODEBLOCKS_PROCESSOR_COUNT}" GREATER 1  AND  CMAKE_HOST_UNIX  AND 
 "${CMAKE_MAKE_PROGRAM}" MATCHES make)
+  set(_CMAKE_CODEBLOCKS_INITIAL_MAKE_ARGS 
"-j${_CMAKE_CODEBLOCKS_PROCESSOR_COUNT}")
+endif()
+
+# This variable is used by the CodeBlocks generator and appended to the make 
invocation commands.
+set(CMAKE_CODEBLOCKS_MAKE_ARGUMENTS "${_CMAKE_CODEBLOCKS_INITIAL_MAKE_ARGS}" 
CACHE STRING "Additional command line arguments when CodeBlocks invokes make. 
Enter e.g. -j to get parallel builds")
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx 
b/Source/cmExtraCodeBlocksGenerator.cxx
index 9348ef2..19f99ba 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -300,6 +300,8 @@ void cmExtraCodeBlocksGenerator
   // figure out the compiler
   std::string compiler = this->GetCBCompilerId(mf);
   std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
+  const std::string makeArgs = mf->GetSafeDefinition(
+"CMAKE_CODEBLOCKS_MAKE_ARGUMENTS");
 
   fout<<"\n"
 "\n"
@@ -311,7 +313,8 @@ void cmExtraCodeBlocksGenerator
 "  "<\n";
 
-  this->AppendTarget(fout, "all", 0, make.c_str(), lgs[0], compiler.c_str());
+  this->AppendTarget(fout, "all", 0, make.c_str(), lgs[0], compiler.c_str(),
+ makeArgs);
 
   // add all executable and library targets and some of the GLOBAL
   // and UTILITY targets
@@ -333,7 +336,8 @@ void cmExtraCodeBlocksGenerator
  (*lg)->GetBinaryDirectory())==0)
 {
 this->AppendTarget(fout, targetName, 0,
-   make.c_str(), *lg, compiler.c_str());
+   make.c_str(), *lg, compiler.c_str(),
+   makeArgs);
 }
   }
   break;
@@ -350,7 +354,7 @@ void cmExtraCodeBlocksGenerator
 }
 
   this->AppendTarget(fout, targetName, 0,
- make.c_str(), *lg, compiler.c_str());
+ make.c_str(), *lg, compiler.c_str(),makeArgs);
   break;
 case cmState::EXECUTABLE:
 case cmState::STATIC_LIBRARY:
@@ -360,11 +364,11 @@ void cmExtraCodeBlocksGenerator
   {
   cmGeneratorTarget* gt = *ti;
   this->AppendTarget(fout, targetName, gt,
- make.c_str(), *lg, compiler.c_str());
+

[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7739-gb463e30

[Alexander Neundorf]

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  b463e302abb52be95cffb21bab6945ffda4abf50 (commit)
   via  3a1978a65509fa3ed98c810893934ae36d9ae77c (commit)
  from  b874d677e4b4e66e9cdd94f2aa7110c255758a50 (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=b463e302abb52be95cffb21bab6945ffda4abf50
commit b463e302abb52be95cffb21bab6945ffda4abf50
Merge: b874d67 3a1978a
Author: Alexander Neundorf 
AuthorDate: Sun Feb 16 11:29:29 2014 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Feb 16 11:29:29 2014 -0500

Merge topic 'KateHandleSpacesInPath' into next

3a1978a6 kate: fix line lengths


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a1978a65509fa3ed98c810893934ae36d9ae77c
commit 3a1978a65509fa3ed98c810893934ae36d9ae77c
Author: Alex Neundorf 
AuthorDate: Sun Feb 16 17:28:46 2014 +0100
Commit: Alex Neundorf 
CommitDate: Sun Feb 16 17:28:46 2014 +0100

kate: fix line lengths

Alex

diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.cxx 
b/Source/CTest/cmCTestReadCustomFilesCommand.cxx
index 5db01f9..3b9d552 100644
--- a/Source/CTest/cmCTestReadCustomFilesCommand.cxx
+++ b/Source/CTest/cmCTestReadCustomFilesCommand.cxx
@@ -10,7 +10,6 @@
   See the License for more information.
 */
 #include "cmCTestReadCustomFilesCommand.h"
-
 #include "cmCTest.h"
 
 bool cmCTestReadCustomFilesCommand
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index bb9c04e..a0d37d4 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -225,9 +225,9 @@ cmExtraKateGenerator::AppendTarget(cmGeneratedFileStream& 
fout,
   fout <<
 "\t\t\t" << JsonSep << "{\"name\":\"" << target << "\", "
 "\"build_cmd\":\"" << make
-   << " -C \\\"" << (this->UseNinja ? homeOutputDir : 
path.c_str())
-   << "\\\" " << makeArgs << " "
-   << target << "\"}\n";
+   << " -C \\\"" << (this->UseNinja ? homeOutputDir : path.c_str())
+   << "\\\" " << makeArgs << " "
+   << target << "\"}\n";
 
   JsonSep = ',';
 }

---

Summary of changes:
 Source/CTest/cmCTestReadCustomFilesCommand.cxx |1 -
 Source/cmExtraKateGenerator.cxx|6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7735-g07b9b62

[Alexander Neundorf]

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  07b9b62e8bcb56b3c7b348ac912d433bb898e482 (commit)
   via  c98b69bdf9778204bd0e19e057ca6959bf8d9d15 (commit)
   via  0c958c44af5020069efe41b2adf22115b75e8de1 (commit)
   via  66bf178346e3f00f74a3d64eb00db48cedb0ffb6 (commit)
  from  d02e54f13f998c0e7a6f7d6d44ec5e92d459e5b7 (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=07b9b62e8bcb56b3c7b348ac912d433bb898e482
commit 07b9b62e8bcb56b3c7b348ac912d433bb898e482
Merge: d02e54f c98b69b
Author: Alexander Neundorf 
AuthorDate: Sun Feb 16 05:36:57 2014 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Feb 16 05:36:57 2014 -0500

Merge topic 'KateHandleSpacesInPath' into next

c98b69bd Kate: handle spaces in build dir
0c958c44 CMake Nightly Date Stamp
66bf1783 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c98b69bdf9778204bd0e19e057ca6959bf8d9d15
commit c98b69bdf9778204bd0e19e057ca6959bf8d9d15
Author: Alex Neundorf 
AuthorDate: Sun Feb 16 11:35:30 2014 +0100
Commit: Alex Neundorf 
CommitDate: Sun Feb 16 11:35:30 2014 +0100

Kate: handle spaces in build dir

They need to be escaped in the json file... I'm quite
sure I tested this before, obviously I didn't test it
correctly.

Alex

diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index d0f83b2..bb9c04e 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -98,12 +98,12 @@ cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
   "\t\t\"clean_target\": \"clean\",\n";
 
   // build, clean and quick are for the build plugin kate <= 4.12:
-  fout << "\t\t\"build\": \"" << make << " -C " << homeOutputDir
-   << " " << makeArgs << " " << "all\",\n";
-  fout << "\t\t\"clean\": \"" << make << " -C " << homeOutputDir
-   << " " << makeArgs << " " << "clean\",\n";
-  fout << "\t\t\"quick\": \"" << make << " -C " << homeOutputDir
-   << " " << makeArgs << " " << "install\",\n";
+  fout << "\t\t\"build\": \"" << make << " -C \\\"" << homeOutputDir
+   << "\\\" " << makeArgs << " " << "all\",\n";
+  fout << "\t\t\"clean\": \"" << make << " -C \\\"" << homeOutputDir
+   << "\\\" " << makeArgs << " " << "clean\",\n";
+  fout << "\t\t\"quick\": \"" << make << " -C \\\"" << homeOutputDir
+   << "\\\" " << makeArgs << " " << "install\",\n";
 
   // this is for kate >= 4.13:
   fout <<
@@ -225,8 +225,8 @@ cmExtraKateGenerator::AppendTarget(cmGeneratedFileStream& 
fout,
   fout <<
 "\t\t\t" << JsonSep << "{\"name\":\"" << target << "\", "
 "\"build_cmd\":\"" << make
-   << " -C " << (this->UseNinja ? homeOutputDir : path.c_str())
-   << " " << makeArgs << " "
+   << " -C \\\"" << (this->UseNinja ? homeOutputDir : 
path.c_str())
+   << "\\\" " << makeArgs << " "
<< target << "\"}\n";
 
   JsonSep = ',';

---

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


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

[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7731-gd02e54f

[Alexander Neundorf]

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  d02e54f13f998c0e7a6f7d6d44ec5e92d459e5b7 (commit)
   via  cab5ebd497b1acf109769d299779a41b16f9b7bf (commit)
  from  a499ffd2b32f2f037901239632554975481cb852 (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=d02e54f13f998c0e7a6f7d6d44ec5e92d459e5b7
commit d02e54f13f998c0e7a6f7d6d44ec5e92d459e5b7
Merge: a499ffd cab5ebd
Author: Alexander Neundorf 
AuthorDate: Sun Feb 16 05:30:52 2014 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Feb 16 05:30:52 2014 -0500

Merge topic 'isystemForIcpc' into next

cab5ebd4 Intel compiler: add -isystem flag under Linux


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cab5ebd497b1acf109769d299779a41b16f9b7bf
commit cab5ebd497b1acf109769d299779a41b16f9b7bf
Author: Alex Neundorf 
AuthorDate: Fri Feb 7 00:23:31 2014 +0100
Commit: Alex Neundorf 
CommitDate: Fri Feb 7 00:23:31 2014 +0100

Intel compiler: add -isystem flag under Linux

This makes the SYSTEM keyword work with the Intel compiler
under Linux. AFAIK this is supported neither under Windows nor OSX.

Alex

diff --git a/Modules/Platform/Linux-Intel-C.cmake 
b/Modules/Platform/Linux-Intel-C.cmake
index d1694d6..449493a 100644
--- a/Modules/Platform/Linux-Intel-C.cmake
+++ b/Modules/Platform/Linux-Intel-C.cmake
@@ -1,2 +1,3 @@
 include(Platform/Linux-Intel)
 __linux_compiler_intel(C)
+set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
diff --git a/Modules/Platform/Linux-Intel-CXX.cmake 
b/Modules/Platform/Linux-Intel-CXX.cmake
index 66df3ac..142b6cf 100644
--- a/Modules/Platform/Linux-Intel-CXX.cmake
+++ b/Modules/Platform/Linux-Intel-CXX.cmake
@@ -1,2 +1,3 @@
 include(Platform/Linux-Intel)
 __linux_compiler_intel(CXX)
+set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")

---

Summary of changes:
 Modules/Platform/Linux-Intel-C.cmake   |1 +
 Modules/Platform/Linux-Intel-CXX.cmake |1 +
 2 files changed, 2 insertions(+)


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

[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7277-g78532d6

[Alexander Neundorf]

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  78532d6e3eb87c2a479fcae496006a72853f0f27 (commit)
   via  047d35d355669f9f568a28e3d4df1c7c11b565e8 (commit)
   via  6ef75f436bba6017d80a1bbd32dcfba689ec2fd6 (commit)
   via  7bb7474c2da42863639975eff81f60bfd3578b69 (commit)
   via  0569b189d9091d313944b3bdc9487c2bd583a7aa (commit)
   via  d59997264dd5f431dbf64efcae253942544d0d16 (commit)
   via  4401326286dcb908ae1b2f5c3f1d304f61dbc5b6 (commit)
  from  3c6550c49c5b8a99e1af5effd2c6bb978e9c517f (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=78532d6e3eb87c2a479fcae496006a72853f0f27
commit 78532d6e3eb87c2a479fcae496006a72853f0f27
Merge: 3c6550c 047d35d
Author: Alexander Neundorf 
AuthorDate: Sat Jan 25 16:17:28 2014 -0500
Commit: CMake Topic Stage 
CommitDate: Sat Jan 25 16:17:28 2014 -0500

Merge topic 'AddVersionToProjectCommand' into next

047d35d3 project(): add test for VERSION parameter
6ef75f43 write_basic_package_version_file(): make use of the new 
${PROJECT_VERSION}
7bb7474c project(): document the new VERSION argument
0569b189 project(): improve documentation
d5999726 project(): unset VERSION variables if no VERSION is given
44013262 project(): add optional VERSION argument


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=047d35d355669f9f568a28e3d4df1c7c11b565e8
commit 047d35d355669f9f568a28e3d4df1c7c11b565e8
Author: Alex Neundorf 
AuthorDate: Fri Jan 10 23:29:16 2014 +0100
Commit: Alex Neundorf 
CommitDate: Sat Jan 25 21:19:04 2014 +0100

project(): add test for VERSION parameter

Alex

diff --git a/Tests/DoubleProject/CMakeLists.txt 
b/Tests/DoubleProject/CMakeLists.txt
index 02a6275..c9004eb 100644
--- a/Tests/DoubleProject/CMakeLists.txt
+++ b/Tests/DoubleProject/CMakeLists.txt
@@ -1,3 +1,56 @@
 project(dumb)
 project(dumber)
 add_executable(just_silly silly.c)
+
+if(DEFINED PROJECT_VERSION)
+  message(SEND_ERROR "PROJECT_VERSION defined, but should not !")
+endif()
+
+project(Foo VERSION "1.2.3.4" C)
+
+if(NOT Foo_VERSION STREQUAL "1.2.3.4")
+  message(SEND_ERROR "Foo_VERSION set to ${Foo_VERSION} ! (expected 1.2.3.4 !")
+endif()
+
+if(NOT 
"${Foo_VERSION_MAJOR}.${Foo_VERSION_MINOR}.${Foo_VERSION_PATCH}.${Foo_VERSION_TWEAK}"
 STREQUAL "1.2.3.4")
+  message(SEND_ERROR "Foo_VERSION set to 
\"${Foo_VERSION_MAJOR}.${Foo_VERSION_MINOR}.${Foo_VERSION_PATCH}.${Foo_VERSION_TWEAK}\"!
 (expected 1.2.3.4 !")
+endif()
+
+if(NOT Foo_VERSION STREQUAL PROJECT_VERSION)
+  message(SEND_ERROR "Foo_VERSION differs from PROJECT_VERSION ! 
(${Foo_VERSION} != ${PROJECT_VERSION})")
+endif()
+
+project(Bar CXX)
+
+if(DEFINED PROJECT_VERSION)
+  message(SEND_ERROR "PROJECT_VERSION defined (\"${PROJECT_VERSION}\"), but 
should not !")
+endif()
+
+if(DEFINED Bar_VERSION)
+  message(SEND_ERROR "Bar_VERSION defined, but should not !")
+endif()
+
+
+# test that PROJECT_VERSION is not reset if it hasn't been set by 
project(VERSION)
+
+set(PROJECT_VERSION "5.6.7")
+
+project(Blub)
+
+if(NOT "${PROJECT_VERSION}" STREQUAL "5.6.7")
+  message(SEND_ERROR "PROJECT_VERSION unset, but should not have been unset 
since it wasn't set by project(VERSION) before.")
+endif()
+
+
+
+project(Xyz VERSION "7.8.9")
+
+set(CMAKE_PROJECT_VERSION_SET_BY_PROJECT_COMMAND FALSE)
+
+set(PROJECT_VERSION "3.2.1")
+
+project(Abc)
+
+if(NOT "${PROJECT_VERSION}" STREQUAL "3.2.1")
+  message(SEND_ERROR "PROJECT_VERSION set to \"${PROJECT_VERSION}\", but 
should still be 3.2.1, since unsetting was disabled .")
+endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ef75f436bba6017d80a1bbd32dcfba689ec2fd6
commit 6ef75f436bba6017d80a1bbd32dcfba689ec2fd6
Author: Alex Neundorf 
AuthorDate: Mon Jan 6 21:20:44 2014 +0100
Commit: Alex Neundorf 
CommitDate: Sat Jan 25 21:19:04 2014 +0100

write_basic_package_version_file(): make use of the new ${PROJECT_VERSION}

In the write_basic_package_version_file(), the VERSION argument
is now optional. If none is given, it falls back to ${PROJECT_VERSION}.

Alex

diff --git a/Modules/CMakePackageConfigHelpers.cmake 
b/Modules/CMakePackageConfigHelpers.cmake
index f388fe0..210fdb1 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -99,7 +99,7 @@
 #
 # ::
 #
-#   WRITE_BASIC_PACKAGE_V

[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7164-gb61fff9

[Alexander Neundorf]

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  b61fff94ef1d137390129a50862353d6271198de (commit)
   via  e02cdba0549f64ee86ba5b059135d52b74c1f70f (commit)
  from  28e1e8e8a8ef194ef127e30e6b3d98de3d37fede (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=b61fff94ef1d137390129a50862353d6271198de
commit b61fff94ef1d137390129a50862353d6271198de
Merge: 28e1e8e e02cdba
Author: Alexander Neundorf 
AuthorDate: Fri Jan 17 08:53:13 2014 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Jan 17 08:53:13 2014 -0500

Merge topic 'KateDontRequireVariable' into next

e02cdba0 Kate: use cmMakefile::GetSafeDefinition() for a not-required 
variable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e02cdba0549f64ee86ba5b059135d52b74c1f70f
commit e02cdba0549f64ee86ba5b059135d52b74c1f70f
Author: Alex Neundorf 
AuthorDate: Fri Jan 17 14:04:33 2014 +0100
Commit: Alex Neundorf 
CommitDate: Fri Jan 17 14:04:33 2014 +0100

Kate: use cmMakefile::GetSafeDefinition() for a not-required variable

...otherwise the generator failed in embedded projects via
externalproject(), since there CMAKE_KATE_MAKE_ARGUMENT is not set.
Using GetSafeDefinition() is good enough to protect against
NULL-pointers.

Alex

diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 0312488..d0f83b2 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -70,7 +70,7 @@ void cmExtraKateGenerator::CreateKateProjectFile(const 
cmMakefile* mf) const
 }
 
   std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
-  std::string args = mf->GetRequiredDefinition("CMAKE_KATE_MAKE_ARGUMENTS");
+  std::string args = mf->GetSafeDefinition("CMAKE_KATE_MAKE_ARGUMENTS");
 
   fout <<
 "{\n"

---

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


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

[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6601-g5f8900c

[Alexander Neundorf]

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  5f8900cb38086687051edbd9904dbe21819b5e9a (commit)
   via  e6b0f452ee1d2cbe26f9977c94470c223c13ab05 (commit)
   via  9e9debe505964525c9a8466b8d76ceb24b4ee022 (commit)
   via  403632c8ae1718cadc4e2102638bbd03e5d8d1fc (commit)
   via  1b7546c460c5390c0032c20b5a70a63b254059c0 (commit)
  from  967591d0f3258fa70d553addae8dfc18832ae787 (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=5f8900cb38086687051edbd9904dbe21819b5e9a
commit 5f8900cb38086687051edbd9904dbe21819b5e9a
Merge: 967591d e6b0f45
Author: Alexander Neundorf 
AuthorDate: Wed Jan 1 12:43:16 2014 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Jan 1 12:43:16 2014 -0500

Merge topic 'EclipseUse64bitMachOParser' into next

e6b0f45 Eclipse: use MachO64 parser starting with Helios (#14380)
9e9debe CMake Nightly Date Stamp
403632c CMake Nightly Date Stamp
1b7546c CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6b0f452ee1d2cbe26f9977c94470c223c13ab05
commit e6b0f452ee1d2cbe26f9977c94470c223c13ab05
Author: Alex Neundorf 
AuthorDate: Wed Jan 1 17:52:57 2014 +0100
Commit: Alex Neundorf 
CommitDate: Wed Jan 1 17:52:57 2014 +0100

Eclipse: use MachO64 parser starting with Helios (#14380)

With this patch, cmake now puts the MachO64 bit
binary file parser into the config file if the detected
Eclipse is at least Helios (7.0), otherwise with the old
parser executables will not be recognized by Eclipse.

Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 755b445..c93187e 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -40,6 +40,7 @@ cmExtraEclipseCDT4Generator
   this->SupportsVirtualFolders = true;
   this->GenerateLinkedResources = true;
   this->SupportsGmakeErrorParser = true;
+  this->SupportsMachO64Parser = true;
 }
 
 //
@@ -93,6 +94,7 @@ void cmExtraEclipseCDT4Generator::Generate()
   if (version < 3006) // 3.6 is Helios
 {
 this->SupportsVirtualFolders = false;
+this->SupportsMachO64Parser = false;
 }
   if (version < 3007) // 3.7 is Indigo
 {
@@ -754,7 +756,9 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
   }
 else if (systemName == "Darwin")
   {
-  fout << "SupportsMachO64Parser ? "org.eclipse.cdt.core.MachO64"
+: "org.eclipse.cdt.core.MachO") << "\""
   " point=\"org.eclipse.cdt.core.BinaryParser\">\n"
   "\n"
   "\n"
diff --git a/Source/cmExtraEclipseCDT4Generator.h 
b/Source/cmExtraEclipseCDT4Generator.h
index 9c89f85..d88b247 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -115,6 +115,7 @@ private:
   bool GenerateLinkedResources;
   bool SupportsVirtualFolders;
   bool SupportsGmakeErrorParser;
+  bool SupportsMachO64Parser;
 
 };
 

---

Summary of changes:
 Source/CMakeVersion.cmake  |2 +-
 Source/cmExtraEclipseCDT4Generator.cxx |6 +-
 Source/cmExtraEclipseCDT4Generator.h   |1 +
 3 files changed, 7 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6477-gc1dcb19

[Alexander Neundorf]

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  c1dcb1959714cf1018506f1dd3417e764cd1c132 (commit)
   via  37104d97b012574ab4d3725a077611e2d31e1547 (commit)
   via  424d5dc07844ee7ef21776e32caaf137b33f8358 (commit)
   via  8bd6cf0f33feed20d9ac5e8a7f8dd946b3589ff1 (commit)
   via  8b275894da09fb4e9793163f1b330d9289ee020e (commit)
   via  a8466700136e446136eca8529e1e1c4aade6a2ec (commit)
   via  9f7c2bde8f1541089c9b39d8bf54f98a9f36c3ae (commit)
  from  846a1b77380abf97cbd06aefa1a4792f044a9de6 (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=c1dcb1959714cf1018506f1dd3417e764cd1c132
commit c1dcb1959714cf1018506f1dd3417e764cd1c132
Merge: 846a1b7 37104d9
Author: Alexander Neundorf 
AuthorDate: Mon Dec 30 16:59:06 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Dec 30 16:59:06 2013 -0500

Merge topic 'KateProjectImprovements' into next

37104d9 kate: put full path to cmake into comment
424d5dc kate: support also the build plugin in kate <= 4.12
8bd6cf0 kate: the prev_target is not used by kate
8b27589 CMake Nightly Date Stamp
a846670 CMake Nightly Date Stamp
9f7c2bd CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37104d97b012574ab4d3725a077611e2d31e1547
commit 37104d97b012574ab4d3725a077611e2d31e1547
Author: Alex Neundorf 
AuthorDate: Sun Dec 29 07:07:59 2013 +0100
Commit: Alex Neundorf 
CommitDate: Sun Dec 29 21:17:32 2013 +0100

kate: put full path to cmake into comment

Alex

diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index ba67fda..0312488 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -247,7 +247,8 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(const 
cmMakefile* mf) const
 return;
 }
 
-  fout << "#Generated by cmake, do not edit.\n";
+  fout << "#Generated by " << mf->GetRequiredDefinition("CMAKE_COMMAND")
+   << ", do not edit.\n";
 }
 
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=424d5dc07844ee7ef21776e32caaf137b33f8358
commit 424d5dc07844ee7ef21776e32caaf137b33f8358
Author: Alex Neundorf 
AuthorDate: Sun Dec 29 07:00:24 2013 +0100
Commit: Alex Neundorf 
CommitDate: Sun Dec 29 21:17:25 2013 +0100

kate: support also the build plugin in kate <= 4.12

With this patch, simply also the information used
by the build plugin in kate <= 4.12 is put into the
generated json file. The new build plugin (coming
in 4.13) simply ignores this (and vice versa).

Alex

diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 8399fe8..ba67fda 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -86,17 +86,28 @@ void
 cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
cmGeneratedFileStream& fout) const
 {
+  const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
+  const std::string makeArgs = mf->GetSafeDefinition(
+"CMAKE_KATE_MAKE_ARGUMENTS");
+  const char* homeOutputDir = mf->GetHomeOutputDirectory();
+
   fout <<
   "\t\"build\": {\n"
   "\t\t\"directory\": \"" << mf->GetHomeOutputDirectory() << "\",\n"
   "\t\t\"default_target\": \"all\",\n"
-  "\t\t\"clean_target\": \"clean\",\n"
-  "\t\t\"targets\":[\n";
+  "\t\t\"clean_target\": \"clean\",\n";
 
-  const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
-  const std::string makeArgs = mf->GetSafeDefinition(
-  "CMAKE_KATE_MAKE_ARGUMENTS");
-  const char* homeOutputDir = mf->GetHomeOutputDirectory();
+  // build, clean and quick are for the build plugin kate <= 4.12:
+  fout << "\t\t\"build\": \"" << make << " -C " << homeOutputDir
+   << " " << makeArgs << " " << "all\",\n";
+  fout << "\t\t\"clean\": \"" << make << " -C " << homeOutputDir
+   << " " << makeArgs << " " << "clean\",\n";
+  fout << "\t\t\"quick\": \&qu

[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6349-g1c380af

[Alexander Neundorf]

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  1c380af0e991aebc60dcf496f9ff34c9783bcace (commit)
   via  de8da6f311fccc1e5d494f48b20079f7f287651d (commit)
   via  eb684157bef60fe5668d284dbc97ee3b0930810c (commit)
   via  de607ff52ee0a1e44fdee071f6367d95533b7cd4 (commit)
  from  aefbef778396c2a4d5127e68f69abc4b16f4b0bb (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=1c380af0e991aebc60dcf496f9ff34c9783bcace
commit 1c380af0e991aebc60dcf496f9ff34c9783bcace
Merge: aefbef7 de8da6f
Author: Alexander Neundorf 
AuthorDate: Sun Dec 22 15:42:19 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Dec 22 15:42:19 2013 -0500

Merge topic 'MakeDocsWorkWithDocutilsBefore0_11' into next

de8da6f Documentation: make it work with older docutils
eb68415 CMake Nightly Date Stamp
de607ff CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de8da6f311fccc1e5d494f48b20079f7f287651d
commit de8da6f311fccc1e5d494f48b20079f7f287651d
Author: Alex Neundorf 
AuthorDate: Sun Dec 22 20:46:57 2013 +0100
Commit: Alex Neundorf 
CommitDate: Sun Dec 22 20:46:57 2013 +0100

Documentation: make it work with older docutils

In older versions of python docutils error_reporting
was not in the utils subpackage, so try the older
location if the new one failed.
Or should we actually try to check the version number ?

Alex

diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py
index 146e1f6..1955e42 100644
--- a/Utilities/Sphinx/cmake.py
+++ b/Utilities/Sphinx/cmake.py
@@ -14,7 +14,12 @@ import re
 
 from docutils.parsers.rst import Directive, directives
 from docutils.transforms import Transform
-from docutils.utils.error_reporting import SafeString, ErrorString
+try:
+from docutils.utils.error_reporting import SafeString, ErrorString
+except ImportError:
+# error_reporting was not in utils before version 0.11:
+from docutils.error_reporting import SafeString, ErrorString
+
 from docutils import io, nodes
 
 from sphinx.directives import ObjectDescription

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 Utilities/Sphinx/cmake.py |7 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6149-g8d32f93

[Alexander Neundorf]

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  8d32f9302671f3ff0378998154c6c5ec800f33d1 (commit)
   via  bd177f5c96364b5480d3ec5c6c8b0c7ae8d67887 (commit)
   via  a7b64058256673762f43b2e3d0331468ba9200f0 (commit)
   via  a2489ce49c0cbf5582a29ef8c4a0d9728994f465 (commit)
  from  48aa0728067ab0a10c22e4ac44936f5eb7d9a80d (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=8d32f9302671f3ff0378998154c6c5ec800f33d1
commit 8d32f9302671f3ff0378998154c6c5ec800f33d1
Merge: 48aa072 bd177f5
Author: Alexander Neundorf 
AuthorDate: Tue Dec 10 17:41:01 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Dec 10 17:41:01 2013 -0500

Merge topic 'KateFixNinja' into next

bd177f5 kate: fix ninja support
a7b6405 Kate: remove unused function
a2489ce CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd177f5c96364b5480d3ec5c6c8b0c7ae8d67887
commit bd177f5c96364b5480d3ec5c6c8b0c7ae8d67887
Author: Alex Neundorf 
AuthorDate: Tue Dec 10 22:52:15 2013 +0100
Commit: Alex Neundorf 
CommitDate: Tue Dec 10 22:52:15 2013 +0100

kate: fix ninja support

ninja needs to be run from the toplevel build dir,
not from the target dir, as make

Alex

diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 340ffba..177ef8d 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -52,6 +52,8 @@ void cmExtraKateGenerator::Generate()
   this->ProjectName = this->GenerateProjectName(mf->GetProjectName(),
   mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
   this->GetPathBasename(mf->GetHomeOutputDirectory()));
+  this->UseNinja = (strcmp(this->GlobalGenerator->GetName(), "Ninja")==0);
+
   this->CreateKateProjectFile(mf);
   this->CreateDummyKateProjectFile(mf);
 }
@@ -95,11 +97,12 @@ cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
   const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   const std::string makeArgs = mf->GetSafeDefinition(
   "CMAKE_KATE_MAKE_ARGUMENTS");
+  const char* homeOutputDir = mf->GetHomeOutputDirectory();
 
   this->AppendTarget(fout, "all", make, makeArgs,
- mf->GetHomeOutputDirectory());
+ homeOutputDir, homeOutputDir);
   this->AppendTarget(fout, "clean", make, makeArgs,
- mf->GetHomeOutputDirectory());
+ homeOutputDir, homeOutputDir);
 
   // add all executable and library targets and some of the GLOBAL
   // and UTILITY targets
@@ -143,7 +146,8 @@ cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
 }
   if (insertTarget)
 {
-this->AppendTarget(fout, ti->first, make, makeArgs, currentDir);
+this->AppendTarget(fout, ti->first, make, makeArgs,
+   currentDir, homeOutputDir);
 }
 }
 break;
@@ -158,7 +162,8 @@ cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
   break;
 }
 
-this->AppendTarget(fout, ti->first, make, makeArgs, currentDir);
+this->AppendTarget(fout, ti->first, make, makeArgs,
+   currentDir, homeOutputDir);
   break;
 case cmTarget::EXECUTABLE:
 case cmTarget::STATIC_LIBRARY:
@@ -166,10 +171,12 @@ cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
 case cmTarget::MODULE_LIBRARY:
 case cmTarget::OBJECT_LIBRARY:
 {
-  this->AppendTarget(fout, ti->first, make, makeArgs, currentDir);
+  this->AppendTarget(fout, ti->first, make, makeArgs,
+ currentDir, homeOutputDir);
   std::string fastTarget = ti->first;
   fastTarget += "/fast";
-  this->AppendTarget(fout, fastTarget, make, makeArgs, currentDir);
+  this->AppendTarget(fout, fastTarget, make, makeArgs,
+ currentDir, homeOutputDir);
 
 }
 break;
@@ -185,7 +192,7 @@ cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
 fit != objectFileTargets.end();
 ++fit)
   {
-  this->AppendTarget(fout, *fit, make, makeArgs, currentDir);
+  this->AppendTarget(fout, *fit, make, makeArgs, currentDir,homeOutputDir);
   }
   }
 
@@ -

[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5726-g3b30ff6

[Alexander Neundorf]

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  3b30ff6cb8e465e3152e17da655e74b8ac331a12 (commit)
   via  c8ac63c6d16505736deb110622cfb6f959bc8427 (commit)
   via  17661853a25a4454403f6b97d0d3a04a7236228a (commit)
   via  47573856af5eebf91e926274cc147c650669f198 (commit)
  from  0030edf995e110b391f5e1d55177ac91ad9ee4bb (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=3b30ff6cb8e465e3152e17da655e74b8ac331a12
commit 3b30ff6cb8e465e3152e17da655e74b8ac331a12
Merge: 0030edf c8ac63c
Author: Alexander Neundorf 
AuthorDate: Sun Nov 24 17:46:04 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Nov 24 17:46:04 2013 -0500

Merge topic 'KateProjectGenerator2' into next

c8ac63c kate: add some documentation
1766185 kate generator: insert build targets
4757385 kate: add project generator for the Kate project plugin


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8ac63c6d16505736deb110622cfb6f959bc8427
commit c8ac63c6d16505736deb110622cfb6f959bc8427
Author: Alex Neundorf 
AuthorDate: Sat Nov 16 16:13:13 2013 +0100
Commit: Alex Neundorf 
CommitDate: Sun Nov 24 22:57:04 2013 +0100

kate: add some documentation

Alex

diff --git a/Help/generator/Kate - MinGW Makefiles.rst b/Help/generator/Kate - 
MinGW Makefiles.rst
new file mode 100644
index 000..ffdab59
--- /dev/null
+++ b/Help/generator/Kate - MinGW Makefiles.rst 
@@ -0,0 +1,12 @@
+Kate - Unix Makefiles
+---
+
+Generates Kate project files.
+
+A project file for Kate will be created in the top directory in the top level
+build directory.
+To use it in kate, the Project plugin must be enabled.
+The project file is loaded in kate simply by opening the
+ProjectName.kateproject file in the editor.
+If the kate Build-plugin is enabled, all targets generated by CMake are
+available for building.
diff --git a/Help/generator/Kate - NMake Makefiles.rst b/Help/generator/Kate - 
NMake Makefiles.rst
new file mode 100644
index 000..ffdab59
--- /dev/null
+++ b/Help/generator/Kate - NMake Makefiles.rst 
@@ -0,0 +1,12 @@
+Kate - Unix Makefiles
+---
+
+Generates Kate project files.
+
+A project file for Kate will be created in the top directory in the top level
+build directory.
+To use it in kate, the Project plugin must be enabled.
+The project file is loaded in kate simply by opening the
+ProjectName.kateproject file in the editor.
+If the kate Build-plugin is enabled, all targets generated by CMake are
+available for building.
diff --git a/Help/generator/Kate - Ninja.rst b/Help/generator/Kate - Ninja.rst
new file mode 100644
index 000..ffdab59
--- /dev/null
+++ b/Help/generator/Kate - Ninja.rst   
@@ -0,0 +1,12 @@
+Kate - Unix Makefiles
+---
+
+Generates Kate project files.
+
+A project file for Kate will be created in the top directory in the top level
+build directory.
+To use it in kate, the Project plugin must be enabled.
+The project file is loaded in kate simply by opening the
+ProjectName.kateproject file in the editor.
+If the kate Build-plugin is enabled, all targets generated by CMake are
+available for building.
diff --git a/Help/generator/Kate - Unix Makefiles.rst b/Help/generator/Kate - 
Unix Makefiles.rst
new file mode 100644
index 000..ffdab59
--- /dev/null
+++ b/Help/generator/Kate - Unix Makefiles.rst  
@@ -0,0 +1,12 @@
+Kate - Unix Makefiles
+---
+
+Generates Kate project files.
+
+A project file for Kate will be created in the top directory in the top level
+build directory.
+To use it in kate, the Project plugin must be enabled.
+The project file is loaded in kate simply by opening the
+ProjectName.kateproject file in the editor.
+If the kate Build-plugin is enabled, all targets generated by CMake are
+available for building.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17661853a25a4454403f6b97d0d3a04a7236228a
commit 17661853a25a4454403f6b97d0d3a04a7236228a
Author: Alex Neundorf 
AuthorDate: Mon May 20 17:28:00 2013 +0200
Commit: Alex Neundorf 
CommitDate: Sun Nov 24 22:57:04 2013 +0100

kate generator: insert build targets

This can be used by the build plugin in kate.
Code is quite similar to the one for Eclipse.

Alex

diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index de3da15..f020ddb 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -74,18 +74,146 @@ void cmExtraKateGenerator::CreateKateProjectFile(const 
cmMakefile* mf) const
 

[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5709-g75f4a82

[Alexander Neundorf]

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  75f4a82144cf3643e887ade282da2d12f108f9a9 (commit)
   via  83751af2198a4eb298bdc814c56d0a4a4698e1df (commit)
  from  7053c8559c377f681e1f1102092193a9ca7269a2 (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=75f4a82144cf3643e887ade282da2d12f108f9a9
commit 75f4a82144cf3643e887ade282da2d12f108f9a9
Merge: 7053c85 83751af
Author: Alexander Neundorf 
AuthorDate: Sat Nov 23 18:43:08 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Sat Nov 23 18:43:08 2013 -0500

Merge topic 'EclipseParallelMakeOnlyOnUnixHosts' into next

83751af Eclipse: add -j only on UNIX hosts


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83751af2198a4eb298bdc814c56d0a4a4698e1df
commit 83751af2198a4eb298bdc814c56d0a4a4698e1df
Author: Alex Neundorf 
AuthorDate: Sat Nov 23 23:48:43 2013 +0100
Commit: Alex Neundorf 
CommitDate: Sat Nov 23 23:48:43 2013 +0100

Eclipse: add -j only on UNIX hosts

The previous version added -jN to the make invokation if UNIX
was set, but this was true also when cross compiling.
What we are actually interested in is CMAKE_HOST_UNIX, i.e.
whether the build host is UNIX.
Or we should check more exactly what CMAKE_MAKE_PROGRAM is.

Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake 
b/Modules/CMakeFindEclipseCDT4.cmake
index b67e0f0..85c1fdf 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -78,7 +78,7 @@ processorcount(_CMAKE_ECLIPSE_PROCESSOR_COUNT)
 
 # Only set -j if we are under UNIX and if the make-tool used actually has 
"make" in the name
 # (we may also get here in the future e.g. for ninja)
-if("${_CMAKE_ECLIPSE_PROCESSOR_COUNT}" GREATER 1  AND  UNIX  AND  
"${CMAKE_MAKE_PROGRAM}" MATCHES make)
+if("${_CMAKE_ECLIPSE_PROCESSOR_COUNT}" GREATER 1  AND  CMAKE_HOST_UNIX  AND  
"${CMAKE_MAKE_PROGRAM}" MATCHES make)
   set(_CMAKE_ECLIPSE_INITIAL_MAKE_ARGS "-j${_CMAKE_ECLIPSE_PROCESSOR_COUNT}")
 endif()
 

---

Summary of changes:
 Modules/CMakeFindEclipseCDT4.cmake |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4237-g6a49ff2

[Alexander Neundorf]

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  6a49ff20d75c51cc03cf7ee63481f3103cd9ebfc (commit)
   via  5f11b8de28227223cdcc8cbdec2ec231a34ebe05 (commit)
   via  2b63734b7f078281540adaaf75b5a25ed897106d (commit)
   via  1ff8c21734b2ea0e56d710d3d199529f76420a38 (commit)
   via  9bcf6adc388c2306033c65270357eb1a1da83d76 (commit)
  from  60991593fec030a7cce4ed976e71e20157cdaebd (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=6a49ff20d75c51cc03cf7ee63481f3103cd9ebfc
commit 6a49ff20d75c51cc03cf7ee63481f3103cd9ebfc
Merge: 6099159 5f11b8d
Author: Alexander Neundorf 
AuthorDate: Wed Sep 18 18:57:33 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Sep 18 18:57:33 2013 -0400

Merge topic 'EclipseFixWarningMessage' into next

5f11b8d Eclipse: add version 4.3 for completeness
2b63734 Eclipse: print different message if CMAKE_ECLIPSE_VERSION is 
already set
1ff8c21 CMakeFindEclipse: use lowercase for macro calls
9bcf6ad CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f11b8de28227223cdcc8cbdec2ec231a34ebe05
commit 5f11b8de28227223cdcc8cbdec2ec231a34ebe05
Author: Alex Neundorf 
AuthorDate: Thu Sep 19 00:58:25 2013 +0200
Commit: Alex Neundorf 
CommitDate: Thu Sep 19 00:58:25 2013 +0200

Eclipse: add version 4.3 for completeness

This just adds the version number, there are no features
depending on this.

Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake 
b/Modules/CMakeFindEclipseCDT4.cmake
index 9453b71..b67e0f0 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -29,6 +29,7 @@ function(_FIND_ECLIPSE_VERSION)
   set(_ECLIPSE_VERSION_NAME_3.6 "Helios" )
   set(_ECLIPSE_VERSION_NAME_3.7 "Indigo" )
   set(_ECLIPSE_VERSION_NAME_4.2 "Juno" )
+  set(_ECLIPSE_VERSION_NAME_4.3 "Kepler" )
 
   if(NOT DEFINED CMAKE_ECLIPSE_VERSION)
 if(CMAKE_ECLIPSE_EXECUTABLE)
@@ -63,6 +64,7 @@ function(_FIND_ECLIPSE_VERSION)
 "3.6 
(${_ECLIPSE_VERSION_NAME_3.6})"
 "3.7 
(${_ECLIPSE_VERSION_NAME_3.7})"
 "4.2 
(${_ECLIPSE_VERSION_NAME_4.2})"
+"4.3 
(${_ECLIPSE_VERSION_NAME_4.3})"
   )
 endfunction()
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b63734b7f078281540adaaf75b5a25ed897106d
commit 2b63734b7f078281540adaaf75b5a25ed897106d
Author: Alex Neundorf 
AuthorDate: Thu Sep 19 00:53:38 2013 +0200
Commit: Alex Neundorf 
CommitDate: Thu Sep 19 00:53:38 2013 +0200

Eclipse: print different message if CMAKE_ECLIPSE_VERSION is already set

This fixes #14422.

Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake 
b/Modules/CMakeFindEclipseCDT4.cmake
index 2024d04..9453b71 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -19,18 +19,6 @@ find_program(CMAKE_ECLIPSE_EXECUTABLE NAMES eclipse DOC "The 
Eclipse executable"
 
 function(_FIND_ECLIPSE_VERSION)
   # This code is in a function so the variables used here have only local scope
-  if(CMAKE_ECLIPSE_EXECUTABLE)
-# use REALPATH to resolve symlinks 
(http://public.kitware.com/Bug/view.php?id=13036)
-get_filename_component(_REALPATH_CMAKE_ECLIPSE_EXECUTABLE 
"${CMAKE_ECLIPSE_EXECUTABLE}" REALPATH)
-get_filename_component(_ECLIPSE_DIR 
"${_REALPATH_CMAKE_ECLIPSE_EXECUTABLE}" PATH)
-file(GLOB _ECLIPSE_FEATURE_DIR 
"${_ECLIPSE_DIR}/features/org.eclipse.platform*")
-if(APPLE AND NOT _ECLIPSE_FEATURE_DIR)
-  file(GLOB _ECLIPSE_FEATURE_DIR 
"${_ECLIPSE_DIR}/../../../features/org.eclipse.platform*")
-endif()
-if("${_ECLIPSE_FEATURE_DIR}" MATCHES 
".+org.eclipse.platform_([0-9]+\\.[0-9]+).+")
-  set(_ECLIPSE_VERSION ${CMAKE_MATCH_1})
-endif()
-  endif()
 
   # Set up a map with the names of the Eclipse releases:
   set(_ECLIPSE_VERSION_NAME_"Unknown" )
@@ -42,14 +30,32 @@ function(_FIND_ECLIPSE_VERSION)
   set(_ECLIPSE_VERSION_NAME_3.7 "Indigo" )
   set(_ECLIPSE_VERSION_NAME_4.2 "Juno" )
 
-  if(_ECLIPSE_VERSION)
-message(STATUS "Found Eclipse version ${_ECLIPSE_VERSION} 
(${_ECLIPSE_VERSION_NAME_${_ECLIPSE_VERSION}})")
+  if(NOT DEFINED CMAKE_ECLIPSE_VERSION)
+if(CM

[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4131-gcaab0d0

[Alexander Neundorf]

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  caab0d003028d19f74f3388cb9ceca2d7a60582e (commit)
   via  bbb0d6faa67725e99eb6ec25683d6ae51d6cd01e (commit)
  from  7be9c151f56ce2ab4df27f3fbb9332b8c1c55922 (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=caab0d003028d19f74f3388cb9ceca2d7a60582e
commit caab0d003028d19f74f3388cb9ceca2d7a60582e
Merge: 7be9c15 bbb0d6f
Author: Alexander Neundorf 
AuthorDate: Wed Sep 11 15:06:56 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Sep 11 15:06:56 2013 -0400

Merge topic 'FixTypoInGraphvizDocs' into next

bbb0d6f CMakeGraphVizOptions.cmake: Fix typo in documentation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbb0d6faa67725e99eb6ec25683d6ae51d6cd01e
commit bbb0d6faa67725e99eb6ec25683d6ae51d6cd01e
Author: Alex Neundorf 
AuthorDate: Wed Sep 11 21:08:25 2013 +0200
Commit: Alex Neundorf 
CommitDate: Wed Sep 11 21:08:25 2013 +0200

CMakeGraphVizOptions.cmake: Fix typo in documentation

Alex

diff --git a/Modules/CMakeGraphVizOptions.cmake 
b/Modules/CMakeGraphVizOptions.cmake
index e4af54c..2f04abb 100644
--- a/Modules/CMakeGraphVizOptions.cmake
+++ b/Modules/CMakeGraphVizOptions.cmake
@@ -53,7 +53,7 @@
 # Default   : TRUE
 ##end
 ##variable
-#  GRAPHVIZ_MODULE_LIBS - Set this to FALSE to exclude static libraries from 
the generated graphs.
+#  GRAPHVIZ_MODULE_LIBS - Set this to FALSE to exclude module libraries from 
the generated graphs.
 # Mandatory : NO
 # Default   : TRUE
 ##end

---

Summary of changes:
 Modules/CMakeGraphVizOptions.cmake |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3439-g109cb22

[Alexander Neundorf]

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  109cb22d598c6c9b9e79a502f50c8506d64145ab (commit)
   via  e32ff9666c3b5c3b0c0d6d28c4cec76e84ffc1dc (commit)
  from  95c9df413a1b9348bef03c288bd4bf2c42384ab7 (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=109cb22d598c6c9b9e79a502f50c8506d64145ab
commit 109cb22d598c6c9b9e79a502f50c8506d64145ab
Merge: 95c9df4 e32ff96
Author: Alexander Neundorf 
AuthorDate: Sat Jul 27 15:36:37 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Jul 27 15:36:37 2013 -0400

Merge topic 'PrintHelperFunctions' into next

e32ff96 add macros cmake_print_properties() and cmake_print_variables()


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e32ff9666c3b5c3b0c0d6d28c4cec76e84ffc1dc
commit e32ff9666c3b5c3b0c0d6d28c4cec76e84ffc1dc
Author: Alex Neundorf 
AuthorDate: Sat Jul 27 21:27:56 2013 +0200
Commit: Alex Neundorf 
CommitDate: Sat Jul 27 21:37:05 2013 +0200

add macros cmake_print_properties() and cmake_print_variables()

This patch adds the file CMakePrintHelpers.cmake, which provides
the macros (functions) cmake_print_properties() and cmake_print_variables(),
which are useful e.g. for debugging and make inspecting target (or other)
properties easier.

Alex

diff --git a/Modules/CMakePrintHelpers.cmake b/Modules/CMakePrintHelpers.cmake
new file mode 100644
index 000..ef5d857
--- /dev/null
+++ b/Modules/CMakePrintHelpers.cmake
@@ -0,0 +1,146 @@
+# - Convenience macros for printing properties and variables, useful e.g. for 
debugging.
+#
+#
+# CMAKE_PRINT_PROPERTIES([TARGETS target1 .. targetN]
+#[SOURCES source1 .. sourceN]
+#[DIRECTORIES dir1 .. dirN]
+#[TESTS test1 .. testN]
+#[CACHE_ENTRIES entry1 .. entryN]
+#PROPERTIES prop1 .. propN )
+#
+# This macro prints the values of the properties of the given targets,
+# source files, directories, tests or cache entries. Exactly one of the
+# scope keywords must be used.
+# Example:
+#   cmake_print_properties(TARGETS foo bar PROPERTIES LOCATION 
INTERFACE_INCLUDE_DIRS)
+# This will print the LOCATION and INTERFACE_INCLUDE_DIRS properties for both
+# targets foo and bar.
+#
+#
+# CMAKE_PRINT_VARIABLES(var1 var2 .. varN)
+#
+# This macro will print the name of each variable followed by its value.
+# Example:
+#   cmake_print_variables(CMAKE_C_COMPILER CMAKE_MAJOR_VERSION 
THIS_ONE_DOES_NOT_EXIST)
+# Gives:
+#   -- CMAKE_C_COMPILER="/usr/bin/gcc" ; CMAKE_MAJOR_VERSION="2" ; 
THIS_ONE_DOES_NOT_EXIST=""
+
+#=====
+# Copyright 2013 Alexander Neundorf, 
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+include(CMakeParseArguments)
+
+function(CMAKE_PRINT_VARIABLES)
+   set(msg "")
+   foreach(var ${ARGN})
+  if(msg)
+ set(msg "${msg} ; ")
+  endif()
+  set(msg "${msg}${var}=\"${${var}}\"")
+   endforeach()
+   message(STATUS "${msg}")
+endfunction()
+
+
+function(CMAKE_PRINT_PROPERTIES )
+  set(options )
+  set(oneValueArgs )
+  set(multiValueArgs TARGETS SOURCES TESTS DIRECTORIES CACHE_ENTRIES 
PROPERTIES )
+
+  cmake_parse_arguments(CPP "${options}" "${oneValueArgs}" "${multiValueArgs}" 
 ${ARGN})
+
+  if(CPP_UNPARSED_ARGUMENTS)
+message(FATAL_ERROR "Unknown keywords given to cmake_print_properties(): 
\"${CPP_UNPARSED_ARGUMENTS}\"")
+return()
+  endif()
+
+  if(NOT CPP_PROPERTIES)
+message(FATAL_ERROR "Required argument PROPERTIES missing in 
cmake_print_properties() call")
+return()
+  endif()
+
+  set(mode)
+  set(items)
+  set(keyword)
+
+  if(CPP_TARGETS)
+set(items ${CPP_TARGETS})
+set(mode ${mode} TARGETS)
+set(keyword TARGET)
+  endif()
+
+  if(CPP_SOURCES)
+set(items ${CPP_SOURCES})
+set(mode ${mode} SOURCES)
+set(keyword SOURCE)
+  endif()
+
+  if(CPP_TESTS)
+set(items ${CPP_TESTS})
+   

[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3432-ga8b552a

[Alexander Neundorf]

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  a8b552af1266ab35a09219eb613974d3fab4a641 (commit)
   via  692ecf4b7c0d95d50569dde87db27b7dbb5d7a99 (commit)
  from  5a2d7d94f7bc0e9c30b9ef0d4e47005b551a9ee8 (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=a8b552af1266ab35a09219eb613974d3fab4a641
commit a8b552af1266ab35a09219eb613974d3fab4a641
Merge: 5a2d7d9 692ecf4
Author: Alexander Neundorf 
AuthorDate: Fri Jul 26 17:30:49 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 26 17:30:49 2013 -0400

Merge topic 'DocumentGraphvisOptions' into next

692ecf4 graphvizoptions: add copyright notice


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=692ecf4b7c0d95d50569dde87db27b7dbb5d7a99
commit 692ecf4b7c0d95d50569dde87db27b7dbb5d7a99
Author: Alex Neundorf 
AuthorDate: Fri Jul 26 23:32:41 2013 +0200
Commit: Alex Neundorf 
CommitDate: Fri Jul 26 23:32:41 2013 +0200

graphvizoptions: add copyright notice

Alex

diff --git a/Modules/CMakeGraphVizOptions.cmake 
b/Modules/CMakeGraphVizOptions.cmake
index d07acef..e4af54c 100644
--- a/Modules/CMakeGraphVizOptions.cmake
+++ b/Modules/CMakeGraphVizOptions.cmake
@@ -67,3 +67,17 @@
 # Mandatory : NO
 # Default   : empty
 ##end
+
+#=
+# Copyright 2007-2009 Kitware, Inc.
+# Copyright 2013 Alexander Neundorf 
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)

---

Summary of changes:
 Modules/CMakeGraphVizOptions.cmake |   14 ++
 1 files changed, 14 insertions(+), 0 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3430-g5a2d7d9

[Alexander Neundorf]

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  5a2d7d94f7bc0e9c30b9ef0d4e47005b551a9ee8 (commit)
   via  ee32673c7d39ec21788b46d6dc0200565096977f (commit)
  from  7a113f3e825e2985c268ea84fe265f49c334f0fe (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=5a2d7d94f7bc0e9c30b9ef0d4e47005b551a9ee8
commit 5a2d7d94f7bc0e9c30b9ef0d4e47005b551a9ee8
Merge: 7a113f3 ee32673
Author: Alexander Neundorf 
AuthorDate: Fri Jul 26 16:42:35 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 26 16:42:35 2013 -0400

Merge topic 'DocumentGraphvisOptions' into next

ee32673 Add documentation for the --graphviz support


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee32673c7d39ec21788b46d6dc0200565096977f
commit ee32673c7d39ec21788b46d6dc0200565096977f
Author: Alex Neundorf 
AuthorDate: Fri Jul 26 22:43:42 2013 +0200
Commit: Alex Neundorf 
CommitDate: Fri Jul 26 22:43:42 2013 +0200

Add documentation for the --graphviz support

This patch adds Modules/CMakeGraphVizOptions.cmake, which is used
only for generating documentation for the --graphviz support.

Alex

diff --git a/Modules/CMakeGraphVizOptions.cmake 
b/Modules/CMakeGraphVizOptions.cmake
new file mode 100644
index 000..d07acef
--- /dev/null
+++ b/Modules/CMakeGraphVizOptions.cmake
@@ -0,0 +1,69 @@
+##section Variables specific to the graphviz support
+##end
+##module
+# - The builtin graphviz support of CMake.
+# CMake can generate graphviz files, showing the dependencies between
+# the targets in a project and also external libraries which are linked
+# against.
+# When CMake is run with the --graphiz=foo option, it will produce
+#* a foo.dot file showing all dependencies in the project
+#* a foo.dot. file for each target, file showing on which other 
targets the respective target depends
+#* a foo.dot..dependers file, showing which other targets depend 
on the respective target
+#
+# This can result in huge graphs. Using the file CMakeGraphVizOptions.cmake
+# the look and content of the generated graphs can be influenced.
+# This file is searched first in ${CMAKE_BINARY_DIR} and then in
+# ${CMAKE_SOURCE_DIR}. If found, it is read and the variables set in it
+# are used to adjust options for the generated graphviz files.
+##end
+#
+##variable
+#  GRAPHVIZ_GRAPH_TYPE - The graph type
+# Mandatory : NO
+# Default   : "digraph"
+##end
+##variable
+#  GRAPHVIZ_GRAPH_NAME - The graph name.
+# Mandatory : NO
+# Default   : "GG"
+##end
+##variable
+#  GRAPHVIZ_GRAPH_HEADER - The header written at the top of the graphviz file.
+# Mandatory : NO
+# Default   : "node [n  fontsize = "12"];"
+##end
+##variable
+#  GRAPHVIZ_NODE_PREFIX - The prefix for each node in the graphviz file.
+# Mandatory : NO
+# Default   : "node"
+##end
+##variable
+#  GRAPHVIZ_EXECUTABLES - Set this to FALSE to exclude executables from the 
generated graphs.
+# Mandatory : NO
+# Default   : TRUE
+##end
+##variable
+#  GRAPHVIZ_STATIC_LIBS - Set this to FALSE to exclude static libraries from 
the generated graphs.
+# Mandatory : NO
+# Default   : TRUE
+##end
+##variable
+#  GRAPHVIZ_SHARED_LIBS - Set this to FALSE to exclude shared libraries from 
the generated graphs.
+# Mandatory : NO
+# Default   : TRUE
+##end
+##variable
+#  GRAPHVIZ_MODULE_LIBS - Set this to FALSE to exclude static libraries from 
the generated graphs.
+# Mandatory : NO
+# Default   : TRUE
+##end
+##variable
+#  GRAPHVIZ_EXTERNAL_LIBS - Set this to FALSE to exclude external libraries 
from the generated graphs.
+# Mandatory : NO
+# Default   : TRUE
+##end
+##variable
+#  GRAPHVIZ_IGNORE_TARGETS - A list of regular expressions for ignoring 
targets.
+# Mandatory : NO
+# Default   : empty
+##end
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 77a5e43..f3553f1 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -108,9 +108,11 @@ static const char * cmDocumentationOptions[][3] =
"to stdout. This can be used to use cmake instead of pkg-config to find "
"installed libraries in plain Makefile-based projects or in "
"autoconf-based projects (via share/aclocal/cmake.m4)."},
-  {"--graphviz=[file]", "Generate graphviz of dependencies.",
+  {"--graphviz=[file]", "Generate graphviz of dependencies, see "
+   "CMakeGraphVizOptions.cmake for more.",
"Generate a graphviz input file tha

[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3257-gf4e1a8b

[Alexander Neundorf]

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  f4e1a8b164d7f732037dff909d70602106a3b21a (commit)
   via  4b1919f73e7663799285171b472d76053fb99166 (commit)
  from  3f5d8ca1a663d1ad4142944a668080ff452a5788 (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=f4e1a8b164d7f732037dff909d70602106a3b21a
commit f4e1a8b164d7f732037dff909d70602106a3b21a
Merge: 3f5d8ca 4b1919f
Author: Alexander Neundorf 
AuthorDate: Fri Jul 19 16:57:17 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 19 16:57:17 2013 -0400

Merge topic 'AddCommentsToExportsFile' into next

4b1919f ExportTargets: add one more comment to the generated file.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b1919f73e7663799285171b472d76053fb99166
commit 4b1919f73e7663799285171b472d76053fb99166
Author: Alex Neundorf 
AuthorDate: Fri Jul 19 22:57:33 2013 +0200
Commit: Alex Neundorf 
CommitDate: Fri Jul 19 22:57:33 2013 +0200

ExportTargets: add one more comment to the generated file.

This patch adds a comment above the block which protects
the exported targets file against multiple inclusion, to make
the file easier to understand for readers.

Alex

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index b4e6e81..90e6d51 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -792,7 +792,9 @@ void 
cmExportFileGenerator::GenerateImportVersionCode(std::ostream& os)
 void cmExportFileGenerator::GenerateExpectedTargetsCode(std::ostream& os,
 const std::string &expectedTargets)
 {
-  os << "set(_targetsDefined)\n"
+  os << "# Protect against multiple inclusion, which would fail when already "
+"imported targets are added once more.\n"
+"set(_targetsDefined)\n"
 "set(_targetsNotDefined)\n"
 "set(_expectedTargets)\n"
 "foreach(_expectedTarget " << expectedTargets << ")\n"

---

Summary of changes:
 Source/cmExportFileGenerator.cxx |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2822-g361ff41

[Alexander Neundorf]

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  361ff4145528a73d51be1bd1ea450f5a2b8accfb (commit)
   via  ba0e06f250665ee985bb6e94dbee3ca8009b60a7 (commit)
  from  754b1a473704e04055cb9601d61cc7eaf21cdb78 (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=361ff4145528a73d51be1bd1ea450f5a2b8accfb
commit 361ff4145528a73d51be1bd1ea450f5a2b8accfb
Merge: 754b1a4 ba0e06f
Author: Alexander Neundorf 
AuthorDate: Fri Jun 28 15:39:51 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jun 28 15:39:51 2013 -0400

Merge topic 'AddAutomocTargetFolder' into next

ba0e06f automoc: add a global AUTOMOC_TARGETS_FOLDER property


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba0e06f250665ee985bb6e94dbee3ca8009b60a7
commit ba0e06f250665ee985bb6e94dbee3ca8009b60a7
Author: Alex Neundorf 
AuthorDate: Fri Jun 28 21:40:16 2013 +0200
Commit: Alex Neundorf 
CommitDate: Fri Jun 28 21:40:16 2013 +0200

automoc: add a global AUTOMOC_TARGETS_FOLDER property

This has been requested, along with a patch, by Shaun Williams
 in http://public.kitware.com/Bug/view.php?id=13788 .
It adds a global property AUTOMOC_TARGETS_FOLDER, which can
be used to group the automoc targets together in a folder e.g.
in Visual Studio.

Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 05c43c4..34b3c7e 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -255,8 +255,18 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
 automocTargetName.c_str(), true,
 workingDirectory.c_str(), depends,
 commandLines, false, automocComment.c_str());
-// inherit FOLDER property from target (#13688)
-copyTargetProperty(automocTarget, target, "FOLDER");
+// Set target folder
+const char* automocFolder = makefile->GetCMakeInstance()->GetProperty(
+ "AUTOMOC_TARGETS_FOLDER");
+if (automocFolder && *automocFolder)
+  {
+  automocTarget->SetProperty("FOLDER", automocFolder);
+  }
+else
+  {
+  // inherit FOLDER property from target (#13688)
+  copyTargetProperty(automocTarget, target, "FOLDER");
+  }
 
 target->AddUtility(automocTargetName.c_str());
 }
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b14db43..a90fa74 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -236,7 +236,9 @@ void cmTarget::DefineProperties(cmake *cm)
  "AUTOMOC_MOC_OPTIONS property.\n"
  "By setting the CMAKE_AUTOMOC_RELAXED_MODE variable to TRUE the rules "
  "for searching the files which will be processed by moc can be relaxed. "
- "See the documentation for this variable for more details.");
+ "See the documentation for this variable for more details.\n"
+ "The global property AUTOMOC_TARGETS_FOLDER can be used to group the "
+ "automoc targets together in an IDE, e.g. in MSVS.");
 
   cm->DefineProperty
 ("AUTOMOC_MOC_OPTIONS", cmProperty::TARGET,
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 29d9bb3..5f7d1e9 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -3603,6 +3603,14 @@ void cmake::DefineProperties(cmake *cm)
  "for the FOLDER target property.");
 
   cm->DefineProperty
+("AUTOMOC_TARGETS_FOLDER", cmProperty::GLOBAL,
+ "Name of FOLDER for *_automoc targets that are added automatically by "
+ "CMake for targets for which AUTOMOC is enabled.",
+ "If not set, CMake uses the FOLDER property of the parent target as a "
+ "default value for this property. See also the documentation for the "
+ "FOLDER target property and the AUTOMOC target property.");
+
+  cm->DefineProperty
 ("PREDEFINED_TARGETS_FOLDER", cmProperty::GLOBAL,
  "Name of FOLDER for targets that are added automatically by CMake.",
  "If not set, CMake uses \"CMakePredefinedTargets\" as a default "

---

Summary of changes:
 Source/cmQtAutomoc.cxx |   14 --
 Source/cmTarget.cxx|4 +++-
 Source/cmake.cxx   |8 
 3 files changed, 23 insertions(+), 3 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2820-g754b1a4

[Alexander Neundorf]

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  754b1a473704e04055cb9601d61cc7eaf21cdb78 (commit)
   via  9b697145ef638aa4204a8887c821fc9c7b7d9698 (commit)
  from  34d0f30ae9d88db81bfa47173c2c1917501884e4 (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=754b1a473704e04055cb9601d61cc7eaf21cdb78
commit 754b1a473704e04055cb9601d61cc7eaf21cdb78
Merge: 34d0f30 9b69714
Author: Alexander Neundorf 
AuthorDate: Fri Jun 28 15:08:08 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jun 28 15:08:08 2013 -0400

Merge topic 'DontStripImportLibs' into next

9b69714 fix #14123: don't strip import libraries when installing


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b697145ef638aa4204a8887c821fc9c7b7d9698
commit 9b697145ef638aa4204a8887c821fc9c7b7d9698
Author: Alex Neundorf 
AuthorDate: Fri Jun 28 21:06:57 2013 +0200
Commit: Alex Neundorf 
CommitDate: Fri Jun 28 21:06:57 2013 +0200

fix #14123: don't strip import libraries when installing

The patch was attached to
http://public.kitware.com/Bug/view.php?id=14123

Alex

diff --git a/Source/cmInstallTargetGenerator.cxx 
b/Source/cmInstallTargetGenerator.cxx
index ed01210..c9624c8 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -717,9 +717,9 @@ cmInstallTargetGenerator::AddStripRule(std::ostream& os,
const std::string& toDestDirPath)
 {
 
-  // don't strip static libraries, because it removes the only symbol table
-  // they have so you can't link to them anymore
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  // don't strip static and import libraries, because it removes the only
+  // symbol table they have so you can't link to them anymore
+  if(this->Target->GetType()==cmTarget::STATIC_LIBRARY || this->ImportLibrary)
 {
 return;
 }

---

Summary of changes:
 Source/cmInstallTargetGenerator.cxx |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2596-gfcd4080

[Alexander Neundorf]

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  fcd4080c2c54db375b738a4b1080d882db12b58d (commit)
   via  22f7934a6e9c3dd350ec3ed6db91821783cd98a2 (commit)
  from  e35667fb1d220baf8d6027281ab8749ac800 (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=fcd4080c2c54db375b738a4b1080d882db12b58d
commit fcd4080c2c54db375b738a4b1080d882db12b58d
Merge: e35667f 22f7934
Author: Alexander Neundorf 
AuthorDate: Tue Jun 11 17:45:14 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Jun 11 17:45:14 2013 -0400

Merge topic 'FixEclipseCorruptProjects' into next

22f7934 Eclipse: fix #14204 and #14205: no file links to directories


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22f7934a6e9c3dd350ec3ed6db91821783cd98a2
commit 22f7934a6e9c3dd350ec3ed6db91821783cd98a2
Author: Alex Neundorf 
AuthorDate: Tue Jun 11 22:50:38 2013 +0200
Commit: Alex Neundorf 
CommitDate: Tue Jun 11 22:50:38 2013 +0200

Eclipse: fix #14204 and #14205: no file links to directories

If a source file name is empty, or if it is a directory,
don't create a linked resource to it.

Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 6b02e15..d80e775 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -554,12 +554,15 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
 fileIt != sFiles.end();
 ++fileIt)
   {
-  std::string linkName4 = linkName3;
-  linkName4 += "/";
-  linkName4 +=
-  cmSystemTools::GetFilenameName((*fileIt)->GetFullPath());
-  this->AppendLinkedResource(fout, linkName4,
- (*fileIt)->GetFullPath(), LinkToFile);
+  std::string fullPath = (*fileIt)->GetFullPath();
+  if (!cmSystemTools::FileIsDirectory(fullPath.c_str()))
+{
+std::string linkName4 = linkName3;
+linkName4 += "/";
+linkName4 += cmSystemTools::GetFilenameName(fullPath);
+this->AppendLinkedResource(fout, linkName4,
+   fullPath, LinkToFile);
+}
   }
 }
   }

---

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |   15 +--
 1 files changed, 9 insertions(+), 6 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2594-ge35667f

[Alexander Neundorf]

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  e35667fb1d220baf8d6027281ab8749ac800 (commit)
   via  e7722fdd15becd5ba311c6153442ca9592c50da9 (commit)
  from  bb2996e47a04abb7bdb434cd499f4a1232b79481 (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=e35667fb1d220baf8d6027281ab8749ac800
commit e35667fb1d220baf8d6027281ab8749ac800
Merge: bb2996e e7722fd
Author: Alexander Neundorf 
AuthorDate: Tue Jun 11 16:00:18 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Jun 11 16:00:18 2013 -0400

Merge topic 'FixAsmSupport' into next

e7722fd asm support: adapt to changes in CMakeDetectCompiler in 2.8.10


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7722fdd15becd5ba311c6153442ca9592c50da9
commit e7722fdd15becd5ba311c6153442ca9592c50da9
Author: Alex Neundorf 
AuthorDate: Tue Jun 11 21:06:35 2013 +0200
Commit: Alex Neundorf 
CommitDate: Tue Jun 11 21:06:35 2013 +0200

asm support: adapt to changes in CMakeDetectCompiler in 2.8.10

This fixes #14210. In 2.8.10 CMakeDetermineCompiler.cmake was
modified (or added), and now the _INIT variable must not
be set to a list anymore, before it worked.

Alex

diff --git a/Modules/CMakeDetermineASM-ATTCompiler.cmake 
b/Modules/CMakeDetermineASM-ATTCompiler.cmake
index cec09e9..03c5668 100644
--- a/Modules/CMakeDetermineASM-ATTCompiler.cmake
+++ b/Modules/CMakeDetermineASM-ATTCompiler.cmake
@@ -15,6 +15,6 @@
 # determine the compiler to use for ASM using AT&T syntax, e.g. GNU as
 
 set(ASM_DIALECT "-ATT")
-set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ${_CMAKE_TOOLCHAIN_PREFIX}gas 
${_CMAKE_TOOLCHAIN_PREFIX}as)
+set(CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}gas 
${_CMAKE_TOOLCHAIN_PREFIX}as)
 include(CMakeDetermineASMCompiler)
 set(ASM_DIALECT)
diff --git a/Modules/CMakeDetermineASMCompiler.cmake 
b/Modules/CMakeDetermineASMCompiler.cmake
index 3643b17..0fecb5d 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -39,8 +39,8 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER)
   endif()
 endif()
   else() # some specific assembler "dialect"
-if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT)
-  message(FATAL_ERROR "CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT must be 
preset !")
+if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT  AND NOT 
CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST)
+  message(FATAL_ERROR "CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT or 
CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST must be preset !")
 endif()
   endif()
 
diff --git a/Modules/CMakeDetermineASM_NASMCompiler.cmake 
b/Modules/CMakeDetermineASM_NASMCompiler.cmake
index 50f71dd..5d783b1 100644
--- a/Modules/CMakeDetermineASM_NASMCompiler.cmake
+++ b/Modules/CMakeDetermineASM_NASMCompiler.cmake
@@ -14,7 +14,7 @@
 
 # Find the nasm assembler. yasm (http://www.tortall.net/projects/yasm/) is 
nasm compatible
 
-set(CMAKE_ASM_NASM_COMPILER_INIT nasm yasm)
+set(CMAKE_ASM_NASM_COMPILER_LIST nasm yasm)
 
 if(NOT CMAKE_ASM_NASM_COMPILER)
   find_program(CMAKE_ASM_NASM_COMPILER nasm

---

Summary of changes:
 Modules/CMakeDetermineASM-ATTCompiler.cmake  |2 +-
 Modules/CMakeDetermineASMCompiler.cmake  |4 ++--
 Modules/CMakeDetermineASM_NASMCompiler.cmake |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2838-ge33ab85

[Alexander Neundorf]

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  e33ab852ac02636376ed2abce02a4599db7792be (commit)
   via  c46b46b6285e4c893341659f0be8ac306060bf9b (commit)
   via  77df4ef5ac3b8fcae52d8f964756ec4fdf35e5c5 (commit)
   via  82f5936a8bc2a16c6d2c5e003a38cbc150cf349a (commit)
  from  264823f3fc02fbf7db1fd93546ad40718e1951e4 (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=e33ab852ac02636376ed2abce02a4599db7792be
commit e33ab852ac02636376ed2abce02a4599db7792be
Merge: 264823f c46b46b
Author: Alexander Neundorf 
AuthorDate: Sun Apr 28 09:55:57 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Apr 28 09:55:57 2013 -0400

Merge topic 'EclipseUseGmakeErrorParser_13699' into next

c46b46b Use GmakeErrorParser instead of deprecated MakeErrorParser (fixes 
bug 0013699)
77df4ef CMake Nightly Date Stamp
82f5936 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c46b46b6285e4c893341659f0be8ac306060bf9b
commit c46b46b6285e4c893341659f0be8ac306060bf9b
Author: Victor Zverovich 
AuthorDate: Fri Mar 22 15:50:38 2013 -0700
Commit: Alex Neundorf 
CommitDate: Sun Apr 28 15:50:31 2013 +0200

Use GmakeErrorParser instead of deprecated MakeErrorParser (fixes bug 
0013699)

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 97ab086..22a1020 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -39,6 +39,7 @@ cmExtraEclipseCDT4Generator
 
   this->SupportsVirtualFolders = true;
   this->GenerateLinkedResources = true;
+  this->SupportsGmakeErrorParser = true;
 }
 
 //
@@ -77,6 +78,10 @@ void cmExtraEclipseCDT4Generator::Generate()
 {
 this->SupportsVirtualFolders = false;
 }
+  if (version < 3007) // 3.7 is Indigo
+{
+this->SupportsGmakeErrorParser = false;
+}
   }
 }
 
@@ -403,8 +408,17 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 {
 fout << "org.eclipse.cdt.core.ICCErrorParser;";
 }
+
+  if (this->SupportsGmakeErrorParser)
+{
+fout << "org.eclipse.cdt.core.GmakeErrorParser;";
+}
+  else
+{
+fout << "org.eclipse.cdt.core.MakeErrorParser;";
+}
+
   fout <<
-"org.eclipse.cdt.core.MakeErrorParser;"
 "org.eclipse.cdt.core.GCCErrorParser;"
 "org.eclipse.cdt.core.GASErrorParser;"
 "org.eclipse.cdt.core.GLDErrorParser;"
diff --git a/Source/cmExtraEclipseCDT4Generator.h 
b/Source/cmExtraEclipseCDT4Generator.h
index 31ad68d..b31cce7 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -111,6 +111,7 @@ private:
   bool GenerateSourceProject;
   bool GenerateLinkedResources;
   bool SupportsVirtualFolders;
+  bool SupportsGmakeErrorParser;
 
 };
 

---

Summary of changes:
 Source/CMakeVersion.cmake  |2 +-
 Source/cmExtraEclipseCDT4Generator.cxx |   16 +++-
 Source/cmExtraEclipseCDT4Generator.h   |1 +
 3 files changed, 17 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2813-g8ca1498

[Alexander Neundorf]

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  8ca149896566119be4d324fd56cbe66d755b8d9e (commit)
   via  eb0d1aee41a81a18823d2c4c436663c595f4e3d8 (commit)
  from  f988603bc6f15b9c9553653135b691343f5647c1 (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=8ca149896566119be4d324fd56cbe66d755b8d9e
commit 8ca149896566119be4d324fd56cbe66d755b8d9e
Merge: f988603 eb0d1ae
Author: Alexander Neundorf 
AuthorDate: Mon Apr 22 15:51:53 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Apr 22 15:51:53 2013 -0400

Merge topic 'refs/heads/QtDialogSearchText2' into next

eb0d1ae QtDialog: fix build with Qt 4.4


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb0d1aee41a81a18823d2c4c436663c595f4e3d8
commit eb0d1aee41a81a18823d2c4c436663c595f4e3d8
Author: Alex Neundorf 
AuthorDate: Mon Apr 22 21:51:33 2013 +0200
Commit: Alex Neundorf 
CommitDate: Mon Apr 22 21:51:33 2013 +0200

QtDialog: fix build with Qt 4.4

Don't use QStringList::remoevDuplicates(), new in 4.5

Alex

diff --git a/Source/QtDialog/CMakeSetupDialog.cxx 
b/Source/QtDialog/CMakeSetupDialog.cxx
index 31e89cb..4d62f72 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -1208,8 +1208,10 @@ void CMakeSetupDialog::doOutputFindDialog()
  tr("Find:"), strings, 0, true, &ok);
   if (ok && !search.isEmpty())
 {
-this->FindHistory.push_front(search);
-this->FindHistory.removeDuplicates();
+if (!this->FindHistory.contains(search))
+  {
+  this->FindHistory.push_front(search);
+  }
 doOutputFindNext();
 }
 }

---

Summary of changes:
 Source/QtDialog/CMakeSetupDialog.cxx |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2807-ged86e1a

[Alexander Neundorf]

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  ed86e1ad349626d9e71af0ced368df6361bab2cc (commit)
   via  2e24abce3a088c7c445abfda62e46f88941de782 (commit)
   via  cf6275c947414e17c2cc541cc47704efe3ae623b (commit)
   via  cb1ab6f61c38a6a12a4b7ccba44927eb07256312 (commit)
   via  230f4505bfbeec9a1dc6181aa9d349c4ee38a9e7 (commit)
   via  c479bba4ef10c702109f8b1e091bb27186aa6df3 (commit)
   via  6a3ee5dd4e177c007459218612c45f9e6c9ec83b (commit)
  from  f6b24625389d80acb6c55b294b9d56bc652c5892 (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=ed86e1ad349626d9e71af0ced368df6361bab2cc
commit ed86e1ad349626d9e71af0ced368df6361bab2cc
Merge: f6b2462 2e24abc
Author: Alexander Neundorf 
AuthorDate: Thu Apr 18 14:00:13 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Apr 18 14:00:13 2013 -0400

Merge topic 'refs/heads/QtDialogSearchText2' into next

2e24abc QtDialog: use shortcut F only for "Find in Output"
cf6275c Function for Going to next error message in Output window
cb1ab6f Changed shortcut of the search field from Ctrl-F to Alt-E
230f450 Search functions added to context menu of the Output widget
c479bba Search functions for Output window
6a3ee5d CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e24abce3a088c7c445abfda62e46f88941de782
commit 2e24abce3a088c7c445abfda62e46f88941de782
Author: Alex Neundorf 
AuthorDate: Thu Apr 18 19:59:11 2013 +0200
Commit: Alex Neundorf 
CommitDate: Thu Apr 18 19:59:11 2013 +0200

QtDialog: use shortcut F only for "Find in Output"

Before it was used also for "Find next" and "Find previous"

Alex

diff --git a/Source/QtDialog/CMakeSetupDialog.cxx 
b/Source/QtDialog/CMakeSetupDialog.cxx
index 28192b4..31e89cb 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -127,10 +127,10 @@ CMakeSetupDialog::CMakeSetupDialog()
   ToolsMenu->addAction(tr("&Find in Output..."),
this, SLOT(doOutputFindDialog()),
QKeySequence::Find);
-  ToolsMenu->addAction(tr("&Find Next"),
+  ToolsMenu->addAction(tr("Find Next"),
this, SLOT(doOutputFindNext()),
QKeySequence::FindNext);
-  ToolsMenu->addAction(tr("&Find Previous"),
+  ToolsMenu->addAction(tr("Find Previous"),
this, SLOT(doOutputFindPrev()),
QKeySequence::FindPrevious);
   ToolsMenu->addAction(tr("Goto Next Error"),

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf6275c947414e17c2cc541cc47704efe3ae623b
commit cf6275c947414e17c2cc541cc47704efe3ae623b
Author: nagger n 
AuthorDate: Thu Apr 18 01:06:00 2013 +0200
Commit: Alex Neundorf 
CommitDate: Thu Apr 18 19:58:46 2013 +0200

Function for Going to next error message in Output window

Using new shortcuts: F8 (Visual Studio) and Ctrl-. (Eclipse)

Signed-off-by: Alex Neundorf 

diff --git a/Source/QtDialog/CMakeSetupDialog.cxx 
b/Source/QtDialog/CMakeSetupDialog.cxx
index 90f186f..28192b4 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -133,6 +133,11 @@ CMakeSetupDialog::CMakeSetupDialog()
   ToolsMenu->addAction(tr("&Find Previous"),
this, SLOT(doOutputFindPrev()),
QKeySequence::FindPrevious);
+  ToolsMenu->addAction(tr("Goto Next Error"),
+   this, SLOT(doOutputErrorNext()),
+   QKeySequence(Qt::Key_F8));  // in Visual Studio
+  new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Period),
+   this, SLOT(doOutputErrorNext()));  // in Eclipse
 
   QMenu* OptionsMenu = this->menuBar()->addMenu(tr("&Options"));
   this->SuppressDevWarningsAction =
@@ -649,7 +654,13 @@ void CMakeSetupDialog::showProgress(const QString& 
/*msg*/, float percent)
 void CMakeSetupDialog::error(const QString& msg)
 {
   this->Output->setCurrentCharFormat(this->ErrorFormat);
-  this->Output->append(msg);
+  //QTextEdit will terminate the msg with a ParagraphSeparator, but it also 
replaces
+  //all newlines with ParagraphSeparators. By replacing the newlines by 
ourself, one
+  //error msg will be one paragraph.
+  QString paragraph(msg);
+  paragraph.replace(QLatin1Char('\n'), QChar::LineS

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2662-g66fcb33

[Alexander Neundorf]

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  66fcb33f30be933548c3659caccfc4b23a13813c (commit)
   via  bce5ce4f6853ffd4c62775d64abf9539ad33edf5 (commit)
   via  f6cd825cdbb5da03bb2a47e8b7dea5d4aafdabe0 (commit)
   via  2fcb06039daa4492c05fa346465028ea0b3d4eff (commit)
  from  758e42854526b2d8ef4f1fafcc8617bae6ab59f2 (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=66fcb33f30be933548c3659caccfc4b23a13813c
commit 66fcb33f30be933548c3659caccfc4b23a13813c
Merge: 758e428 bce5ce4
Author: Alexander Neundorf 
AuthorDate: Tue Mar 26 13:57:42 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Mar 26 13:57:42 2013 -0400

Merge topic 'ExactCaseReadmeTxt' into next

bce5ce4 readme.txt: make lines a bit shorter for easier readability
f6cd825 readme.txt: switch from "XXX" to "Xxx"
2fcb060 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bce5ce4f6853ffd4c62775d64abf9539ad33edf5
commit bce5ce4f6853ffd4c62775d64abf9539ad33edf5
Author: Alex Neundorf 
AuthorDate: Tue Mar 26 18:57:53 2013 +0100
Commit: Alex Neundorf 
CommitDate: Tue Mar 26 18:57:53 2013 +0100

readme.txt: make lines a bit shorter for easier readability

This patch doesn't make them 79 characters long, but at least gets rid of 
really long lines.

Alex

diff --git a/Modules/readme.txt b/Modules/readme.txt
index 503f91a..2f11994 100644
--- a/Modules/readme.txt
+++ b/Modules/readme.txt
@@ -7,21 +7,26 @@ We would like all FindXxx.cmake files to produce consistent 
variable names.
 
 Please use the following consistent variable names for general use.
 
-Xxx_INCLUDE_DIRSThe final set of include directories listed in one 
variable for use by client code.  This should not be a cache entry.
-Xxx_LIBRARIES   The libraries to link against to use Xxx. These should 
include full paths.  This should not be a cache entry.
-Xxx_DEFINITIONS Definitions to use when compiling code that uses Xxx. 
This really shouldn't include options such as (-DHAS_JPEG)that a client 
source-code file uses to decide whether to #include 
+Xxx_INCLUDE_DIRSThe final set of include directories listed in one 
variable for use by client code.
+This should not be a cache entry.
+Xxx_LIBRARIES   The libraries to link against to use Xxx. These should 
include full paths.
+This should not be a cache entry.
+Xxx_DEFINITIONS Definitions to use when compiling code that uses Xxx. 
This really shouldn't include options such
+as (-DHAS_JPEG)that a client source-code file uses to 
decide whether to #include 
 Xxx_EXECUTABLE  Where to find the Xxx tool.
 Xxx_Yyy_EXECUTABLE  Where to find the Yyy tool that comes with Xxx.
-Xxx_LIBRARY_DIRSOptionally, the final set of library directories 
listed in one variable for use by client code.  This should not be a cache 
entry.
+Xxx_LIBRARY_DIRSOptionally, the final set of library directories 
listed in one variable for use by client code.
+This should not be a cache entry.
 Xxx_ROOT_DIRWhere to find the base directory of Xxx.
 Xxx_VERSION_Yy  Expect Version Yy if true. Make sure at most one of 
these is ever true.
-Xxx_WRAP_Yy If False, do not try to use the relevent CMake 
wrapping command.
+Xxx_WRAP_Yy If False, do not try to use the relevant CMake 
wrapping command.
 Xxx_Yy_FOUNDIf False, optional Yy part of Xxx sytem is not 
available.
 Xxx_FOUND   Set to false, or undefined, if we haven't found, or 
don't want to use Xxx.
 Xxx_NOT_FOUND_MESSAGE   Should be set by config-files in the case that it has 
set Xxx_FOUND to FALSE.
 The contained message will be printed by the 
find_package() command and by
 find_package_handle_standard_args() to inform the user 
about the problem.
-Xxx_RUNTIME_LIBRARY_DIRS Optionally, the runtime library search path for use 
when running an executable linked to shared libraries.
+Xxx_RUNTIME_LIBRARY_DIRS Optionally, the runtime library search path for use 
when running an executable linked to
+ shared libraries.
  The list should be used by user code to create the 
PATH on windows or LD_LIBRARY_PATH on unix.
  This should not be a cache entry.
 Xxx_VERSION_STRING  A human-readable string containing the version of 

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2523-gc47d239

[Alexander Neundorf]

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  c47d23927e5b22d19a555795c46d51d4e3ad0851 (commit)
   via  27e6f6ef398d3ccfc496b1ecedf2db89991be10d (commit)
   via  b3015862e547319bdc91fab5f28a366640ab50ea (commit)
   via  12b25df882968b4f5807f2734c98847337d518a9 (commit)
   via  7baa55ac0b79854238b3fb70c95501d8dcb8cb69 (commit)
  from  0dba8ff010609a2b9943f202529fa0e582dc7e65 (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=c47d23927e5b22d19a555795c46d51d4e3ad0851
commit c47d23927e5b22d19a555795c46d51d4e3ad0851
Merge: 0dba8ff 27e6f6e
Author: Alexander Neundorf 
AuthorDate: Thu Mar 14 16:48:32 2013 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Mar 14 16:48:32 2013 -0400

Merge topic 'TI_DSP_to_TI_2' into next

27e6f6e TI compiler: add automatic detection of prefix and suffixes
b301586 rename TI_DSP toolchain to TI, since it works also for the ARM 
compiler
12b25df Determine C/CXX/Fortran compiler: fix indentation
7baa55a Determine C/CXX/Fortran compiler: minor restructuring


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27e6f6ef398d3ccfc496b1ecedf2db89991be10d
commit 27e6f6ef398d3ccfc496b1ecedf2db89991be10d
Author: Alex Neundorf 
AuthorDate: Thu Mar 14 19:42:03 2013 +0100
Commit: Alex Neundorf 
CommitDate: Thu Mar 14 21:48:09 2013 +0100

TI compiler: add automatic detection of prefix and suffixes

The TI cross compilers are named e.g. cl6x or armcl, the accompanying
strip and ar have the same prefixes/suffixes.

Alex

diff --git a/Modules/CMakeDetermineCCompiler.cmake 
b/Modules/CMakeDetermineCCompiler.cmake
index 736fc89..d2220e0 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -158,6 +158,13 @@ if (CMAKE_CROSSCOMPILING  AND NOT _CMAKE_TOOLCHAIN_PREFIX)
 if ("${_CMAKE_TOOLCHAIN_PREFIX}" MATCHES "(.+-)?llvm-$")
   set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
 endif ()
+  elseif("${CMAKE_C_COMPILER_ID}" MATCHES "TI")
+# TI compilers are named e.g. cl6x, cl470 or armcl.exe
+get_filename_component(COMPILER_BASENAME "${CMAKE_C_COMPILER}" NAME)
+if (COMPILER_BASENAME MATCHES "^(.+)?cl([^.]+)?(\\.exe)?$")
+  set(_CMAKE_TOOLCHAIN_PREFIX "${CMAKE_MATCH_1}")
+  set(_CMAKE_TOOLCHAIN_SUFFIX "${CMAKE_MATCH_2}")
+endif ()
   endif()
 
 endif ()
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake 
b/Modules/CMakeDetermineCXXCompiler.cmake
index c128cfa..6f7e8f6 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -156,6 +156,14 @@ if (CMAKE_CROSSCOMPILING  AND NOT  _CMAKE_TOOLCHAIN_PREFIX)
 if ("${_CMAKE_TOOLCHAIN_PREFIX}" MATCHES "(.+-)?llvm-$")
   set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
 endif ()
+  elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "TI")
+# TI compilers are named e.g. cl6x, cl470 or armcl.exe
+get_filename_component(COMPILER_BASENAME "${CMAKE_CXX_COMPILER}" NAME)
+if (COMPILER_BASENAME MATCHES "^(.+)?cl([^.]+)?(\\.exe)?$")
+  set(_CMAKE_TOOLCHAIN_PREFIX "${CMAKE_MATCH_1}")
+  set(_CMAKE_TOOLCHAIN_SUFFIX "${CMAKE_MATCH_2}")
+endif ()
+
   endif()
 
 endif ()
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 1b30801..e70c013 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -41,19 +41,14 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC"
 # in all other cases search for ar, ranlib, etc.
 else()
 
-  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "TI"  OR  "${CMAKE_C_COMPILER_ID}" 
STREQUAL "TI")
-find_program(CMAKE_AR NAMES ar6x HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
-find_program(CMAKE_STRIP NAMES strip6x HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
-  endif()
-
-  find_program(CMAKE_AR NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ar HINTS 
${_CMAKE_TOOLCHAIN_LOCATION})
+  find_program(CMAKE_AR NAMES 
${_CMAKE_TOOLCHAIN_PREFIX}ar${_CMAKE_TOOLCHAIN_SUFFIX} HINTS 
${_CMAKE_TOOLCHAIN_LOCATION})
 
   find_program(CMAKE_RANLIB NAMES ${_CMAKE_TOOLCHAIN_PREFIX}ranlib HINTS 
${_CMAKE_TOOLCHAIN_LOCATION})
   if(NOT CMAKE_RANLIB)
 set(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
   endif()
 
-  find_program(CMAKE_STRIP NAMES ${_CMAKE_TOOLCHAIN_PREFIX}strip HINTS 
${_CMAKE_TOOLCHAIN_LOCATION})
+  find_program(CMAKE_STRIP NAMES 
${_CMAKE_TO

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2267-g53b2797

[Alexander Neundorf]

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  53b2797e114a3773a18051149b4a83da2d035902 (commit)
   via  fedcd8d61a843a51f3c3354890653e9e97cd069e (commit)
   via  ebbf9b67c57df290d182a042fe80163908918240 (commit)
  from  e11a7cea7486cf214bece3a913b60402ffd52f75 (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=53b2797e114a3773a18051149b4a83da2d035902
commit 53b2797e114a3773a18051149b4a83da2d035902
Merge: e11a7ce fedcd8d
Author: Alexander Neundorf 
AuthorDate: Thu Feb 21 15:50:07 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Feb 21 15:50:07 2013 -0500

Merge topic 'FPHSA_FOUND_VAR_OPTION' into next

fedcd8d FPHSA: improve documentation
ebbf9b6 FPHSA: add argument FOUND_VAR instead of USE_ORIGINAL_CASE


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fedcd8d61a843a51f3c3354890653e9e97cd069e
commit fedcd8d61a843a51f3c3354890653e9e97cd069e
Author: Alex Neundorf 
AuthorDate: Thu Feb 21 21:49:29 2013 +0100
Commit: Alex Neundorf 
CommitDate: Thu Feb 21 21:49:29 2013 +0100

FPHSA: improve documentation

Alex

diff --git a/Modules/FindPackageHandleStandardArgs.cmake 
b/Modules/FindPackageHandleStandardArgs.cmake
index ce89c05..5f92a86 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -30,6 +30,7 @@
 # Other names for the result-variable are not allowed.
 # So for a Find-module named FindFooBar.cmake, the two possible names are
 # FooBar_FOUND and FOOBAR_FOUND. It is recommended to use the original case 
version.
+# If the FOUND_VAR option is not used, the default is _FOUND.
 #
 # As in the simple mode, if  through  are all valid,
 # _FOUND will be set to TRUE.
@@ -54,7 +55,7 @@
 #
 # Example for mode 1:
 #
-#FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2  DEFAULT_MSG  LIBXML2_LIBRARY 
LIBXML2_INCLUDE_DIR)
+#find_package_handle_standard_args(LibXml2  DEFAULT_MSG  LIBXML2_LIBRARY 
LIBXML2_INCLUDE_DIR)
 #
 # LibXml2 is considered to be found, if both LIBXML2_LIBRARY and
 # LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE.
@@ -65,20 +66,23 @@
 #
 # Example for mode 2:
 #
-#FIND_PACKAGE_HANDLE_STANDARD_ARGS(BISON  REQUIRED_VARS BISON_EXECUTABLE
-# VERSION_VAR BISON_VERSION)
-# In this case, BISON is considered to be found if the variable(s) listed
-# after REQUIRED_VAR are all valid, i.e. BISON_EXECUTABLE in this case.
-# Also the version of BISON will be checked by using the version contained
-# in BISON_VERSION.
+#find_package_handle_standard_args(LibXslt FOUND_VAR LibXslt_FOUND
+# REQUIRED_VARS LibXslt_LIBRARIES 
LibXslt_INCLUDE_DIRS
+# VERSION_VAR 
LibXslt_VERSION_STRING)
+# In this case, LibXslt is considered to be found if the variable(s) listed
+# after REQUIRED_VAR are all valid, i.e. LibXslt_LIBRARIES and 
LibXslt_INCLUDE_DIRS
+# in this case. The result will then be stored in LibXslt_FOUND .
+# Also the version of LibXslt will be checked by using the version contained
+# in LibXslt_VERSION_STRING.
 # Since no FAIL_MESSAGE is given, the default messages will be printed.
 #
 # Another example for mode 2:
 #
 #find_package(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4)
-#FIND_PACKAGE_HANDLE_STANDARD_ARGS(Automoc4  CONFIG_MODE)
+#find_package_handle_standard_args(Automoc4  CONFIG_MODE)
 # In this case, FindAutmoc4.cmake wraps a call to find_package(Automoc4 
NO_MODULE)
 # and adds an additional search directory for automoc4.
+# Here the result will be stored in AUTOMOC4_FOUND.
 # The following FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper
 # success/error message.
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebbf9b67c57df290d182a042fe80163908918240
commit ebbf9b67c57df290d182a042fe80163908918240
Author: Alex Neundorf 
AuthorDate: Thu Feb 21 21:40:56 2013 +0100
Commit: Alex Neundorf 
CommitDate: Thu Feb 21 21:40:56 2013 +0100

FPHSA: add argument FOUND_VAR instead of USE_ORIGINAL_CASE

In the new mode FPHSA now accepts a FOUND_VAR option, which can be
set either to ExactCase_FOUND or UPPERCASE_FOUND, no other values
are accepted.
Also add tests for that, including failure.

Alex

diff --git a/Modules/FindPackageHandleStandardArgs.cmake 
b/Modules/FindPackageHandleStandardArgs.cmake
index 3729c15..ce89c05 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -18,20 +18,21 @@
 # for th

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2252-gf6180d8

[Alexander Neundorf]

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  f6180d8aee61e7f170caadcce23eda6623665eba (commit)
   via  f497dbce93096eb6f0edec982e5f16f9c56520b7 (commit)
  from  26d2380d3a1090170b4607217db7558576983e5d (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=f6180d8aee61e7f170caadcce23eda6623665eba
commit f6180d8aee61e7f170caadcce23eda6623665eba
Merge: 26d2380 f497dbc
Author: Alexander Neundorf 
AuthorDate: Wed Feb 20 14:12:13 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Feb 20 14:12:13 2013 -0500

Merge topic 'cmLocalGenerator_RemoveVirtuals' into next

f497dbc cmLocalGenerator: remove "virtual" where not used


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f497dbce93096eb6f0edec982e5f16f9c56520b7
commit f497dbce93096eb6f0edec982e5f16f9c56520b7
Author: Alex Neundorf 
AuthorDate: Wed Feb 20 19:48:39 2013 +0100
Commit: Alex Neundorf 
CommitDate: Wed Feb 20 19:48:39 2013 +0100

cmLocalGenerator: remove "virtual" where not used

This patch makes several functions of cmLocalGenerator which are marked
as virtual non-virtual, since they are not reimplemented anywhere.

Alex

diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 84cf6ca..a1c34f0 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -49,29 +49,29 @@ public:
   /**
* Calls TraceVSDependencies() on all targets of this generator.
*/
-  virtual void TraceDependencies();
+  void TraceDependencies();
 
   virtual void AddHelperCommands() {}
 
   /**
* Perform any final calculations prior to generation
*/
-  virtual void ConfigureFinalPass();
+  void ConfigureFinalPass();
 
   /**
* Generate the install rules files in this directory.
*/
-  virtual void GenerateInstallRules();
+  void GenerateInstallRules();
 
   /**
* Generate the test files for tests.
*/
-  virtual void GenerateTestFiles();
+  void GenerateTestFiles();
 
   /**
* Generate a manifest of target files that will be built.
*/
-  virtual void GenerateTargetManifest();
+  void GenerateTargetManifest();
 
   ///! Get the makefile for this generator
   cmMakefile *GetMakefile() {

---

Summary of changes:
 Source/cmLocalGenerator.h |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2250-g26d2380

[Alexander Neundorf]

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  26d2380d3a1090170b4607217db7558576983e5d (commit)
   via  11d0c662069e3fd74cb908f714274eeb05f1a14d (commit)
  from  c46387bcc87cf55718e30f2013b5164cb8858fe2 (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=26d2380d3a1090170b4607217db7558576983e5d
commit 26d2380d3a1090170b4607217db7558576983e5d
Merge: c46387b 11d0c66
Author: Alexander Neundorf 
AuthorDate: Wed Feb 20 14:09:59 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Feb 20 14:09:59 2013 -0500

Merge topic 'ExportFileGenerator_GenerateNicerErrorCheckingCode' into next

11d0c66 export files: rewrite the code for checking required targets


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11d0c662069e3fd74cb908f714274eeb05f1a14d
commit 11d0c662069e3fd74cb908f714274eeb05f1a14d
Author: Alex Neundorf 
AuthorDate: Mon Feb 11 22:18:48 2013 +0100
Commit: Alex Neundorf 
CommitDate: Wed Feb 20 20:09:45 2013 +0100

export files: rewrite the code for checking required targets

Instead of generating a whole bunch of repeated if-statements
now a foreach()-loop is generated in the targets-file.
Also now a comment is inserted in the generated file if no
targets from other export sets are used, so if somebody looks
at the file he can see whether the information about missing
imported targets has been generated or not.

Alex

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index ef4ea38..e55f168 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -754,29 +754,46 @@ void 
cmExportFileGenerator::GenerateMissingTargetsCheckCode(std::ostream& os,
 {
   if (missingTargets.empty())
 {
+os << "# This file does not depend on other imported targets which have\n"
+  "# been exported from the same project but in a separate "
+"export set.\n\n";
 return;
 }
   os << "# Make sure the targets which have been exported in some other \n"
-"# export set exist.\n";
+"# export set exist.\n"
+"unset(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)\n"
+"foreach(_target ";
   std::set emitted;
   for(unsigned int i=0; ihttp://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2248-gc46387b

[Alexander Neundorf]

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  c46387bcc87cf55718e30f2013b5164cb8858fe2 (commit)
   via  aaad58c5af56285ea41006a5f60c79b4c255a118 (commit)
  from  aaa9ccf325b386d8b500c0b95a2cac1409375d51 (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=c46387bcc87cf55718e30f2013b5164cb8858fe2
commit c46387bcc87cf55718e30f2013b5164cb8858fe2
Merge: aaa9ccf aaad58c
Author: Alexander Neundorf 
AuthorDate: Wed Feb 20 13:35:17 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Feb 20 13:35:17 2013 -0500

Merge topic 'FPHSA_USE_ORIGINAL_CASE' into next

aaad58c FPHSA: add USE_ORIGINAL_CASE option


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aaad58c5af56285ea41006a5f60c79b4c255a118
commit aaad58c5af56285ea41006a5f60c79b4c255a118
Author: Alex Neundorf 
AuthorDate: Wed Feb 20 19:35:11 2013 +0100
Commit: Alex Neundorf 
CommitDate: Wed Feb 20 19:35:11 2013 +0100

FPHSA: add USE_ORIGINAL_CASE option

If FPHSA() is called with USE_ORIGINAL_CASE, then the name
of the _FOUND variable will be SomePackage_FOUND instead of 
SOMEPACKAGE_FOUND.

Alex

diff --git a/Modules/FindPackageHandleStandardArgs.cmake 
b/Modules/FindPackageHandleStandardArgs.cmake
index e89e9a9..3729c15 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -2,7 +2,7 @@
 #
 # This function is intended to be used in FindXXX.cmake modules files.
 # It handles the REQUIRED, QUIET and version-related arguments to 
find_package().
-# It also sets the _FOUND variable.
+# It also sets the _FOUND variable.
 # The package is considered found if all variables ... listed contain
 # valid results, e.g. valid filepaths.
 #
@@ -18,14 +18,20 @@
 # for the failure case. This is not recommended.
 #
 # The second mode is more powerful and also supports version checking:
-#FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME [REQUIRED_VARS ...]
+#FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME [USE_ORIGINAL_CASE]
+#   [REQUIRED_VARS ...]
 #   [VERSION_VAR   ]
 #   [HANDLE_COMPONENTS]
 #   [CONFIG_MODE]
 #   [FAIL_MESSAGE "Custom failure 
message"] )
 #
-# As above, if  through  are all valid, _FOUND
-# will be set to TRUE.
+# If USE_ORIGINAL_CASE is used, then the name of the _FOUND-variable will be
+# the name of the package in original casing and _FOUND appended, e.g. 
SomePackage_FOUND.
+# If USE_ORIGINAL_CASE is not used, the package name will be uppercased, e.g
+# SOMEPACKAGE_FOUND. This was the only behaviour before CMake 2.8.11.
+#
+# As in the simple mode, if  through  are all valid,
+# _FOUND will be set to TRUE.
 # After REQUIRED_VARS the variables which are required for this package are 
listed.
 # Following VERSION_VAR the name of the variable can be specified which holds
 # the version of the package which has been found. If this is done, this 
version
@@ -35,7 +41,7 @@
 # which has been actually found, both if the version is ok or not.
 # If the package supports components, use the HANDLE_COMPONENTS option to 
enable
 # handling them. In this case, find_package_handle_standard_args() will report
-# which components have been found and which are missing, and the _FOUND
+# which components have been found and which are missing, and the 
_FOUND
 # variable will be set to FALSE if any of the required components (i.e. not the
 # ones listed after OPTIONAL_COMPONENTS) are missing.
 # Use the option CONFIG_MODE if your FindXXX.cmake module is a wrapper for
@@ -137,7 +143,7 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
 
 # set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in
 # new extended or in the "old" mode:
-  set(options CONFIG_MODE HANDLE_COMPONENTS)
+  set(options  CONFIG_MODE  HANDLE_COMPONENTS  USE_ORIGINAL_CASE)
   set(oneValueArgs FAIL_MESSAGE VERSION_VAR)
   set(multiValueArgs REQUIRED_VARS)
   set(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} 
${multiValueArgs} )
@@ -183,22 +189,28 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME 
_FIRST_ARG)
   string(TOUPPER ${_NAME} _NAME_UPPER)
   string(TOLOWER ${_NAME} _NAME_LOWER)
 
+  if(FPHSA_USE_ORIGINAL_CASE)
+set(_FOUND_VAR ${_NAME}_FOUND)
+  else()
+set(_FOUND_VAR ${_NAME_UPPER}_FOUND)
+  endif()
+
   # collect all variables which were not found, so they can be printed, so the
   # user knows better wha

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2060-g254eb37

[Alexander Neundorf]

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  254eb37ffa84d0e6439cb51870cc69b42788aae4 (commit)
   via  a396b6ece239d35436d9c3ca6de20b2fcea74749 (commit)
  from  3e627b63fa85cc3cc8fa524905f7f121a1b5bbd1 (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=254eb37ffa84d0e6439cb51870cc69b42788aae4
commit 254eb37ffa84d0e6439cb51870cc69b42788aae4
Merge: 3e627b6 a396b6e
Author: Alexander Neundorf 
AuthorDate: Sun Feb 10 13:53:02 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Feb 10 13:53:02 2013 -0500

Merge topic 'EclipseDetectClangIncludeDirs' into next

a396b6e Eclipse: also detect include dirs and macro for clang (#13823)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a396b6ece239d35436d9c3ca6de20b2fcea74749
commit a396b6ece239d35436d9c3ca6de20b2fcea74749
Author: Alex Neundorf 
AuthorDate: Sun Feb 10 18:58:27 2013 +0100
Commit: Alex Neundorf 
CommitDate: Sun Feb 10 18:58:27 2013 +0100

Eclipse: also detect include dirs and macro for clang (#13823)

Alex

diff --git 
a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake 
b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
index 1fa0157..365d381 100644
--- a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+++ b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
@@ -90,7 +90,7 @@ set(ENV{LANG}C)
 
 # Now check for C, works for gcc and Intel compiler at least
 if (NOT CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS)
-  if ("${CMAKE_C_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_C_COMPILER_ID}" 
MATCHES Intel)
+  if ("${CMAKE_C_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_C_COMPILER_ID}" 
MATCHES Intel  OR  "${CMAKE_C_COMPILER_ID}" MATCHES Clang)
 _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c _dirs _defines)
 set(CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL 
"C compiler system include directories")
 set(CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS "${_defines}" CACHE 
INTERNAL "C compiler system defined macros")
@@ -99,7 +99,7 @@ endif ()
 
 # And now the same for C++
 if (NOT CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS)
-  if ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_CXX_COMPILER_ID}" 
MATCHES Intel)
+  if ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_CXX_COMPILER_ID}" 
MATCHES Intel  OR  "${CMAKE_CXX_COMPILER_ID}" MATCHES Clang)
 _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs _defines)
 set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE 
INTERNAL "CXX compiler system include directories")
 set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS "${_defines}" CACHE 
INTERNAL "CXX compiler system defined macros")

---

Summary of changes:
 ...atorDetermineCompilerMacrosAndIncludeDirs.cmake |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2058-g3e627b6

[Alexander Neundorf]

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  3e627b63fa85cc3cc8fa524905f7f121a1b5bbd1 (commit)
   via  27e14a813cd399db778485961c0e66bd5cf488d6 (commit)
   via  10511aa0849936df3724556f1f42fc3e4cf43f9f (commit)
   via  12806779be9e8f18c6eb1bbf7fb69640af1fcf1d (commit)
   via  4db712f6efe14d65b05236c210f7c01cc754ed2c (commit)
  from  73afba6b813dee2dce1d5b15c6a8eea4d7da4f00 (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=3e627b63fa85cc3cc8fa524905f7f121a1b5bbd1
commit 3e627b63fa85cc3cc8fa524905f7f121a1b5bbd1
Merge: 73afba6 27e14a8
Author: Alexander Neundorf 
AuthorDate: Sun Feb 10 12:36:34 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Feb 10 12:36:34 2013 -0500

Merge topic 'UseMakefileHeaderExtensions' into next

27e14a8 automoc: use the header extensions from cmMakefile
10511aa automoc: use a std::vector<> instead a std::list
1280677 CMake Nightly Date Stamp
4db712f CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27e14a813cd399db778485961c0e66bd5cf488d6
commit 27e14a813cd399db778485961c0e66bd5cf488d6
Author: Alex Neundorf 
AuthorDate: Sun Feb 10 17:58:29 2013 +0100
Commit: Alex Neundorf 
CommitDate: Sun Feb 10 18:10:20 2013 +0100

automoc: use the header extensions from cmMakefile

Instead of having an own set of C header extensions, use
cmMakefile::GetHeaderExtensions() (#13904)

Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 8a2d308..4818f1b 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -51,7 +51,7 @@ static std::string findMatchingHeader(const std::string& 
absPath,
   ext != headerExtensions.end();
   ++ext)
 {
-std::string sourceFilePath = absPath + basename + (*ext);
+std::string sourceFilePath = absPath + basename + "." + (*ext);
 if (cmsys::SystemTools::FileExists(sourceFilePath.c_str()))
   {
   header = sourceFilePath;
@@ -59,7 +59,7 @@ static std::string findMatchingHeader(const std::string& 
absPath,
   }
 if (!mocSubDir.empty())
   {
-  sourceFilePath = mocSubDir + basename + (*ext);
+  sourceFilePath = mocSubDir + basename + "." + (*ext);
   if (cmsys::SystemTools::FileExists(sourceFilePath.c_str()))
 {
 header = sourceFilePath;
@@ -296,7 +296,7 @@ bool cmQtAutomoc::Run(const char* targetDirectory)
 
   if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5")
 {
-success = this->RunAutomoc();
+success = this->RunAutomoc(makefile);
 }
 
   this->WriteOldMocDefinitionsFile(targetDirectory);
@@ -504,7 +504,7 @@ void cmQtAutomoc::Init()
 }
 
 
-bool cmQtAutomoc::RunAutomoc()
+bool cmQtAutomoc::RunAutomoc(cmMakefile* makefile)
 {
   if (!cmsys::SystemTools::FileExists(this->OutMocCppFilename.c_str())
 || (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr))
@@ -528,22 +528,8 @@ bool cmQtAutomoc::RunAutomoc()
   std::vector sourceFiles;
   cmSystemTools::ExpandListArgument(this->Sources, sourceFiles);
 
-  std::vector headerExtensions;
-  headerExtensions.push_back(".h");
-  headerExtensions.push_back(".hpp");
-  headerExtensions.push_back(".hxx");
-#if defined(_WIN32)
-  // not case sensitive, don't add ".H"
-#elif defined(__APPLE__)
-  // detect case-sensitive filesystem
-  long caseSensitive = pathconf(this->Srcdir.c_str(), _PC_CASE_SENSITIVE);
-  if (caseSensitive == 1)
-  {
-headerExtensions.push_back(".H");
-  }
-#else
-  headerExtensions.push_back(".H");
-#endif
+  const std::vector& headerExtensions =
+   makefile->GetHeaderExtensions();
 
   for (std::vector::const_iterator it = sourceFiles.begin();
it != sourceFiles.end();
@@ -945,7 +931,7 @@ void cmQtAutomoc::SearchHeadersForCppFile(const 
std::string& absFilename,
   ext != headerExtensions.end();
   ++ext)
 {
-const std::string headerName = absPath + basename + (*ext);
+const std::string headerName = absPath + basename + "." + (*ext);
 if (cmsys::SystemTools::FileExists(headerName.c_str()))
   {
   absHeaders.insert(headerName);
@@ -956,7 +942,7 @@ void cmQtAutomoc::SearchHeadersForCppFile(const 
std::string& absFilename,
   ext != headerExtensions.end();
   ++ext)
 {
-const std::string privateHeaderName = absPath+basename+"_p"+(*ext);
+const std::s

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1793-g19bdcdd

[Alexander Neundorf]

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  19bdcddcaf48a72e060a2e57ad9fb16b882e2abe (commit)
   via  4cad84836989c6c9e4da97fced637b7bdbc222c7 (commit)
   via  37c4bc1f86a72a76a1ccc3094ba7cc3ec134ff21 (commit)
   via  d4774140b7fa8685a9f29147308fd7fe5365e1fb (commit)
  from  400b6ceff2137ab69b2f3cc6345cdf3e043e5a53 (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=19bdcddcaf48a72e060a2e57ad9fb16b882e2abe
commit 19bdcddcaf48a72e060a2e57ad9fb16b882e2abe
Merge: 400b6ce 4cad848
Author: Alexander Neundorf 
AuthorDate: Sun Jan 27 13:23:09 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Jan 27 13:23:09 2013 -0500

Merge topic 'PackageConfigHelper_UsrMove' into next

4cad848 configure_package_config_file(): extend documentation
37c4bc1 configure_package_config_file(): fix indentation
d477414 configure_package_config_file: force absolute paths for usr-move


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cad84836989c6c9e4da97fced637b7bdbc222c7
commit 4cad84836989c6c9e4da97fced637b7bdbc222c7
Author: Alex Neundorf 
AuthorDate: Thu Jan 24 21:27:32 2013 +0100
Commit: Alex Neundorf 
CommitDate: Thu Jan 24 21:27:32 2013 +0100

configure_package_config_file(): extend documentation

Alex

diff --git a/Modules/CMakePackageConfigHelpers.cmake 
b/Modules/CMakePackageConfigHelpers.cmake
index d6d3cb1..393d05c 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -9,6 +9,8 @@
 # configure_file() command when creating the Config.cmake or 
-config.cmake
 # file for installing a project or library. It helps making the resulting 
package
 # relocatable by avoiding hardcoded paths in the installed Config.cmake file.
+# Config.cmake files installed under UNIX into /lib(64) or /usr/lib(64) 
are
+# considered system packages and are not relocatable.
 #
 # In a FooConfig.cmake file there may be code like this to make the
 # install destinations know to the using project:

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37c4bc1f86a72a76a1ccc3094ba7cc3ec134ff21
commit 37c4bc1f86a72a76a1ccc3094ba7cc3ec134ff21
Author: Alex Neundorf 
AuthorDate: Thu Jan 24 21:18:47 2013 +0100
Commit: Alex Neundorf 
CommitDate: Thu Jan 24 21:18:47 2013 +0100

configure_package_config_file(): fix indentation

This is a separate commit, so that the previous commit is smaller.

Alex

diff --git a/Modules/CMakePackageConfigHelpers.cmake 
b/Modules/CMakePackageConfigHelpers.cmake
index 13617ce..d6d3cb1 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -194,12 +194,12 @@ function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile 
_outputFile)
   set(PACKAGE_${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
 endif()
   else()
-  if(IS_ABSOLUTE "${${var}}")
-string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${PACKAGE_PREFIX_DIR}"
-PACKAGE_${var} "${${var}}")
-  else()
-set(PACKAGE_${var} "\${PACKAGE_PREFIX_DIR}/${${var}}")
-  endif()
+if(IS_ABSOLUTE "${${var}}")
+  string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${PACKAGE_PREFIX_DIR}"
+  PACKAGE_${var} "${${var}}")
+else()
+  set(PACKAGE_${var} "\${PACKAGE_PREFIX_DIR}/${${var}}")
+endif()
   endif()
 endif()
   endforeach()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4774140b7fa8685a9f29147308fd7fe5365e1fb
commit d4774140b7fa8685a9f29147308fd7fe5365e1fb
Author: Alex Neundorf 
AuthorDate: Thu Jan 24 21:15:58 2013 +0100
Commit: Alex Neundorf 
CommitDate: Thu Jan 24 21:15:58 2013 +0100

configure_package_config_file: force absolute paths for usr-move

The configure_package_config()_file() macro will now use
absolute paths for the PATH_VARS if the Config.cmake file
will be installed into /lib(64) or /usr/lib(64), since due to
the usr-move filesystem changes Config.cmake files installed
there may be found via two paths (once per symlink via
/lib(64) and once via /usr/lib ), and in this case
relative paths break.

Alex

diff --git a/Modules/CMakePackageConfigHelpers.cmake 
b/Modules/CMakePackageConfigHelpers.cmake
index a92ce7c..13617ce 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -173,18 +173,34 @@ function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile 
_outputFile)

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1789-g400b6ce

[Alexander Neundorf]

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  400b6ceff2137ab69b2f3cc6345cdf3e043e5a53 (commit)
   via  a7d6ebb01ba7418af3af74a532900f0d7cb210fe (commit)
  from  23c544089e608879ee3138f1399e1c325ac43019 (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=400b6ceff2137ab69b2f3cc6345cdf3e043e5a53
commit 400b6ceff2137ab69b2f3cc6345cdf3e043e5a53
Merge: 23c5440 a7d6ebb
Author: Alexander Neundorf 
AuthorDate: Sun Jan 27 13:17:20 2013 -0500
Commit: CMake Topic Stage 
CommitDate: Sun Jan 27 13:17:20 2013 -0500

Merge topic 'DocumentRelativePathHandling' into next

a7d6ebb documentation: handling of relative paths by include- and 
link_directories()


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7d6ebb01ba7418af3af74a532900f0d7cb210fe
commit a7d6ebb01ba7418af3af74a532900f0d7cb210fe
Author: Alex Neundorf 
AuthorDate: Sun Jan 27 18:00:14 2013 +0100
Commit: Alex Neundorf 
CommitDate: Sun Jan 27 18:00:14 2013 +0100

documentation: handling of relative paths by include- and link_directories()

Alex

diff --git a/Source/cmIncludeDirectoryCommand.h 
b/Source/cmIncludeDirectoryCommand.h
index a32fc77..77a340a 100644
--- a/Source/cmIncludeDirectoryCommand.h
+++ b/Source/cmIncludeDirectoryCommand.h
@@ -59,8 +59,9 @@ public:
 return
   "  include_directories([AFTER|BEFORE] [SYSTEM] dir1 dir2 ...)\n"
   "Add the given directories to those the compiler uses to search "
-  "for include files. "
-  "These directories are added to the directory property "
+  "for include files.  Relative paths are interpreted as relative to "
+  "the current source directory. \n"
+  "The include directories are added to the directory property "
   "INCLUDE_DIRECTORIES for the current CMakeLists file. "
   "They are also added to the target property INCLUDE_DIRECTORIES "
   "for each target in the current CMakeLists file. "
diff --git a/Source/cmLinkDirectoriesCommand.h 
b/Source/cmLinkDirectoriesCommand.h
index 889118c..9218f44 100644
--- a/Source/cmLinkDirectoriesCommand.h
+++ b/Source/cmLinkDirectoriesCommand.h
@@ -62,10 +62,8 @@ public:
   "  link_directories(directory1 directory2 ...)\n"
   "Specify the paths in which the linker should search for libraries. "
   "The command will apply only to targets created after it is called. "
-  "For historical reasons, relative paths given to this command are "
-  "passed to the linker unchanged "
-  "(unlike many CMake commands which interpret them relative to the "
-  "current source directory).\n"
+  "Relative paths given to this command are interpreted as relative to "
+  "the current source directory, see CMP0015. \n"
   "Note that this command is rarely necessary.  Library locations "
   "returned by find_package() and find_library() are absolute paths.  "
   "Pass these absolute library file paths directly to the "

---

Summary of changes:
 Source/cmIncludeDirectoryCommand.h |5 +++--
 Source/cmLinkDirectoriesCommand.h  |6 ++
 2 files changed, 5 insertions(+), 6 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1258-g440a176

[Alexander Neundorf]

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  440a17614ff31eee0709a3e74b02c02ed31dad9d (commit)
   via  cc0580faa3976904c901a6b26df9dc308ea132af (commit)
  from  874be9a9d23e6028f4d49cc263683ec892fc798b (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=440a17614ff31eee0709a3e74b02c02ed31dad9d
commit 440a17614ff31eee0709a3e74b02c02ed31dad9d
Merge: 874be9a cc0580f
Author: Alexander Neundorf 
AuthorDate: Sat Dec 8 12:42:29 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Sat Dec 8 12:42:29 2012 -0500

Merge topic 'DocumentLIBRARY_PATH' into next

cc0580f Extend documentation for CMAKE__IMPLICIT_LINK_DIRECTORIES


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc0580faa3976904c901a6b26df9dc308ea132af
commit cc0580faa3976904c901a6b26df9dc308ea132af
Author: Alex Neundorf 
AuthorDate: Sat Dec 8 18:40:57 2012 +0100
Commit: Alex Neundorf 
CommitDate: Sat Dec 8 18:40:57 2012 +0100

Extend documentation for CMAKE__IMPLICIT_LINK_DIRECTORIES

I stumbled upon this behaviour this week (a full path given
to target_link_libraries() turned into a short -lFoo when linking)
and it was quite hard to figure out what was going on.

Alex

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 55d70f8..6b64dc5 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1621,7 +1621,12 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
  "These paths are implicit linker search directories for the compiler's "
  "language.  "
  "CMake automatically detects these directories for each language and "
- "reports the results in this variable.", false,
+ "reports the results in this variable.  The content of the environment "
+ "variable LIBRARY_PATH during the initial CMake run influences the "
+ "contents of the CMAKE__IMPLICIT_LINK_DIRECTORIES variable.  When "
+ "linking with the full path against a library located in one of these "
+ "directories, only the short form of the link line, e.g. -lFoo, will be "
+ "used instead of the full path.", false,
  "Variables for Languages");
 
   cm->DefineProperty

---

Summary of changes:
 Source/cmDocumentVariables.cxx |7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1256-g874be9a

[Alexander Neundorf]

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  874be9a9d23e6028f4d49cc263683ec892fc798b (commit)
   via  acc224005e99076da3561ada8c06985487b0ce11 (commit)
   via  2be87f8ff832fc29daa3d4eca85de88130daa400 (commit)
  from  bb48cb26fb6660e915777fa6285d00c45e24ea55 (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=874be9a9d23e6028f4d49cc263683ec892fc798b
commit 874be9a9d23e6028f4d49cc263683ec892fc798b
Merge: bb48cb2 acc2240
Author: Alexander Neundorf 
AuthorDate: Sat Dec 8 10:06:05 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Sat Dec 8 10:06:05 2012 -0500

Merge topic 'TheRealAutomocIncludeDirFix' into next

acc2240 Automoc: get include dirs without stripping implicit include dirs 
off
2be87f8 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acc224005e99076da3561ada8c06985487b0ce11
commit acc224005e99076da3561ada8c06985487b0ce11
Author: Alex Neundorf 
AuthorDate: Fri Dec 7 21:24:28 2012 +0100
Commit: Alex Neundorf 
CommitDate: Fri Dec 7 21:24:28 2012 +0100

Automoc: get include dirs without stripping implicit include dirs off

This should finally fix #13667 and #13762.
Instead of adding special handling to guess whether implicit include dirs
may have been removed, simply make it possible to query the include dirs
without removing the implicit ones.

Alex

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6d396b3..b41f060 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1329,7 +1329,9 @@ std::string cmLocalGenerator::GetIncludeFlags(
 void cmLocalGenerator::GetIncludeDirectories(std::vector& dirs,
  cmGeneratorTarget* target,
  const char* lang,
- const char *config)
+ const char *config,
+ bool stripImplicitInclDirs
+)
 {
   // Need to decide whether to automatically include the source and
   // binary directories at the beginning of the include path.
@@ -1404,18 +1406,21 @@ void 
cmLocalGenerator::GetIncludeDirectories(std::vector& dirs,
 return;
 }
 
-  // Load implicit include directories for this language.
-  std::string impDirVar = "CMAKE_";
-  impDirVar += lang;
-  impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES";
-  if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str()))
+  if (stripImplicitInclDirs)
 {
-std::vector impDirVec;
-cmSystemTools::ExpandListArgument(value, impDirVec);
-for(std::vector::const_iterator i = impDirVec.begin();
-i != impDirVec.end(); ++i)
+// Load implicit include directories for this language.
+std::string impDirVar = "CMAKE_";
+impDirVar += lang;
+impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES";
+if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str()))
   {
-  emitted.insert(*i);
+  std::vector impDirVec;
+  cmSystemTools::ExpandListArgument(value, impDirVec);
+  for(std::vector::const_iterator i = impDirVec.begin();
+  i != impDirVec.end(); ++i)
+{
+emitted.insert(*i);
+}
   }
 }
 
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index bd58218..63559d7 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -212,7 +212,8 @@ public:
   /** Get the include flags for the current makefile and language.  */
   void GetIncludeDirectories(std::vector& dirs,
  cmGeneratorTarget* target,
- const char* lang = "C", const char *config = 0);
+ const char* lang = "C", const char *config = 0,
+ bool stripImplicitInclDirs = true);
 
   /** Compute the language used to compile the given source file.  */
   const char* GetSourceFileLanguage(const cmSourceFile& source);
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 83688dd..bf034cf 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -212,36 +212,11 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
 }
 
 
-  const char* qtIncDir = 0;
-  const char* qtCoreIncDir = 0;
-
-  // check whether ${QT_INCLUDE_DIR} is part of the implicit include dirs,
-  // see http://public.kitware.com/

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1241-gd02456c

[Alexander Neundorf]

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  d02456cb18822f74e2c67e7e080ffdff486e815b (commit)
   via  8039bd0864aae15fd0d95db728159a85d72bf0f4 (commit)
   via  8521a9e9cad06922dc316f2c3a82f0263bbd7e87 (commit)
  from  9b0207a1d3b08d938509ac1b3f3368c0e0eaf137 (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=d02456cb18822f74e2c67e7e080ffdff486e815b
commit d02456cb18822f74e2c67e7e080ffdff486e815b
Merge: 9b0207a 8039bd0
Author: Alexander Neundorf 
AuthorDate: Thu Dec 6 16:25:58 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Dec 6 16:25:58 2012 -0500

Merge topic 'ConfigHelperMinorCommentFix' into next

8039bd0 CONFIGURE_PACKAGE_CONFIG_FILE(): improve generated comments
8521a9e CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8039bd0864aae15fd0d95db728159a85d72bf0f4
commit 8039bd0864aae15fd0d95db728159a85d72bf0f4
Author: Alex Neundorf 
AuthorDate: Thu Dec 6 22:24:43 2012 +0100
Commit: Alex Neundorf 
CommitDate: Thu Dec 6 22:24:43 2012 +0100

CONFIGURE_PACKAGE_CONFIG_FILE(): improve generated comments

CONFIGURE_PACKAGE_CONFIG_FILE() now additionally generates
"Any changes to this file will be overwritten by the next CMake run
The input file was FooConfig.cmake.in"
into the configured file.

Alex

diff --git a/Modules/CMakePackageConfigHelpers.cmake 
b/Modules/CMakePackageConfigHelpers.cmake
index 96ecb42..a92ce7c 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -188,8 +188,13 @@ function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile 
_outputFile)
 endif()
   endforeach()
 
+  get_filename_component(inputFileName "${_inputFile}" NAME)
+
   set(PACKAGE_INIT "
 ### Expanded from @PACKAGE_INIT@ by configure_package_config_file() ###
+### Any changes to this file will be overwritten by the next CMake run 
+### The input file was ${inputFileName}
+
 get_filename_component(PACKAGE_PREFIX_DIR 
\"\${CMAKE_CURRENT_LIST_DIR}/${PACKAGE_RELATIVE_PATH}\" ABSOLUTE)
 ")
 

---

Summary of changes:
 Modules/CMakePackageConfigHelpers.cmake |5 +
 Source/CMakeVersion.cmake   |2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1112-g9f476fd

[Alexander Neundorf]

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  9f476fd352f60a846f605bab00477e3711024de5 (commit)
   via  4809cadfe82316b648de50471169b4da9ef101e2 (commit)
   via  d5ac791366595be307896e9894c66815c1e1eb2f (commit)
  from  8fc1a2c2c412ea5a75e0bffc353f25c20f2b829a (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=9f476fd352f60a846f605bab00477e3711024de5
commit 9f476fd352f60a846f605bab00477e3711024de5
Merge: 8fc1a2c 4809cad
Author: Alexander Neundorf 
AuthorDate: Thu Nov 29 03:23:52 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 29 03:23:52 2012 -0500

Merge topic 'MinorFixFPHSA_13755' into next

4809cad FPHSA: don't succeed if only checking for XX_FOUND (#13755)
d5ac791 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4809cadfe82316b648de50471169b4da9ef101e2
commit 4809cadfe82316b648de50471169b4da9ef101e2
Author: Alex Neundorf 
AuthorDate: Thu Nov 29 09:21:18 2012 +0100
Commit: Alex Neundorf 
CommitDate: Thu Nov 29 09:21:18 2012 +0100

FPHSA: don't succeed if only checking for XX_FOUND (#13755)

This fixes issue #13755.
FPHSA(XX DEFAULT_MSG XX_FOUND)
always succeeded due to the way how the XX_FOUND variable was set.
It was preset to TRUE, and then reset to FALSE if something was missing
(...which had the effect that XX_FOUND itself was already preset when FPHSA
checked whether XX_FOUND is set)

Now XX_FOUND is unset first, and only later on set to TRUE.

Alex

diff --git a/Modules/FindPackageHandleStandardArgs.cmake 
b/Modules/FindPackageHandleStandardArgs.cmake
index 5549d14..e89e9a9 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -187,8 +187,8 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
   # user knows better what went wrong (#6375)
   set(MISSING_VARS "")
   set(DETAILS "")
-  set(${_NAME_UPPER}_FOUND TRUE)
   # check if all passed variables are valid
+  unset(${_NAME_UPPER}_FOUND)
   foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
 if(NOT ${_CURRENT_VAR})
   set(${_NAME_UPPER}_FOUND FALSE)
@@ -197,6 +197,9 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
   set(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
 endif()
   endforeach()
+  if(NOT "${${_NAME_UPPER}_FOUND}" STREQUAL "FALSE")
+set(${_NAME_UPPER}_FOUND TRUE)
+  endif()
 
   # component handling
   unset(FOUND_COMPONENTS_MSG)

---

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


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

[Cmake-commits] CMake branch, next, updated. v2.8.10.1-941-g700f7b9

[Alexander Neundorf]

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  700f7b9a9288280855dd1acf652c11c1408b2f39 (commit)
   via  18056a683a86295e5471c2bc67b9b365c38a2383 (commit)
   via  7a8da5fce1d6974a087c4a20b585ca0d900afbbb (commit)
   via  843c1617d607d6aa5a3609b69190871bdced6948 (commit)
  from  df01c8d1a099316f9f3f164429d6209668c998a9 (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=700f7b9a9288280855dd1acf652c11c1408b2f39
commit 700f7b9a9288280855dd1acf652c11c1408b2f39
Merge: df01c8d 18056a6
Author: Alexander Neundorf 
AuthorDate: Mon Nov 19 15:53:21 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Nov 19 15:53:21 2012 -0500

Merge topic 'FixAutomocRegression3' into next

18056a6 Automoc: fix regression #13667, broken build in phonon
7a8da5f CMake Nightly Date Stamp
843c161 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18056a683a86295e5471c2bc67b9b365c38a2383
commit 18056a683a86295e5471c2bc67b9b365c38a2383
Author: Alex Neundorf 
AuthorDate: Mon Nov 19 21:47:20 2012 +0100
Commit: Alex Neundorf 
CommitDate: Mon Nov 19 21:47:20 2012 +0100

Automoc: fix regression #13667, broken build in phonon

On some systems, ${QT_INCLUDE_DIR} is reported by gcc as a builtin
include search dir. Some projects use this information to extend
CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES.
In cmake 2.8.10 now the targets are queried for the include directories
they use. When they return the result, the include dirs contained in
CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES have been removed.
In cmake 2.8.9 and below the INCLUDE_DIRECTORIES directory property
was queried, where this had not been stripped.
So, in those projects which modify the implicit include dirs variable,
on systems where ${QT_INCLUDE_DIR} is reported by gcc, this directory,
e.g. /usr/lib/include/qt/, was not given anymore to moc. This made moc
not find required headers, so the build broke.
Simply giving the full CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES to moc
is no solution either, since moc can't handle some of the headers it
finds then (https://bugreports.qt-project.org/browse/QTBUG-28045).
So now cmake checks CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES, and if this
contains ${QT_INCLUDE_DIR}, and the target reports that it uses
${QT_QTCORE_INCLUDE_DIR} but not ${QT_INCLUDE_DIR}, ${QT_INCLUDE_DIR}
is added to the include dirs given to moc.

Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 942c7ab..25614b8 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -195,6 +195,34 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
   }
 }
 
+
+  const char* qtIncDir = 0;
+  const char* qtCoreIncDir = 0;
+
+  // check whether ${QT_INCLUDE_DIR} is part of the implicit include dirs,
+  // see http://public.kitware.com/Bug/view.php?id=13667
+  bool qtIncludeDirMayHaveBeenRemoved = false;
+  if (makefile->IsSet("QT_INCLUDE_DIR"))
+{
+qtIncDir = makefile->GetDefinition("QT_INCLUDE_DIR");
+std::string s =
+ makefile->GetSafeDefinition("CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES");
+std::vector implIncDirs;
+cmSystemTools::ExpandListArgument(s, implIncDirs);
+if (std::find(implIncDirs.begin(), implIncDirs.end(),std::string(qtIncDir))
+  != implIncDirs.end())
+  {
+  qtIncludeDirMayHaveBeenRemoved = true;
+  if (makefile->IsSet("QT_QTCORE_INCLUDE_DIR"))
+{
+qtCoreIncDir = makefile->GetDefinition("QT_QTCORE_INCLUDE_DIR");
+}
+  }
+}
+
+  bool haveQtCoreIncDir = false;
+  bool haveQtIncDir = false;
+
   std::vector includeDirs;
   cmGeneratorTarget gtgt(target);
   localGen->GetIncludeDirectories(includeDirs, >gt, "CXX");
@@ -207,6 +235,37 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
 _moc_incs += sep;
 sep = ";";
 _moc_incs += *incDirIt;
+
+if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir) // #13667
+  {
+  if (*incDirIt == qtIncDir)
+{
+haveQtIncDir = true;
+qtIncludeDirMayHaveBeenRemoved = false; // it's here, i.e. not removed
+}
+  if (*incDirIt == qtCoreIncDir)
+{
+haveQtCoreIncDir = true;
+}
+  }
+}
+
+  // Some projects (kdelibs, phonon) query the compiler for its default
+  // include search dirs

[Cmake-commits] CMake branch, next, updated. v2.8.10.1-937-gdf01c8d

[Alexander Neundorf]

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  df01c8d1a099316f9f3f164429d6209668c998a9 (commit)
   via  f43fb0236680fb06f4ef43ca0aaaeb1ef58e0118 (commit)
  from  3fa60c13e0710af68f1079712852f46ab18cc6e3 (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=df01c8d1a099316f9f3f164429d6209668c998a9
commit df01c8d1a099316f9f3f164429d6209668c998a9
Merge: 3fa60c1 f43fb02
Author: Alexander Neundorf 
AuthorDate: Mon Nov 19 15:16:58 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Nov 19 15:16:58 2012 -0500

Merge topic 'FixAutomocRegression' into next

f43fb02 Revert "automoc: fix regression from 2.8.10 (#13667 and #13646)"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f43fb0236680fb06f4ef43ca0aaaeb1ef58e0118
commit f43fb0236680fb06f4ef43ca0aaaeb1ef58e0118
Author: Alex Neundorf 
AuthorDate: Mon Nov 19 21:13:43 2012 +0100
Commit: Alex Neundorf 
CommitDate: Mon Nov 19 21:13:43 2012 +0100

Revert "automoc: fix regression from 2.8.10 (#13667 and #13646)"

This reverts commit a9465098c01ace9ead62c04674dc2f4a529962f5.

Reverting this commit since it breaks moc, which can't handle all
headers it finds now, see 
https://bugreports.qt-project.org/browse/QTBUG-28045
https://bugreports.qt-project.org/browse/QTBUG-2804

It seems it can't handle namespaces with attributes attached:
namespace Something __attribute__ ((__visibility__ (default)))
{

}

Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 6fae4e0..942c7ab 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -209,22 +209,6 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
 _moc_incs += *incDirIt;
 }
 
-  // Some projects (kdelibs, phonon) query the compiler for its default
-  // include search dirs, and add those to
-  // CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES.
-  // These may include e.g./usr/lib/qt/include . This is typically also part
-  // of ${QT_INCLUDES}. If this directory is then contained in the implicit
-  // include dirs, it is removed from the include dirs returned from the
-  // target above. So we have to add them additionally, so moc can find them.
-  // See #13646 and #13667.
-  const char* implicitIncludeDirs = makefile->GetSafeDefinition(
- "CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES");
-  if (implicitIncludeDirs && *implicitIncludeDirs)
-{
-_moc_incs += sep;
-_moc_incs += implicitIncludeDirs;
-}
-
   const char* tmp = target->GetProperty("COMPILE_DEFINITIONS");
   std::string _moc_compile_defs = (tmp!=0 ? tmp : "");
   tmp = makefile->GetProperty("COMPILE_DEFINITIONS");

---

Summary of changes:
 Source/cmQtAutomoc.cxx |   16 
 1 files changed, 0 insertions(+), 16 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.10.1-903-g3e0aa4b

[Alexander Neundorf]

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  3e0aa4b8ca37058c28d7e0556efdf6007bcd2d60 (commit)
   via  3efe1d35f46fedbaaa81777201096808e660d518 (commit)
   via  3359d95c00c221328d284e443c1d49e12630be63 (commit)
  from  220d5ccbb9cf957fd6262981f4b1e03d889ed21f (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=3e0aa4b8ca37058c28d7e0556efdf6007bcd2d60
commit 3e0aa4b8ca37058c28d7e0556efdf6007bcd2d60
Merge: 220d5cc 3efe1d3
Author: Alexander Neundorf 
AuthorDate: Sat Nov 17 12:42:47 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Sat Nov 17 12:42:47 2012 -0500

Merge topic 'AutomocInheritFOLDERTargetProperty' into next

3efe1d3 Automoc: "inherit" FOLDER target property from target (#13688)
3359d95 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3efe1d35f46fedbaaa81777201096808e660d518
commit 3efe1d35f46fedbaaa81777201096808e660d518
Author: Alex Neundorf 
AuthorDate: Sat Nov 17 18:32:54 2012 +0100
Commit: Alex Neundorf 
CommitDate: Sat Nov 17 18:32:54 2012 +0100

Automoc: "inherit" FOLDER target property from target (#13688)

This patch sets the FOLDER target property for the automoc target
to the same value as of the actual target. This organizes the targets
in IDEs with folders better.

Inspired-by: Mike Gelfand

Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 942c7ab..9423208 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -85,6 +85,18 @@ static std::string extractSubDir(const std::string& absPath,
 }
 
 
+static void copyTargetProperty(cmTarget* destinationTarget,
+   cmTarget* sourceTarget,
+   const char* propertyName)
+{
+  const char* propertyValue = sourceTarget->GetProperty(propertyName);
+  if (propertyValue)
+{
+destinationTarget->SetProperty(propertyName, propertyValue);
+}
+}
+
+
 cmQtAutomoc::cmQtAutomoc()
 :Verbose(cmsys::SystemTools::GetEnv("VERBOSE") != 0)
 ,ColorOutput(true)
@@ -152,9 +164,13 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
   std::string automocComment = "Automoc for target ";
   automocComment += targetName;
 
-  makefile->AddUtilityCommand(automocTargetName.c_str(), true,
+  cmTarget* automocTarget = makefile->AddUtilityCommand(
+  automocTargetName.c_str(), true,
   workingDirectory.c_str(), depends,
   commandLines, false, automocComment.c_str());
+  // inherit FOLDER property from target (#13688)
+  copyTargetProperty(automocTarget, target, "FOLDER");
+
   target->AddUtility(automocTargetName.c_str());
 
   // configure a file to get all information to automoc at buildtime:

---

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


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

[Cmake-commits] CMake branch, next, updated. v2.8.10.1-848-g08e1d26

[Alexander Neundorf]

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  08e1d26efad4cd1559e0102289d2c15c21067ba6 (commit)
   via  a9465098c01ace9ead62c04674dc2f4a529962f5 (commit)
  from  d93e9f61ab2424cc26d49c84c25ffb30c2deb0a4 (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=08e1d26efad4cd1559e0102289d2c15c21067ba6
commit 08e1d26efad4cd1559e0102289d2c15c21067ba6
Merge: d93e9f6 a946509
Author: Alexander Neundorf 
AuthorDate: Fri Nov 9 18:12:21 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Nov 9 18:12:21 2012 -0500

Merge topic 'FixAutomocRegression' into next

a946509 automoc: fix regression from 2.8.10 (#13667 and #13646)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9465098c01ace9ead62c04674dc2f4a529962f5
commit a9465098c01ace9ead62c04674dc2f4a529962f5
Author: Alex Neundorf 
AuthorDate: Sat Nov 10 00:10:12 2012 +0100
Commit: Alex Neundorf 
CommitDate: Sat Nov 10 00:10:12 2012 +0100

automoc: fix regression from 2.8.10 (#13667 and #13646)

Some projects (kdelibs, phonon) query the compiler for its default
include search dirs, and add those to
CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES.
These may include e.g./usr/lib/qt/include . This is typically also part
of ${QT_INCLUDES}. If this directory is then contained in the implicit
include dirs, it is removed from the include dirs returned from the
target above. So we have to add them additionally, so moc can find them.
Otherwise those projects don't build anymore, because moc can't find
the headers it needs to find because the necessary include dirs
have been removed.

Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 942c7ab..6fae4e0 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -209,6 +209,22 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
 _moc_incs += *incDirIt;
 }
 
+  // Some projects (kdelibs, phonon) query the compiler for its default
+  // include search dirs, and add those to
+  // CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES.
+  // These may include e.g./usr/lib/qt/include . This is typically also part
+  // of ${QT_INCLUDES}. If this directory is then contained in the implicit
+  // include dirs, it is removed from the include dirs returned from the
+  // target above. So we have to add them additionally, so moc can find them.
+  // See #13646 and #13667.
+  const char* implicitIncludeDirs = makefile->GetSafeDefinition(
+ "CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES");
+  if (implicitIncludeDirs && *implicitIncludeDirs)
+{
+_moc_incs += sep;
+_moc_incs += implicitIncludeDirs;
+}
+
   const char* tmp = target->GetProperty("COMPILE_DEFINITIONS");
   std::string _moc_compile_defs = (tmp!=0 ? tmp : "");
   tmp = makefile->GetProperty("COMPILE_DEFINITIONS");

---

Summary of changes:
 Source/cmQtAutomoc.cxx |   16 
 1 files changed, 16 insertions(+), 0 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.10.1-816-g7bc3a98

[Alexander Neundorf]

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  7bc3a986424a2a5eb905ff14709871c8084796f7 (commit)
   via  b58fd6569a57213299762a9ca04569650e9b7ffa (commit)
  from  b8dfd1bea3b59840bd39c247d6628bd305ae9288 (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=7bc3a986424a2a5eb905ff14709871c8084796f7
commit 7bc3a986424a2a5eb905ff14709871c8084796f7
Merge: b8dfd1b b58fd65
Author: Alexander Neundorf 
AuthorDate: Wed Nov 7 11:50:16 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Wed Nov 7 11:50:16 2012 -0500

Merge topic 'MakeSquish4Work' into next

b58fd65 Squish: fix new squish_v4_add_test() macro


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b58fd6569a57213299762a9ca04569650e9b7ffa
commit b58fd6569a57213299762a9ca04569650e9b7ffa
Author: Alex Neundorf 
AuthorDate: Wed Nov 7 17:48:53 2012 +0100
Commit: Alex Neundorf 
CommitDate: Wed Nov 7 17:48:53 2012 +0100

Squish: fix new squish_v4_add_test() macro

The OUTPUT_NAME target property only returns something if it has been
explicitely set. So use LOCATION, and extract the filename from that.

Alex

diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake
index ad72958..b797805 100644
--- a/Modules/FindSquish.cmake
+++ b/Modules/FindSquish.cmake
@@ -221,7 +221,7 @@ function(SQUISH_V4_ADD_TEST testName)
 
   get_target_property(testAUTLocation ${_SQUISH_AUT} LOCATION)
   get_filename_component(testAUTDir ${testAUTLocation} PATH)
-  get_target_property(testAUTName ${_SQUISH_AUT} OUTPUT_NAME)
+  get_filename_component(testAUTName ${testAUTLocation} NAME)
 
   get_filename_component(absTestSuite "${_SQUISH_SUITE}" ABSOLUTE)
   if(NOT EXISTS "${absTestSuite}")

---

Summary of changes:
 Modules/FindSquish.cmake |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.10-763-g7623edb

[Alexander Neundorf]

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  7623edbf9e3ca301e26274fd6e8b26d22579961a (commit)
   via  65e9bbe78eae49828cf02ed1e425d47ae4bea95a (commit)
  from  8316b91b9740f79d9a4250534d6fce5adbd73b34 (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=7623edbf9e3ca301e26274fd6e8b26d22579961a
commit 7623edbf9e3ca301e26274fd6e8b26d22579961a
Merge: 8316b91 65e9bbe
Author: Alexander Neundorf 
AuthorDate: Mon Nov 5 15:21:30 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Nov 5 15:21:30 2012 -0500

Merge topic 'TI_DSP_Compiler' into next

65e9bbe Add support for Texas Instruments DSP compiler (#12405)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65e9bbe78eae49828cf02ed1e425d47ae4bea95a
commit 65e9bbe78eae49828cf02ed1e425d47ae4bea95a
Author: Alex Neundorf 
AuthorDate: Sun Nov 4 15:46:57 2012 +0100
Commit: Alex Neundorf 
CommitDate: Sun Nov 4 15:46:57 2012 +0100

Add support for Texas Instruments DSP compiler (#12405)

This is for the cl6x compiler from TI, which is used for TI DSPs.
The toolchain can be downloaded for free for Linux and Windows.

Alex

diff --git a/Modules/Compiler/TI_DSP-ASM.cmake 
b/Modules/Compiler/TI_DSP-ASM.cmake
new file mode 100644
index 000..e097626
--- /dev/null
+++ b/Modules/Compiler/TI_DSP-ASM.cmake
@@ -0,0 +1,8 @@
+set(CMAKE_LIBRARY_PATH_FLAG "--search_path=")
+set(CMAKE_LINK_LIBRARY_FLAG "--library=")
+set(CMAKE_INCLUDE_FLAG_ASM "--include_path=")
+
+set(CMAKE_ASM_COMPILE_OBJECT  " --compile_only 
--asm_file=   --output_file=")
+set(CMAKE_ASM_LINK_EXECUTABLE "  --run_linker 
--output_file=   ")
+
+set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm;s;abs)
diff --git a/Modules/Compiler/TI_DSP-C.cmake b/Modules/Compiler/TI_DSP-C.cmake
new file mode 100644
index 000..b580994
--- /dev/null
+++ b/Modules/Compiler/TI_DSP-C.cmake
@@ -0,0 +1,10 @@
+set(CMAKE_LIBRARY_PATH_FLAG "--search_path=")
+set(CMAKE_LINK_LIBRARY_FLAG "--library=")
+set(CMAKE_INCLUDE_FLAG_C "--include_path=")
+
+set(CMAKE_C_CREATE_ASSEMBLY_SOURCE " --compile_only 
--skip_assembler --c_file=   
--output_file=")
+set(CMAKE_C_CREATE_PREPROCESSED_SOURCE " --preproc_only 
--c_file=   --output_file=")
+
+set(CMAKE_C_COMPILE_OBJECT  " --compile_only 
--c_file=   --output_file=")
+set(CMAKE_C_ARCHIVE_CREATE " -r  ")
+set(CMAKE_C_LINK_EXECUTABLE " --run_linker 
--output_file= --map_file=.map  
  ")
diff --git a/Modules/Compiler/TI_DSP-CXX.cmake 
b/Modules/Compiler/TI_DSP-CXX.cmake
new file mode 100644
index 000..8cf5ac3
--- /dev/null
+++ b/Modules/Compiler/TI_DSP-CXX.cmake
@@ -0,0 +1,10 @@
+set(CMAKE_LIBRARY_PATH_FLAG "--search_path=")
+set(CMAKE_LINK_LIBRARY_FLAG "--library=")
+set(CMAKE_INCLUDE_FLAG_CXX "--include_path=")
+
+set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE " --compile_only 
--skip_assembler --cpp_file=   
--output_file=")
+set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE " --preproc_only 
--cpp_file=   --output_file=")
+
+set(CMAKE_CXX_COMPILE_OBJECT  " --compile_only 
--cpp_file=   --output_file=")
+set(CMAKE_CXX_ARCHIVE_CREATE " -r  ")
+set(CMAKE_CXX_LINK_EXECUTABLE " --run_linker 
--output_file= --map_file=.map  
  ")

---

Summary of changes:
 Modules/Compiler/TI_DSP-ASM.cmake |8 
 Modules/Compiler/TI_DSP-C.cmake   |   10 ++
 Modules/Compiler/TI_DSP-CXX.cmake |   10 ++
 3 files changed, 28 insertions(+), 0 deletions(-)
 create mode 100644 Modules/Compiler/TI_DSP-ASM.cmake
 create mode 100644 Modules/Compiler/TI_DSP-C.cmake
 create mode 100644 Modules/Compiler/TI_DSP-CXX.cmake


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

[Cmake-commits] CMake branch, next, updated. v2.8.10-761-g8316b91

[Alexander Neundorf]

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  8316b91b9740f79d9a4250534d6fce5adbd73b34 (commit)
   via  3a0ffa6225ec4b6f95dc691a91dec7f7e04cb7ec (commit)
   via  2ae9d03fa64b49d708e489db0275f6893dfc05b4 (commit)
   via  53c42cb4eab9f1e975b287e5b6784fb83f48be1f (commit)
   via  daf1c4d5a7edbf046a4a3d324f2ca01fb1d1a856 (commit)
   via  b878cd6fb4fee4c32bc97a7e63b8d25d2eab30cf (commit)
   via  3fe2bc622e75c052e75c351621a8c876070481a3 (commit)
   via  314e7fb6e9a8fe48531c8c04de6eadd960ee (commit)
  from  4bb7d79e6967a30e5aa9c65e77fb3a7b49d6c249 (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=8316b91b9740f79d9a4250534d6fce5adbd73b34
commit 8316b91b9740f79d9a4250534d6fce5adbd73b34
Merge: 4bb7d79 3a0ffa6
Author: Alexander Neundorf 
AuthorDate: Mon Nov 5 14:28:29 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Nov 5 14:28:29 2012 -0500

Merge topic 'MakeSquish4Work' into next

3a0ffa6 Squish: add support for squish 4 (#9734)
2ae9d03 Squish: use ${CMAKE_CURRENT_LIST_DIR}
53c42cb Squish: rename squish_add_test() to squish_v3_add_test() and fix 
docs a bit
daf1c4d Squish: find executables also under Windows
b878cd6 Squish: use FPHSA
3fe2bc6 Squish: detect version
314e7fb CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a0ffa6225ec4b6f95dc691a91dec7f7e04cb7ec
commit 3a0ffa6225ec4b6f95dc691a91dec7f7e04cb7ec
Author: Alex Neundorf 
AuthorDate: Sun Nov 4 21:06:20 2012 +0100
Commit: Alex Neundorf 
CommitDate: Mon Nov 5 19:20:13 2012 +0100

Squish: add support for squish 4 (#9734)

This patch adds support for Squish 4.x.
The changes are basically what is attached to
http://public.kitware.com/Bug/view.php?id=9734.
When adding a test for squish 4.x, use squish_v4_add_test().

Alex

diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake
index 10d287b..ad72958 100644
--- a/Modules/FindSquish.cmake
+++ b/Modules/FindSquish.cmake
@@ -1,6 +1,6 @@
 #
 #  Find Squish
-# This module can be used to find Squish. Currently Squish version 3 is 
supported.
+# This module can be used to find Squish. Currently Squish versions 3 and 4 
are supported.
 #
 #  Variables and Macros
 #  SQUISH_FOUNDIf false, don't try to use Squish
@@ -17,14 +17,43 @@
 #  SQUISH_SERVER_EXECUTABLE_FOUND  Was the server executable found?
 #  SQUISH_CLIENT_EXECUTABLE_FOUND  Was the client executable found?
 #
-# macro SQUISH_V3_ADD_TEST(testName applicationUnderTest testCase envVars 
testWrapper)
+# It provides the function squish_v4_add_test() for adding a squish test to 
cmake using Squish 4.x:
+#
+#   squish_v4_add_test(cmakeTestName AUT targetName SUITE suiteName TEST 
squishTestName
+#   [SETTINGSGROUP group] [PRE_COMMAND command] [POST_COMMAND 
command] )
+#
+# The arguments have the following meaning:
+#   cmakeTestName: this will be used as the first argument for add_test()
+#   AUT targetName: the name of the cmake target which will be used as AUT, 
i.e. the
+#   executable which will be tested.
+#   SUITE suiteName: this is either the full path to the squish suite, or just 
the
+#last directory of the suite, i.e. the suite name. In this 
case
+#the CMakeLists.txt which calls squish_add_test() must be 
located
+#in the parent directory of the suite directory.
+#   TEST squishTestName: the name of the squish test, i.e. the name of the 
subdirectory
+#of the test inside the suite directory.
+#   SETTINGSGROUP group: if specified, the given settings group will be used 
for executing the test.
+#If not specified, the groupname will be 
"CTest_"
+#   PRE_COMMAND command:  if specified, the given command will be executed 
before starting the squish test.
+#   POST_COMMAND command: same as PRE_COMMAND, but after the squish test has 
been executed.
+#
+#  Typical Use
+#   enable_testing()
+#   find_package(Squish 4.0)
+#   if (SQUISH_FOUND)
+#  squish_v4_add_test(myTestName AUT myApp SUITE 
${CMAKE_SOURCE_DIR}/tests/mySuite TEST someSquishTest SETTINGSGROUP myGroup )
+#   endif ()
+#
+#
+# For users of Squish version 3.x the macro squish_v3_add_test() is provided:
+#   squish_v3_add_test(testName applicationUnderTest testCase envVars 
testWrapper)
 #   Use this macro to add a test using Squish 3.x.
 #
 #  Typical Use
 #  enable_testing()
 #  find_package(Squish)
 #  if (SQUISH_FOUN

[Cmake-commits] CMake branch, next, updated. v2.8.10-723-g9fb4dfb

[Alexander Neundorf]

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  9fb4dfbbe67f67bfca3ed3d6c5e4e950bc968805 (commit)
   via  3c41b3ac80f7f07c67d0a3aed45e48b26c072497 (commit)
   via  f530496c9761ddf9f6708023b843e5675c56aca5 (commit)
   via  1a1169b13aac6e12cbde2097cb2b4fdaae562102 (commit)
   via  2072e85172c9e58a3911991ada1b1db690175d51 (commit)
   via  3e7d97d45d167ddab5ebef6a6fd936df3441c4c9 (commit)
   via  b4e8f49b95bc13939347623b2b9f236e22bd37ec (commit)
  from  8e56fc779ab1f90146c829487b92c42d8f7f95db (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=9fb4dfbbe67f67bfca3ed3d6c5e4e950bc968805
commit 9fb4dfbbe67f67bfca3ed3d6c5e4e950bc968805
Merge: 8e56fc7 3c41b3a
Author: Alexander Neundorf 
AuthorDate: Sat Nov 3 13:55:03 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Nov 3 13:55:03 2012 -0400

Merge topic 'FixImplicitDepends2' into next

3c41b3a AddCustomCommand: Handle multiple IMPLICIT_DEPENDS files (#10048)
f530496 FIX: No dependency-vector erasure in cmDepends::CheckDependencies
1a1169b cmDepends: allow multiple dependees per depender
2072e85 cmDependsC: fix indentation
3e7d97d cmDependsC: remove code duplication
b4e8f49 cmDependsC: remove unused member variable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c41b3ac80f7f07c67d0a3aed45e48b26c072497
commit 3c41b3ac80f7f07c67d0a3aed45e48b26c072497
Author: Alex Neundorf 
AuthorDate: Sun Sep 30 18:34:57 2012 +0200
Commit: Alex Neundorf 
CommitDate: Sat Nov 3 18:46:06 2012 +0100

AddCustomCommand: Handle multiple IMPLICIT_DEPENDS files (#10048)

The code handling IMPLICIT_DEPENDS was only able to track a single file,
the latest file replaced earlier files in the list.

The documentation now mentions that the language has to be prefixed to
every file and the test now uses two implicit dependencies, where only
the second is modified to trigger re-running of the custom command.

This is a patch from Michael Wild, but direct cherry-picking didn't work,
git complained about too many renames.

Alex

Inspired-by: Michael Wild 

diff --git a/Source/cmAddCustomCommandCommand.h 
b/Source/cmAddCustomCommandCommand.h
index c5252b7..1cc1e3a 100644
--- a/Source/cmAddCustomCommandCommand.h
+++ b/Source/cmAddCustomCommandCommand.h
@@ -68,7 +68,8 @@ public:
   " [COMMAND command2 [ARGS] [args2...] ...]\n"
   " [MAIN_DEPENDENCY depend]\n"
   " [DEPENDS [depends...]]\n"
-  " [IMPLICIT_DEPENDS  depend1 ...]\n"
+  " [IMPLICIT_DEPENDS  depend1\n"
+  "  [ depend2] ...]\n"
   " [WORKING_DIRECTORY dir]\n"
   " [COMMENT comment] [VERBATIM] [APPEND])\n"
   "This defines a command to generate specified OUTPUT file(s).  "
@@ -142,6 +143,8 @@ public:
   "dependencies of an input file.  The language given specifies the "
   "programming language whose corresponding dependency scanner should "
   "be used.  Currently only C and CXX language scanners are supported. "
+  "The language has to be specified for every file in the "
+  "IMPLICIT_DEPENDS list. "
   "Dependencies discovered from the scanning are added to those of "
   "the custom command at build time.  Note that the IMPLICIT_DEPENDS "
   "option is currently supported only for Makefile generators and "
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx 
b/Source/cmLocalUnixMakefileGenerator3.cxx
index db93529..820d25a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1939,8 +1939,12 @@ void cmLocalUnixMakefileGenerator3
 for(ImplicitDependFileMap::const_iterator pi = implicitPairs.begin();
 pi != implicitPairs.end(); ++pi)
   {
-  cmakefileStream << "  \"" << pi->second << "\" ";
-  cmakefileStream << "\"" << pi->first << "\"\n";
+  for(cmDepends::DependencyVector::const_iterator di = pi->second.begin();
+  di != pi->second.end(); ++ di)
+{
+cmakefileStream << "  \"" << *di << "\" ";
+cmakefile

[Cmake-commits] CMake branch, next, updated. v2.8.10-716-g8e56fc7

[Alexander Neundorf]

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  8e56fc779ab1f90146c829487b92c42d8f7f95db (commit)
   via  f403eba9261a7c683a86f4e3bdf17a4ba19a0c54 (commit)
  from  afe04cdb3ddd4645e456e7b129466e782a31649e (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=8e56fc779ab1f90146c829487b92c42d8f7f95db
commit 8e56fc779ab1f90146c829487b92c42d8f7f95db
Merge: afe04cd f403eba
Author: Alexander Neundorf 
AuthorDate: Sat Nov 3 12:49:39 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Nov 3 12:49:39 2012 -0400

Merge topic 'EclipseFixIndexerBySettingSourcePath' into next

f403eba Eclipse: remove commented line of code


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f403eba9261a7c683a86f4e3bdf17a4ba19a0c54
commit f403eba9261a7c683a86f4e3bdf17a4ba19a0c54
Author: Alex Neundorf 
AuthorDate: Sat Nov 3 17:49:05 2012 +0100
Commit: Alex Neundorf 
CommitDate: Sat Nov 3 17:49:05 2012 +0100

Eclipse: remove commented line of code

Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 09924e0..c8f98d7 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -581,7 +581,6 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
 );
   // Don't add it to the srcLinkedResources, because listing multiple
   // directories confuses the Eclipse indexer (#13596).
-  //this->SrcLinkedResources.push_back(it->first);
   }
 }
 }

---

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.9-1198-g52f669a

[Alexander Neundorf]

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  52f669adb298c1584871e2de61e5dc5faef9e8d5 (commit)
   via  f7abffa7fcde060f3c3fb519090678649ae89dc4 (commit)
  from  1b3376d80ae926e4f4a6e03acd15be6c8f38aa4d (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=52f669adb298c1584871e2de61e5dc5faef9e8d5
commit 52f669adb298c1584871e2de61e5dc5faef9e8d5
Merge: 1b3376d f7abffa
Author: Alexander Neundorf 
AuthorDate: Wed Oct 24 13:48:56 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Oct 24 13:48:56 2012 -0400

Merge topic 'EclipseFixIndexerBySettingSourcePath' into next

f7abffa Eclipse: set source path once to fix Eclipse indexer (#13596)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7abffa7fcde060f3c3fb519090678649ae89dc4
commit f7abffa7fcde060f3c3fb519090678649ae89dc4
Author: Alex Neundorf 
AuthorDate: Tue Oct 23 22:38:33 2012 +0200
Commit: Alex Neundorf 
CommitDate: Wed Oct 24 15:26:19 2012 +0200

Eclipse: set source path once to fix Eclipse indexer (#13596)

Since CMake 2.8.7 no src-path entry was generated anymore, in response to
http://public.kitware.com/Bug/view.php?id=12213 .
Before that a src-path entry was added for each linked resource.
Now only one src-path entry is added, for the ${CMAKE_SOURCE_DIR}.
According to http://public.kitware.com/Bug/view.php?id=13596 this
makes the indexer behave better.

Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 689f213..09924e0 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -579,7 +579,9 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
  this->GetEclipsePath(linkSourceDirectory),
  LinkToFolder
 );
-  this->SrcLinkedResources.push_back(it->first);
+  // Don't add it to the srcLinkedResources, because listing multiple
+  // directories confuses the Eclipse indexer (#13596).
+  //this->SrcLinkedResources.push_back(it->first);
   }
 }
 }
@@ -730,15 +732,16 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() 
const
 /* I don't know what the pathentry kind="src" are good for, e.g. autocompletion
  * works also without them. Done wrong, the indexer complains, see #12417
  * and #12213.
+ * According to #13596, this entry at least limits the directories the
+ * indexer is searching for files. So now the "src" entry contains only
+ * the linked resource to CMAKE_SOURCE_DIR.
  * The CDT documentation is very terse on that:
  * "CDT_SOURCE: Entry kind constant describing a path entry identifying a
  * folder containing source code to be compiled."
  * Also on the cdt-dev list didn't bring any information:
  * http://web.archiveorange.com/archive/v/B4NlJDNIpYoOS1SbxFNy
- * So I'm disabling them for now, hoping that somebody will report if something
- * is not workging anymore.
  * Alex */
-#ifdef DO_CREATE_SRC_PATH_ENTRIES
+
   for (std::vector::const_iterator
it = this->SrcLinkedResources.begin();
it != this->SrcLinkedResources.end();
@@ -755,7 +758,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
   excludeFromOut += this->EscapeForXML(*it) + "/|";
   }
 }
-#endif
+
   excludeFromOut += "**/CMakeFiles/";
   fout << "\n";

---

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |   13 -
 1 files changed, 8 insertions(+), 5 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.9-1143-gd610823

[Alexander Neundorf]

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  d6108237624254adb4e20c7c45b98f310e6bc626 (commit)
   via  fbda95883c3a86e5b808c78fa433bd9dbcc93754 (commit)
  from  7932fa13cb4be6e0b5ed30ec1952d9646220e404 (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=d6108237624254adb4e20c7c45b98f310e6bc626
commit d6108237624254adb4e20c7c45b98f310e6bc626
Merge: 7932fa1 fbda958
Author: Alexander Neundorf 
AuthorDate: Wed Oct 17 17:46:31 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Oct 17 17:46:31 2012 -0400

Merge topic 'EclipseNoLinkedResources' into next

fbda958 Eclipse: add switch to disable linked resources (#13189)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbda95883c3a86e5b808c78fa433bd9dbcc93754
commit fbda95883c3a86e5b808c78fa433bd9dbcc93754
Author: Alex Neundorf 
AuthorDate: Wed Oct 17 23:45:02 2012 +0200
Commit: Alex Neundorf 
CommitDate: Wed Oct 17 23:45:02 2012 +0200

Eclipse: add switch to disable linked resources (#13189)

Eclipse may get confused by these linked resources, because it sees
the same source file multiple times then and doesn't recognize
that it's the same file actually.

Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake 
b/Modules/CMakeFindEclipseCDT4.cmake
index 37b72fa..ae17454 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -77,6 +77,8 @@ endif()
 # This variable is used by the Eclipse generator and appended to the make 
invocation commands.
 set(CMAKE_ECLIPSE_MAKE_ARGUMENTS "${_CMAKE_ECLIPSE_INITIAL_MAKE_ARGS}" CACHE 
STRING "Additional command line arguments when Eclipse invokes make. Enter e.g. 
-j to get parallel builds")
 
+set(CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES TRUE CACHE BOOL "If disabled, 
CMake will not generate linked resource to the subprojects and to the source 
files within targets")
+
 # This variable is used by the Eclipse generator in out-of-source builds only.
 set(CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT FALSE CACHE BOOL "If enabled, CMake 
will generate a source project for Eclipse in CMAKE_SOURCE_DIR")
 mark_as_advanced(CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT)
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 689f213..ca7379e 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -38,6 +38,7 @@ cmExtraEclipseCDT4Generator
   this->SupportedGlobalGenerators.push_back("Unix Makefiles");
 
   this->SupportsVirtualFolders = true;
+  this->GenerateLinkedResources = true;
 }
 
 //
@@ -83,6 +84,9 @@ void cmExtraEclipseCDT4Generator::Generate()
   this->HomeDirectory   = mf->GetHomeDirectory();
   this->HomeOutputDirectory = mf->GetHomeOutputDirectory();
 
+  this->GenerateLinkedResources = mf->IsOn(
+"CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES");
+
   this->IsOutOfSourceBuild = (this->HomeDirectory!=this->HomeOutputDirectory);
 
   this->GenerateSourceProject = (this->IsOutOfSourceBuild &&
@@ -501,6 +505,10 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
   linkName2 += ti->first;
   this->AppendLinkedResource(fout, linkName2, "virtual:/virtual",
  VirtualFolder);
+  if (!this->GenerateLinkedResources)
+{
+break; // skip generating the linked resources to the source files
+}
   std::vector sourceGroups=makefile->GetSourceGroups();
   // get the files from the source lists then add them to the groups
   cmTarget* tgt = const_cast(&ti->second);
@@ -555,6 +563,11 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
 void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
cmGeneratedFileStream& fout, const std::string& baseDir)
 {
+  if (!this->GenerateLinkedResources)
+{
+return;
+}
+
   // for each sub project create a linked resource to the source dir
   // - only if it is an out-of-source build
   this->AppendLinkedResource(fout, "[Subprojects]",
diff --git a/Source/cmExtraEclipseCDT4Generator.h 
b/Source/cmExtraEclipseCDT4Generator.h
index 37ce65e..31ad68d 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Genera

[Cmake-commits] CMake branch, next, updated. v2.8.9-1085-g316f5b0

[Alexander Neundorf]

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  316f5b036fb9ebe3dd444c103b1388111754faa7 (commit)
   via  3446cb514bd2a4fd8538fd62ee9cf674268657d6 (commit)
  from  2052bd49ea88f13900429bdfd22a0e66549a5984 (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=316f5b036fb9ebe3dd444c103b1388111754faa7
commit 316f5b036fb9ebe3dd444c103b1388111754faa7
Merge: 2052bd4 3446cb5
Author: Alexander Neundorf 
AuthorDate: Sun Oct 14 15:19:03 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Oct 14 15:19:03 2012 -0400

Merge topic 'AutomocFixDuplicatedFiles_13572' into next

3446cb5 Automoc: fix #13572: issue with symbolic links


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3446cb514bd2a4fd8538fd62ee9cf674268657d6
commit 3446cb514bd2a4fd8538fd62ee9cf674268657d6
Author: Alex Neundorf 
AuthorDate: Sun Oct 14 21:16:25 2012 +0200
Commit: Alex Neundorf 
CommitDate: Sun Oct 14 21:16:25 2012 +0200

Automoc: fix #13572: issue with symbolic links

Now automoc always uses GetRealPath() so symbolic links are always
resolved and it doesn't end up with twice the same file, once with the real
path and once with the symlinked path in some setups where the source dir
can be accessed directly and via a symlink

Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 68f1046..942c7ab 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -170,7 +170,8 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
   ++fileIt)
 {
 cmSourceFile* sf = *fileIt;
-std::string absFile = sf->GetFullPath();
+std::string absFile = cmsys::SystemTools::GetRealPath(
+sf->GetFullPath().c_str());
 bool skip = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC"));
 bool generated = cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"));
 

---

Summary of changes:
 Source/cmQtAutomoc.cxx |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.9-1010-g9a29139

[Alexander Neundorf]

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  9a291392946a9777a23f4d9ad6af757b00ed8f81 (commit)
   via  e2b1630830201b3021dff19a3c98c4601693f269 (commit)
  from  8a51466bbe4ad4768c42ba032149534fe003b68f (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=9a291392946a9777a23f4d9ad6af757b00ed8f81
commit 9a291392946a9777a23f4d9ad6af757b00ed8f81
Merge: 8a51466 e2b1630
Author: Alexander Neundorf 
AuthorDate: Thu Oct 4 15:56:19 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Oct 4 15:56:19 2012 -0400

Merge topic 'DocumentCMakeFindPackageName' into next

e2b1630 Document CMAKE_FIND_PACKAGE_NAME


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2b1630830201b3021dff19a3c98c4601693f269
commit e2b1630830201b3021dff19a3c98c4601693f269
Author: Alex Neundorf 
AuthorDate: Thu Oct 4 21:54:40 2012 +0200
Commit: Alex Neundorf 
CommitDate: Thu Oct 4 21:54:40 2012 +0200

Document CMAKE_FIND_PACKAGE_NAME

Alex

diff --git a/Modules/readme.txt b/Modules/readme.txt
index 4818031..9dc1c6a 100644
--- a/Modules/readme.txt
+++ b/Modules/readme.txt
@@ -127,6 +127,9 @@ If neither the QUIET nor REQUIRED options are given then the
 FindXXX.cmake module should look for the package and complain without
 error if the module is not found.
 
+FIND_PACKAGE() will set the variable CMAKE_FIND_PACKAGE_NAME to
+contain the actual name of the package.
+
 A package can provide sub-components.
 Those components can be listed after the COMPONENTS (or REQUIRED)
 or OPTIONAL_COMPONENTS keywords.  The set of all listed components will be

---

Summary of changes:
 Modules/readme.txt |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.9-790-g0f123bc

[Alexander Neundorf]

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  0f123bc3fc1f176847c8bdf59e8e47f7341273e9 (commit)
   via  8e5b352c3bfd548c6ce15ae47a98b6b3fb4de977 (commit)
  from  0c88091715f950da9a63e58a5b418dc44d6fdf29 (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=0f123bc3fc1f176847c8bdf59e8e47f7341273e9
commit 0f123bc3fc1f176847c8bdf59e8e47f7341273e9
Merge: 0c88091 8e5b352
Author: Alexander Neundorf 
AuthorDate: Wed Sep 26 12:51:33 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Sep 26 12:51:33 2012 -0400

Merge topic 'export-sets-2' into next

8e5b352 fix warning about missing newline at end of file


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e5b352c3bfd548c6ce15ae47a98b6b3fb4de977
commit 8e5b352c3bfd548c6ce15ae47a98b6b3fb4de977
Author: Alex Neundorf 
AuthorDate: Wed Sep 26 18:50:22 2012 +0200
Commit: Alex Neundorf 
CommitDate: Wed Sep 26 18:50:22 2012 +0200

fix warning about missing newline at end of file

Alex

diff --git a/Source/cmExportSetMap.cxx b/Source/cmExportSetMap.cxx
index 1f6377c..96fdb3e 100644
--- a/Source/cmExportSetMap.cxx
+++ b/Source/cmExportSetMap.cxx
@@ -31,4 +31,4 @@ cmExportSetMap::~cmExportSetMap()
 {
 delete it->second;
 }
-}
\ No newline at end of file
+}

---

Summary of changes:
 Source/cmExportSetMap.cxx |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.9-737-g2d35bdc

[Alexander Neundorf]

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  2d35bdc1373a67ead6ded0110a6b0984daf0d5bd (commit)
   via  fd5a92f744c2e36a9f442dd45f3a6f051b543ca8 (commit)
   via  403bb6c18034176a23472604426933a6880892ec (commit)
  from  8a5434bf3d46377984c7eb416c6ae473b8028cb7 (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=2d35bdc1373a67ead6ded0110a6b0984daf0d5bd
commit 2d35bdc1373a67ead6ded0110a6b0984daf0d5bd
Merge: 8a5434b fd5a92f
Author: Alexander Neundorf 
AuthorDate: Tue Sep 25 13:20:58 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 25 13:20:58 2012 -0400

Merge topic 'export-sets-2' into next

fd5a92f fix build with MSVC6: it seems it doesn't like deleting const 
pointers
403bb6c fix warning about missing newline at end of file


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd5a92f744c2e36a9f442dd45f3a6f051b543ca8
commit fd5a92f744c2e36a9f442dd45f3a6f051b543ca8
Author: Alex Neundorf 
AuthorDate: Tue Sep 25 19:19:27 2012 +0200
Commit: Alex Neundorf 
CommitDate: Tue Sep 25 19:19:27 2012 +0200

fix build with MSVC6: it seems it doesn't like deleting const pointers

Alex

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 06ef2f3..fd93791 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -286,7 +286,7 @@ std::vector 
cmExportFileGenerator::FindNamespaces(cmMakefile* mf,
   ++expIt)
 {
 const cmExportSet* exportSet = expIt->second;
-std::vector const* targets =
+std::vector const* targets =
  exportSet->GetTargetExports();
 
 bool containsTarget = false;
diff --git a/Source/cmExportInstallFileGenerator.cxx 
b/Source/cmExportInstallFileGenerator.cxx
index 94b9f46..cd05e60 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -37,7 +37,7 @@ std::string 
cmExportInstallFileGenerator::GetConfigImportFileGlob()
 bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 {
   // Create all the imported targets.
-  for(std::vector::const_iterator
+  for(std::vector::const_iterator
 tei = this->IEGen->GetExportSet()->GetTargetExports()->begin();
   tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
 {
@@ -163,7 +163,7 @@ cmExportInstallFileGenerator
 }
 
   // Add each target in the set to the export.
-  for(std::vector::const_iterator
+  for(std::vector::const_iterator
 tei = this->IEGen->GetExportSet()->GetTargetExports()->begin();
   tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
 {
diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx
index 464ad68..33b0630 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -21,7 +21,7 @@ cmExportSet::~cmExportSet()
 }
 }
 
-void cmExportSet::AddTargetExport(cmTargetExport const* te)
+void cmExportSet::AddTargetExport(cmTargetExport* te)
 {
   this->TargetExports.push_back(te);
 }
diff --git a/Source/cmExportSet.h b/Source/cmExportSet.h
index 91a8bf9..a57aa12 100644
--- a/Source/cmExportSet.h
+++ b/Source/cmExportSet.h
@@ -25,20 +25,20 @@ public:
   /// Destructor
   ~cmExportSet();
 
-  void AddTargetExport(cmTargetExport const* tgt);
+  void AddTargetExport(cmTargetExport* tgt);
 
   void AddInstallation(cmInstallExportGenerator const* installation);
 
   std::string const& GetName() const { return this->Name; }
 
-  std::vector const* GetTargetExports() const
+  std::vector const* GetTargetExports() const
  { return &this->TargetExports; }
 
   std::vector const* GetInstallations() const
  { return &this->Installations; }
 
 private:
-  std::vector TargetExports;
+  std::vector TargetExports;
   std::string Name;
   std::vector Installations;
 };

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=403bb6c18034176a23472604426933a6880892ec
commit 403bb6c18034176a23472604426933a6880892ec
Author: Alex Neundorf 
AuthorDate: Tue Sep 25 19:15:27 2012 +0200
Commit: Alex Neundorf 
CommitDate: Tue Sep 25 19:15:27 2012 +0200

fix warning about missing newline at end of file

Alex

diff --git a/Source/cmExportSetMap.h b/Source/cmExportSetMap.h
index 043639d..4663c55 100644
--- a/Source/cmExportSetMap.h
+++ b/Source/cmExportSetMap.h
@@ -30,4 +30,4 @@ public:
   ~cmExportSetMap();
 };
 
-#endif
\ No newline at end of file
+#endif

---

[Cmake-commits] CMake branch, next, updated. v2.8.9-734-g8a5434b

[Alexander Neundorf]

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  8a5434bf3d46377984c7eb416c6ae473b8028cb7 (commit)
   via  a967091ca67baa539417116a0d21edd2f2787dfe (commit)
  from  74a913f3f6235c6b6fb726145ea874da87e71ee7 (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=8a5434bf3d46377984c7eb416c6ae473b8028cb7
commit 8a5434bf3d46377984c7eb416c6ae473b8028cb7
Merge: 74a913f a967091
Author: Alexander Neundorf 
AuthorDate: Mon Sep 24 17:05:08 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 24 17:05:08 2012 -0400

Merge topic 'export-sets-2' into next

a967091 fix warning about int sizes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a967091ca67baa539417116a0d21edd2f2787dfe
commit a967091ca67baa539417116a0d21edd2f2787dfe
Author: Alex Neundorf 
AuthorDate: Mon Sep 24 23:04:24 2012 +0200
Commit: Alex Neundorf 
CommitDate: Mon Sep 24 23:04:24 2012 +0200

fix warning about int sizes

Alex

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index bedc164..06ef2f3 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -234,7 +234,7 @@ cmExportFileGenerator
   else
 {
 std::vector namespaces = this->FindNamespaces(mf, *li);
-size_t targetOccurrences = namespaces.size();
+int targetOccurrences = (int)namespaces.size();
 
 if (targetOccurrences == 1)
   {

---

Summary of changes:
 Source/cmExportFileGenerator.cxx |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.9-732-g74a913f

[Alexander Neundorf]

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  74a913f3f6235c6b6fb726145ea874da87e71ee7 (commit)
   via  35510e016dec5b8ba582f4665feeef32f9606bb8 (commit)
  from  adeca53e570ec4c17d3e23d95e95518ef500fa7d (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=74a913f3f6235c6b6fb726145ea874da87e71ee7
commit 74a913f3f6235c6b6fb726145ea874da87e71ee7
Merge: adeca53 35510e0
Author: Alexander Neundorf 
AuthorDate: Mon Sep 24 16:46:00 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 24 16:46:00 2012 -0400

Merge topic 'export-sets-2' into next

35510e0 fix MSVC warning about class forward declaration of a struct


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35510e016dec5b8ba582f4665feeef32f9606bb8
commit 35510e016dec5b8ba582f4665feeef32f9606bb8
Author: Alex Neundorf 
AuthorDate: Mon Sep 24 22:44:56 2012 +0200
Commit: Alex Neundorf 
CommitDate: Mon Sep 24 22:44:56 2012 +0200

fix MSVC warning about class forward declaration of a struct

Alex

diff --git a/Source/cmTargetExport.h b/Source/cmTargetExport.h
index 919d4a9..c9d87fb 100644
--- a/Source/cmTargetExport.h
+++ b/Source/cmTargetExport.h
@@ -20,8 +20,9 @@ class cmInstallFilesGenerator;
  *
  * This struct holds pointers to target and all relevant generators.
  */
-struct cmTargetExport
+class cmTargetExport
 {
+public:
   cmTarget* Target; ///< The target
 
   ///@name Generators

---

Summary of changes:
 Source/cmTargetExport.h |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.9-730-gadeca53

[Alexander Neundorf]

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  adeca53e570ec4c17d3e23d95e95518ef500fa7d (commit)
   via  a3a37956edfe311c5ea23ba3dfe01a86e7240f25 (commit)
  from  7a1c7d965874c5a4c2b9de9eca5234e7a54fa734 (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=adeca53e570ec4c17d3e23d95e95518ef500fa7d
commit adeca53e570ec4c17d3e23d95e95518ef500fa7d
Merge: 7a1c7d9 a3a3795
Author: Alexander Neundorf 
AuthorDate: Mon Sep 24 16:42:55 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 24 16:42:55 2012 -0400

Merge topic 'export-sets-2' into next

a3a3795 fix warning about int sizes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3a37956edfe311c5ea23ba3dfe01a86e7240f25
commit a3a37956edfe311c5ea23ba3dfe01a86e7240f25
Author: Alex Neundorf 
AuthorDate: Mon Sep 24 22:42:04 2012 +0200
Commit: Alex Neundorf 
CommitDate: Mon Sep 24 22:42:04 2012 +0200

fix warning about int sizes

Alex

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index ab8afdc..bedc164 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -234,7 +234,7 @@ cmExportFileGenerator
   else
 {
 std::vector namespaces = this->FindNamespaces(mf, *li);
-unsigned int targetOccurrences = namespaces.size();
+size_t targetOccurrences = namespaces.size();
 
 if (targetOccurrences == 1)
   {

---

Summary of changes:
 Source/cmExportFileGenerator.cxx |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.9-628-gf797cb2

[Alexander Neundorf]

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  f797cb296dd31e22b9c010fec931035a4902dbe7 (commit)
   via  ea12871241e1a943be75e7c987f71f54ec3f3908 (commit)
   via  894e91a9457800d729f079ec3842e0d0e34b5a50 (commit)
   via  825d1abf14f8ad880c7e2b3207881b06c43385a6 (commit)
  from  26c369fd9d66ddaeca9eed272c6bf9aad6ddc6b5 (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=f797cb296dd31e22b9c010fec931035a4902dbe7
commit f797cb296dd31e22b9c010fec931035a4902dbe7
Merge: 26c369f ea12871
Author: Alexander Neundorf 
AuthorDate: Wed Sep 19 11:39:20 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Sep 19 11:39:20 2012 -0400

Merge topic 'AutomocUseTargetProperties' into next

ea12871 Automoc: also the makefile-COMPILE_DEFINITIONS
894e91a Automoc: do not use DEFINITIONS, but only COMPILE_DEFINITIONS
825d1ab Automoc: fix #13493, use target properties for include dirs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea12871241e1a943be75e7c987f71f54ec3f3908
commit ea12871241e1a943be75e7c987f71f54ec3f3908
Author: Alex Neundorf 
AuthorDate: Thu Sep 6 22:22:16 2012 +0200
Commit: Alex Neundorf 
CommitDate: Thu Sep 6 22:22:16 2012 +0200

Automoc: also the makefile-COMPILE_DEFINITIONS

Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 8365766..386a3bf 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -209,6 +209,12 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
 
   const char* tmp = target->GetProperty("COMPILE_DEFINITIONS");
   std::string _moc_compile_defs = (tmp!=0 ? tmp : "");
+  tmp = makefile->GetProperty("COMPILE_DEFINITIONS");
+  if (tmp)
+{
+_moc_compile_defs += ";";
+_moc_compile_defs += tmp;
+}
   tmp = target->GetProperty("AUTOMOC_MOC_OPTIONS");
   std::string _moc_options = (tmp!=0 ? tmp : "");
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=894e91a9457800d729f079ec3842e0d0e34b5a50
commit 894e91a9457800d729f079ec3842e0d0e34b5a50
Author: Alex Neundorf 
AuthorDate: Wed Sep 5 22:13:30 2012 +0200
Commit: Alex Neundorf 
CommitDate: Wed Sep 5 22:13:30 2012 +0200

Automoc: do not use DEFINITIONS, but only COMPILE_DEFINITIONS

The docs say that this is for cmake 2.4 backwards compatibility only,
so we probably don't need to support it.

Alex

diff --git a/Modules/AutomocInfo.cmake.in b/Modules/AutomocInfo.cmake.in
index 13f2161..640bf70 100644
--- a/Modules/AutomocInfo.cmake.in
+++ b/Modules/AutomocInfo.cmake.in
@@ -1,7 +1,6 @@
 set(AM_SOURCES @_moc_files@ )
 set(AM_HEADERS @_moc_headers@ )
 set(AM_MOC_COMPILE_DEFINITIONS @_moc_compile_defs@)
-set(AM_MOC_DEFINITIONS @_moc_defs@)
 set(AM_MOC_INCLUDES @_moc_incs@)
 set(AM_MOC_OPTIONS @_moc_options@)
 set(AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE 
"@CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE@")
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index a5ae4c0..8365766 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -207,9 +207,7 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
 _moc_incs += *incDirIt;
 }
 
-  const char* tmp = makefile->GetProperty("DEFINITIONS");
-  std::string _moc_defs = (tmp!=0 ? tmp : "");
-  tmp = target->GetProperty("COMPILE_DEFINITIONS");
+  const char* tmp = target->GetProperty("COMPILE_DEFINITIONS");
   std::string _moc_compile_defs = (tmp!=0 ? tmp : "");
   tmp = target->GetProperty("AUTOMOC_MOC_OPTIONS");
   std::string _moc_options = (tmp!=0 ? tmp : "");
@@ -222,8 +220,6 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
   cmLocalGenerator::EscapeForCMake(automocTargetName.c_str()).c_str());
   makefile->AddDefinition("_moc_incs",
   cmLocalGenerator::EscapeForCMake(_moc_incs.c_str()).c_str());
-  makefile->AddDefinition("_moc_defs",
-  cmLocalGenerator::EscapeForCMake(_moc_defs.c_str()).c_str());
   makefile->AddDefinition("_moc_compile_defs",
   cmLocalGenerator::EscapeForCMake(_moc_compile_defs.c_str()).c_str());
   makefile->AddDefinition("_moc_options",
@@ -326,7 +322,6 @@ bool cmQtAutomoc::ReadAutomocInfoFile(cmMakefile* makefile,
   this->MocExecutable = makefile->GetSafeDefinition("AM_QT_MOC_EXECUTABLE");
   this->MocCompileDefinitionsStr = makefile->GetSafeDefinition(
  &quo

[Cmake-commits] CMake branch, next, updated. v2.8.9-357-gbbad3d0

[Alexander Neundorf]

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  bbad3d0946f72c3cd86e00d7de1bbccfe9d87c44 (commit)
   via  e2d317052b2bbdede263f693ecde4a86a6149abf (commit)
  from  ed59e13b0f44cfe482093a5b10548e11bf5ff06d (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=bbad3d0946f72c3cd86e00d7de1bbccfe9d87c44
commit bbad3d0946f72c3cd86e00d7de1bbccfe9d87c44
Merge: ed59e13 e2d3170
Author: Alexander Neundorf 
AuthorDate: Tue Sep 4 15:11:52 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 4 15:11:52 2012 -0400

Merge topic 'FortranCrossCompiling3' into next

e2d3170 CMakeDetermineFortranCompiler: add support for cross-compiling 
(#13379)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2d317052b2bbdede263f693ecde4a86a6149abf
commit e2d317052b2bbdede263f693ecde4a86a6149abf
Author: Alex Neundorf 
AuthorDate: Tue Sep 4 21:10:02 2012 +0200
Commit: Alex Neundorf 
CommitDate: Tue Sep 4 21:10:02 2012 +0200

CMakeDetermineFortranCompiler: add support for cross-compiling (#13379)

This adds the same support code for cross compiling to
CMakeDetermineFortranCompiler as there is already in the
C and CXX versions of this file.

Alex

diff --git a/Modules/CMakeDetermineFortranCompiler.cmake 
b/Modules/CMakeDetermineFortranCompiler.cmake
index 051f832..1828988 100644
--- a/Modules/CMakeDetermineFortranCompiler.cmake
+++ b/Modules/CMakeDetermineFortranCompiler.cmake
@@ -134,6 +134,10 @@ else()
 )
 endif()
 
+if (NOT _CMAKE_TOOLCHAIN_LOCATION)
+  get_filename_component(_CMAKE_TOOLCHAIN_LOCATION "${CMAKE_Fortran_COMPILER}" 
PATH)
+endif ()
+
 # Build a small source file to identify the compiler.
 if(NOT CMAKE_Fortran_COMPILER_ID_RUN)
   set(CMAKE_Fortran_COMPILER_ID_RUN 1)
@@ -189,6 +193,28 @@ if(NOT CMAKE_Fortran_COMPILER_ID_RUN)
   endif()
 endif()
 
+# if we have a fortran cross compiler, they have usually some prefix, like
+# e.g. powerpc-linux-gfortran, arm-elf-gfortran or i586-mingw32msvc-gfortran , 
optionally
+# with a 3-component version number at the end (e.g. arm-eabi-gcc-4.5.2).
+# The other tools of the toolchain usually have the same prefix
+# NAME_WE cannot be used since then this test will fail for names lile
+# "arm-unknown-nto-qnx6.3.0-gcc.exe", where BASENAME would be
+# "arm-unknown-nto-qnx6" instead of the correct "arm-unknown-nto-qnx6.3.0-"
+if (CMAKE_CROSSCOMPILING
+AND "${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU"
+AND NOT _CMAKE_TOOLCHAIN_PREFIX)
+  get_filename_component(COMPILER_BASENAME "${CMAKE_Fortran_COMPILER}" NAME)
+  if (COMPILER_BASENAME MATCHES 
"^(.+-)g?fortran(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
+set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
+  endif ()
+
+  # if "llvm-" is part of the prefix, remove it, since llvm doesn't have its 
own binutils
+  # but uses the regular ar, objcopy, etc. (instead of llvm-objcopy etc.)
+  if ("${_CMAKE_TOOLCHAIN_PREFIX}" MATCHES "(.+-)?llvm-$")
+set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
+  endif ()
+endif ()
+
 include(CMakeFindBinUtils)
 
 if(MSVC_Fortran_ARCHITECTURE_ID)

---

Summary of changes:
 Modules/CMakeDetermineFortranCompiler.cmake |   26 ++
 1 files changed, 26 insertions(+), 0 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.9-294-g32ac5fa

[Alexander Neundorf]

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  32ac5fae5162991451241a20e83c78c15c36f2c2 (commit)
   via  b001b6e129134e88dc958cecbcd4c326e8daf36a (commit)
  from  6e6604d9797438c86e57936ddaba25108eda4fde (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=32ac5fae5162991451241a20e83c78c15c36f2c2
commit 32ac5fae5162991451241a20e83c78c15c36f2c2
Merge: 6e6604d b001b6e
Author: Alexander Neundorf 
AuthorDate: Mon Aug 27 16:08:03 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 27 16:08:03 2012 -0400

Merge topic 'AutomocRerunFix' into next

b001b6e fix #13494: rerun automoc also if include dirs or moc options change


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b001b6e129134e88dc958cecbcd4c326e8daf36a
commit b001b6e129134e88dc958cecbcd4c326e8daf36a
Author: Alex Neundorf 
AuthorDate: Mon Aug 27 21:39:50 2012 +0200
Commit: Alex Neundorf 
CommitDate: Mon Aug 27 21:39:50 2012 +0200

fix #13494: rerun automoc also if include dirs or moc options change

Until now it was only rerun if the compile definitions changed, but
of course it also has to rerun if the include dirs or moc options
change. Strange that I didn't notice this before...

Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 65ecdf7..71feffd 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -321,12 +321,31 @@ bool cmQtAutomoc::ReadAutomocInfoFile(cmMakefile* 
makefile,
   this->ProjectSourceDir = makefile->GetSafeDefinition("AM_CMAKE_SOURCE_DIR");
   this->TargetName = makefile->GetSafeDefinition("AM_TARGET_NAME");
 
+  this->CurrentCompileSettingsStr = this->MakeCompileSettingsString(makefile);
+
   this->RelaxedMode = makefile->IsOn("AM_RELAXED_MODE");
 
   return true;
 }
 
 
+std::string cmQtAutomoc::MakeCompileSettingsString(cmMakefile* makefile)
+{
+  std::string s;
+  s += makefile->GetSafeDefinition("AM_MOC_DEFINITIONS");
+  s += " ~~~ ";
+  s += makefile->GetSafeDefinition("AM_MOC_INCLUDES");
+  s += " ~~~ ";
+  s += makefile->GetSafeDefinition("AM_MOC_OPTIONS");
+  s += " ~~~ ";
+  s += makefile->IsOn("AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE") ? "TRUE"
+ : "FALSE";
+  s += " ~~~ ";
+
+  return s;
+}
+
+
 bool cmQtAutomoc::ReadOldMocDefinitionsFile(cmMakefile* makefile,
 const char* targetDirectory)
 {
@@ -336,8 +355,8 @@ bool cmQtAutomoc::ReadOldMocDefinitionsFile(cmMakefile* 
makefile,
 
   if (makefile->ReadListFile(0, filename.c_str()))
 {
-this->OldMocDefinitionsStr =
- makefile->GetSafeDefinition("AM_OLD_MOC_DEFINITIONS");
+this->OldCompileSettingsStr =
+makefile->GetSafeDefinition("AM_OLD_COMPILE_SETTINGS");
 }
   return true;
 }
@@ -352,9 +371,9 @@ void cmQtAutomoc::WriteOldMocDefinitionsFile(const char* 
targetDirectory)
   std::fstream outfile;
   outfile.open(filename.c_str(),
std::ios::out | std::ios::trunc);
-  outfile << "set(AM_OLD_MOC_DEFINITIONS "
+  outfile << "set(AM_OLD_COMPILE_SETTINGS "
   << cmLocalGenerator::EscapeForCMake(
-   this->Join(this->MocDefinitions, ' ').c_str()) << ")\n";
+ this->CurrentCompileSettingsStr.c_str()) << ")\n";
 
   outfile.close();
 }
@@ -471,7 +490,7 @@ void cmQtAutomoc::Init()
 bool cmQtAutomoc::RunAutomoc()
 {
   if (!cmsys::SystemTools::FileExists(this->OutMocCppFilename.c_str())
-|| (this->OldMocDefinitionsStr != this->Join(this->MocDefinitions, ' ')))
+|| (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr))
 {
 this->GenerateAll = true;
 }
diff --git a/Source/cmQtAutomoc.h b/Source/cmQtAutomoc.h
index 8cbbac1..f6d72e2 100644
--- a/Source/cmQtAutomoc.h
+++ b/Source/cmQtAutomoc.h
@@ -35,6 +35,8 @@ private:
  const char* targetDirectory);
   void WriteOldMocDefinitionsFile(const char* targetDirectory);
 
+  std::string MakeCompileSettingsString(cmMakefile* makefile);
+
   bool RunAutomoc();
   bool GenerateMoc(const std::string& sourceFile,
const std::string& mocFileName);
@@ -74,7 +76,8 @@ private:
   std::str

[Cmake-commits] CMake branch, next, updated. v2.8.9-292-g6e6604d

[Alexander Neundorf]

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  6e6604d9797438c86e57936ddaba25108eda4fde (commit)
   via  95e502ee7c9c751d308f5685f048ba1b555cc038 (commit)
  from  19fa7dcb0a78cbab0f5aebb1b38883b3c24b4c2f (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=6e6604d9797438c86e57936ddaba25108eda4fde
commit 6e6604d9797438c86e57936ddaba25108eda4fde
Merge: 19fa7dc 95e502e
Author: Alexander Neundorf 
AuthorDate: Mon Aug 27 14:50:33 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 27 14:50:33 2012 -0400

Merge topic 'ErrorIfCTEST_USE_LAUNCHERSSetButLauncherRuleNotSet' into next

95e502e error out if CTEST_USE_LAUNCHERS is TRUE but RULE_LAUNCH_* are not 
set


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95e502ee7c9c751d308f5685f048ba1b555cc038
commit 95e502ee7c9c751d308f5685f048ba1b555cc038
Author: Alex Neundorf 
AuthorDate: Mon Aug 20 23:19:44 2012 +0200
Commit: Alex Neundorf 
CommitDate: Mon Aug 20 23:19:44 2012 +0200

error out if CTEST_USE_LAUNCHERS is TRUE but RULE_LAUNCH_* are not set

Otherwise, CTEST_USE_LAUNCHERS can be set to true in a driving ctest
script, and everything looks like it would work and reports 0 build errors,
but actually there can be any amount of errors and they are just not 
reported.
By adding this check cmake now errors out if CTEST_USE_LAUNCHERS is 
enabled, but
the RULE properties are not set, which would lead to a not-working ctest 
run.

Alex

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 75aa471..08c2329 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2326,6 +2326,17 @@ int cmake::ActualConfigure()
 this->CacheManager->RemoveCacheEntry("CMAKE_GENERATOR");
 this->CacheManager->RemoveCacheEntry("CMAKE_EXTRA_GENERATOR");
 }
+
+  cmMakefile* mf=this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+  if (mf->IsOn("CTEST_USE_LAUNCHERS")
+  && !this->GetProperty("RULE_LAUNCH_COMPILE", cmProperty::GLOBAL))
+{
+cmSystemTools::Error("CTEST_USE_LAUNCHERS is enabled, but the "
+"RULE_LAUNCH_COMPILE global property is not defined.\n"
+"Did you forget to include(CTest) in the toplevel "
+ "CMakeLists.txt ?");
+}
+
   // only save the cache if there were no fatal errors
   if ( this->GetWorkingMode() == NORMAL_MODE )
 {

---

Summary of changes:
 Source/cmake.cxx |   11 +++
 1 files changed, 11 insertions(+), 0 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.9-158-g4472d32

[Alexander Neundorf]

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  4472d32c7dc2ed9981fe9d0d6a4a89abeebbe9d1 (commit)
   via  8aed02ae0f753dce76a167367ecf54be1d04de2b (commit)
   via  7ae4479d655b567d0e2c67e6bdab2580a5c3d4ea (commit)
  from  e1610afa52e341631038f5e524533a2ea0e60344 (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=4472d32c7dc2ed9981fe9d0d6a4a89abeebbe9d1
commit 4472d32c7dc2ed9981fe9d0d6a4a89abeebbe9d1
Merge: e1610af 8aed02a
Author: Alexander Neundorf 
AuthorDate: Mon Aug 20 15:39:34 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 20 15:39:34 2012 -0400

Merge topic 'DependencyScanning_13474' into next

8aed02a -fix Java dependency scanning, broken in previous commit
7ae4479 -fix line length


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8aed02ae0f753dce76a167367ecf54be1d04de2b
commit 8aed02ae0f753dce76a167367ecf54be1d04de2b
Author: Alex Neundorf 
AuthorDate: Mon Aug 20 21:37:26 2012 +0200
Commit: Alex Neundorf 
CommitDate: Mon Aug 20 21:37:26 2012 +0200

-fix Java dependency scanning, broken in previous commit

Alex

diff --git a/Source/cmDependsJava.cxx b/Source/cmDependsJava.cxx
index 1d84914..ba0e8fb 100644
--- a/Source/cmDependsJava.cxx
+++ b/Source/cmDependsJava.cxx
@@ -38,7 +38,7 @@ bool cmDependsJava::WriteDependencies(const char *src, const 
char *,
   return true;
 }
 
-bool cmDependsJava::CheckDependencies(std::istream&,
+bool cmDependsJava::CheckDependencies(std::istream&, const char*,
  std::map&)
 {
   return true;
diff --git a/Source/cmDependsJava.h b/Source/cmDependsJava.h
index fe6fef5..bf7e234 100644
--- a/Source/cmDependsJava.h
+++ b/Source/cmDependsJava.h
@@ -32,7 +32,8 @@ protected:
   virtual bool WriteDependencies(const char *src, const char *file,
 std::ostream& makeDepends, std::ostream& internalDepends);
   virtual bool CheckDependencies(std::istream& internalDepends,
-  std::map& validDeps);
+ const char* internalDependsFileName,
+   std::map& validDeps);
 
 private:
   cmDependsJava(cmDependsJava const&); // Purposely not implemented.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ae4479d655b567d0e2c67e6bdab2580a5c3d4ea
commit 7ae4479d655b567d0e2c67e6bdab2580a5c3d4ea
Author: Alex Neundorf 
AuthorDate: Mon Aug 20 21:23:20 2012 +0200
Commit: Alex Neundorf 
CommitDate: Mon Aug 20 21:23:20 2012 +0200

-fix line length

Alex

diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx
index 5a48f7f..166a584 100644
--- a/Source/cmDepends.cxx
+++ b/Source/cmDepends.cxx
@@ -243,8 +243,8 @@ bool cmDepends::CheckDependencies(std::istream& 
internalDepends,
 // The dependee exists, but the depender doesn't. Regenerate if the
 // internalDepends file is older than the dependee.
 int result = 0;
-if((!this->FileComparison->FileTimeCompare(internalDependsFileName, 
dependee,
-  &result) || result < 0))
+if((!this->FileComparison->FileTimeCompare(internalDependsFileName,
+ dependee, &result) || result < 0))
   {
   // The depends-file is older than the dependee.
   regenerate = true;

---

Summary of changes:
 Source/cmDepends.cxx |4 ++--
 Source/cmDependsJava.cxx |2 +-
 Source/cmDependsJava.h   |3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.9-138-gf9c04e2

[Alexander Neundorf]

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  f9c04e2f1738d06b4a23549b32f5a7a6e708abcc (commit)
   via  87fe4286bdb3f4faffbc603697b4a6f3343fb4ec (commit)
  from  f8133bf98febcd02690548edfbe476aaabdd0623 (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=f9c04e2f1738d06b4a23549b32f5a7a6e708abcc
commit f9c04e2f1738d06b4a23549b32f5a7a6e708abcc
Merge: f8133bf 87fe428
Author: Alexander Neundorf 
AuthorDate: Fri Aug 17 16:41:42 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Aug 17 16:41:42 2012 -0400

Merge topic 'DependencyScanning_13474' into next

87fe428 fix #13474: also rescan dependencies if the depender does not exist


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87fe4286bdb3f4faffbc603697b4a6f3343fb4ec
commit 87fe4286bdb3f4faffbc603697b4a6f3343fb4ec
Author: Alex Neundorf 
AuthorDate: Thu Aug 16 22:46:33 2012 +0200
Commit: Alex Neundorf 
CommitDate: Fri Aug 17 22:38:38 2012 +0200

fix #13474: also rescan dependencies if the depender does not exist

If the depender (e.g. foo.o) does not exist, also rescan dependencies if
one of the dependees (e.g. foo.cxx) is older than the already existing
depend.internal file, since this means it can be out of date.

Alex

diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx
index 545fe97..5a48f7f 100644
--- a/Source/cmDepends.cxx
+++ b/Source/cmDepends.cxx
@@ -98,7 +98,7 @@ bool cmDepends::Check(const char *makeFile, const char 
*internalFile,
   // Check whether dependencies must be regenerated.
   bool okay = true;
   std::ifstream fin(internalFile);
-  if(!(fin && this->CheckDependencies(fin, validDeps)))
+  if(!(fin && this->CheckDependencies(fin, internalFile, validDeps)))
 {
 // Clear all dependencies so they will be regenerated.
 this->Clear(makeFile);
@@ -143,6 +143,7 @@ bool cmDepends::WriteDependencies(const char*, const char*,
 
 //
 bool cmDepends::CheckDependencies(std::istream& internalDepends,
+  const char* internalDependsFileName,
 std::map& validDeps)
 {
   // Parse dependencies from the stream.  If any dependee is missing
@@ -186,8 +187,11 @@ bool cmDepends::CheckDependencies(std::istream& 
internalDepends,
   }
   */
 
-// Dependencies must be regenerated if the dependee does not exist
-// or if the depender exists and is older than the dependee.
+// Dependencies must be regenerated
+// * if the dependee does not exist
+// * if the depender exists and is older than the dependee.
+// * if the depender does not exist, but the dependee is newer than the
+//   depends file
 bool regenerate = false;
 const char* dependee = this->Dependee+1;
 const char* depender = this->Depender;
@@ -211,24 +215,49 @@ bool cmDepends::CheckDependencies(std::istream& 
internalDepends,
 cmSystemTools::Stdout(msg.str().c_str());
 }
   }
-else if(dependerExists)
+else
   {
-  // The dependee and depender both exist.  Compare file times.
-  int result = 0;
-  if((!this->FileComparison->FileTimeCompare(depender, dependee,
- &result) || result < 0))
+  if(dependerExists)
 {
-// The depender is older than the dependee.
-regenerate = true;
+// The dependee and depender both exist.  Compare file times.
+int result = 0;
+if((!this->FileComparison->FileTimeCompare(depender, dependee,
+  &result) || result < 0))
+  {
+  // The depender is older than the dependee.
+  regenerate = true;
 
-// Print verbose output.
-if(this->Verbose)
+  // Print verbose output.
+  if(this->Verbose)
+{
+cmOStringStream msg;
+msg << "Dependee \"" << dependee
+<< "\" is newer than depender \""
+<< depender << "\"." << std::endl;
+cmSystemTools::Stdout(msg.str().c_str());
+}
+  }
+}
+  else
+{
+// The dependee exists, but the depender doesn't. Regenerate if the
+// internalDepends file is older than the dependee.
+int result = 0;
+if((!this->FileComparison->

[Cmake-commits] CMake branch, next, updated. v2.8.9-127-gdbb747a

[Alexander Neundorf]

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  dbb747aad856fc914236429edaa2881b62048dab (commit)
   via  a3815e67cf9ff7f542e809d8974b695893a6a783 (commit)
  from  027d2d9dd0f4c15a8a79c1a11b9c510ddb257d8a (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=dbb747aad856fc914236429edaa2881b62048dab
commit dbb747aad856fc914236429edaa2881b62048dab
Merge: 027d2d9 a3815e6
Author: Alexander Neundorf 
AuthorDate: Thu Aug 16 17:38:01 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Aug 16 17:38:01 2012 -0400

Merge topic 'HandleMacFrameworkIncludeDirs_13465' into next

a3815e6 -fix line length


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3815e67cf9ff7f542e809d8974b695893a6a783
commit a3815e67cf9ff7f542e809d8974b695893a6a783
Author: Alex Neundorf 
AuthorDate: Thu Aug 16 23:37:15 2012 +0200
Commit: Alex Neundorf 
CommitDate: Thu Aug 16 23:37:15 2012 +0200

-fix line length

Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 99ca375..bb650eb 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -614,10 +614,10 @@ void 
cmExtraEclipseCDT4Generator::AppendIncludeDirectories(
   // handle framework include dirs on OSX, the remainder after the
   // Frameworks/ part has to be stripped
   //   /System/Library/Frameworks/GLUT.framework/Headers
-  cmsys::RegularExpression 
frameworkRegex("(.+/Frameworks)/.+\\.framework/");
-  if(frameworkRegex.find(dir.c_str()))
+  cmsys::RegularExpression frameworkRx("(.+/Frameworks)/.+\\.framework/");
+  if(frameworkRx.find(dir.c_str()))
 {
-dir = frameworkRegex.match(1);
+dir = frameworkRx.match(1);
 }
 
   if(emittedDirs.find(dir) == emittedDirs.end())

---

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.9-125-g027d2d9

[Alexander Neundorf]

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  027d2d9dd0f4c15a8a79c1a11b9c510ddb257d8a (commit)
   via  11f23fee523347a52eb36d439f89b5bd6e99fa6b (commit)
  from  1b33e8a0f802c011c6789fce2384480d706b2811 (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=027d2d9dd0f4c15a8a79c1a11b9c510ddb257d8a
commit 027d2d9dd0f4c15a8a79c1a11b9c510ddb257d8a
Merge: 1b33e8a 11f23fe
Author: Alexander Neundorf 
AuthorDate: Thu Aug 16 17:30:03 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Aug 16 17:30:03 2012 -0400

Merge topic 'RemoveNonworkingKDE4Test' into next

11f23fe remove non-working KDE4 test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11f23fee523347a52eb36d439f89b5bd6e99fa6b
commit 11f23fee523347a52eb36d439f89b5bd6e99fa6b
Author: Alex Neundorf 
AuthorDate: Thu Aug 16 23:28:52 2012 +0200
Commit: Alex Neundorf 
CommitDate: Thu Aug 16 23:28:52 2012 +0200

remove non-working KDE4 test

Alex

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9512ea6..2ba616e 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -70,11 +70,6 @@ if(BUILD_TESTING)
   "Should the tests that run a full sub ctest process be run?"
   OFF)
 mark_as_advanced(CTEST_TEST_CTEST)
-
-option(TEST_KDE4_STABLE_BRANCH
-  "Should the KDE4 stable branch test be run?"
-  OFF)
-mark_as_advanced(TEST_KDE4_STABLE_BRANCH)
   endif ()
 
   # Should tests that use CVS be run?
@@ -2106,43 +2101,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P 
${CMake_SOURCE_DIR}/Utilities/
 endif ()
   endif ()
 
-  if (CMAKE_RUN_LONG_TESTS AND TEST_KDE4_STABLE_BRANCH)
-if(UNIX)
-  if(NOT QT4_FOUND)
- find_package(Qt4)
-  endif()
-
-  set(TRY_BUILD_KDE4 TRUE)
-  if(QT4_FOUND)
-# check whether it's Qt 4.5 in a cmake 2.4. compatible way:
-if(NOT EXISTS "${QT_QTNETWORK_INCLUDE_DIR}/QAbstractNetworkCache")
-  set(TRY_BUILD_KDE4 FALSE)
-endif()
-  else()
-set(TRY_BUILD_KDE4 FALSE)
-  endif()
-
-  find_package(Perl)
-  if(NOT PERL_FOUND)
-set(TRY_BUILD_KDE4 FALSE)
-  endif()
-
-  find_package(ZLIB)
-  if(NOT ZLIB_FOUND)
-set(TRY_BUILD_KDE4 FALSE)
-  endif()
-
-  if(TRY_BUILD_KDE4)
-file(MAKE_DIRECTORY ${CMake_BINARY_DIR}/Tests/KDE4StableBranchTest)
-set(TEST_KDE4_BASE_DIR ${CMake_BINARY_DIR}/Tests/KDE4StableBranchTest)
-
configure_file(${CMake_SOURCE_DIR}/Tests/KDE4StableBranchTest/test_kde4.sh.in 
${CMake_BINARY_DIR}/Tests/KDE4StableBranchTest/test_kde4.sh @ONLY)
-execute_process(COMMAND chmod 755 
${CMake_BINARY_DIR}/Tests/KDE4StableBranchTest/test_kde4.sh )
-add_test(KDE4StableBranchTest 
${CMake_BINARY_DIR}/Tests/KDE4StableBranchTest/test_kde4.sh)
-  endif()
-
-endif()
-  endif ()
-
   if("${CMAKE_TEST_GENERATOR}" MATCHES Xcode)
 set(CMAKE_SKIP_BOOTSTRAP_TEST 1)
   endif()
diff --git a/Tests/KDE4StableBranchTest/test_kde4.sh.in 
b/Tests/KDE4StableBranchTest/test_kde4.sh.in
deleted file mode 100755
index bc90b9d..000
--- a/Tests/KDE4StableBranchTest/test_kde4.sh.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# This shell script tests whether cmake is able to build the latest
-# stable KDE4 release, or at least some part of it.
-# It downloads automoc from KDE svn, builds and installs it, then it
-# downloads phonon from KDE svn, builds and installs it, and finally
-# it downloads kdelibs (currently from the 4.3 branch), and builds
-# a (small) part of it, i.e. libkdecore and one unit test depending on it.
-#
-# 
-
-CMAKE="@CMAKE_CMAKE_COMMAND@"
-BASEDIR="@TEST_KDE4_BASE_DIR@"
-INSTALLDIR="$BASEDIR/install"
-QMAKE="@QT_QMAKE_EXECUTABLE@"
-
-cd "$BASEDIR"  || exit -1
-echo "Removing old install dir " $INSTALLDIR
-
-rm -rf install   || exit -1
-rm -rf build-automoc || exit -1
-rm -rf build-phonon  || exit -1
-rm -rf build-kdelibs || exit -1
-
-
-
-# build and install automoc
-cd "$BASEDIR"  || exit -1
-svn co 
svn://anonsvn.kde.org/home/kde/tags/kdesupport-for-4.3/kdesupport/automoc  || 
exit -1
-
-mkdir -p build-automoc  || exit -1
-
-cd build-automoc  || exit -1
-"$CMAKE" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" 
-DQT_QMAKE_EXECUTABLE:STRING="$QMAKE" ../automoc  || exit -1
-"$CMAKE" --build .  || exit -1
-"$CMAKE" -P cmake_install.cmake  || exit -1
-
-export CMAKE_PREFIX_PATH="$INSTALLDIR:$CMAKE_P

[Cmake-commits] CMake branch, next, updated. v2.8.9-123-g1b33e8a

[Alexander Neundorf]

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  1b33e8a0f802c011c6789fce2384480d706b2811 (commit)
   via  5271ba56be87d5f412ea21c6c30cb72a893ceb25 (commit)
  from  79d2c9c0e3f946bb290a7da447e9e5272d0b31bf (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=1b33e8a0f802c011c6789fce2384480d706b2811
commit 1b33e8a0f802c011c6789fce2384480d706b2811
Merge: 79d2c9c 5271ba5
Author: Alexander Neundorf 
AuthorDate: Thu Aug 16 17:16:13 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Aug 16 17:16:13 2012 -0400

Merge topic 'EclipseRemoveLinkedOutputDirectoryResources' into next

5271ba5 Eclipse: fix #13358: don't create bad linked resources


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5271ba56be87d5f412ea21c6c30cb72a893ceb25
commit 5271ba56be87d5f412ea21c6c30cb72a893ceb25
Author: Alex Neundorf 
AuthorDate: Sat Jul 28 18:00:19 2012 +0200
Commit: Alex Neundorf 
CommitDate: Thu Aug 16 23:15:21 2012 +0200

Eclipse: fix #13358: don't create bad linked resources

directory where the project file is located (${CMAKE_BINARY_DIR}), which can
happen e.g. for EXECUTABLE_OUTPUT_PATH and related variables.

Now, it seems this code never worked.
If EXECUTABLE_OUTPUT_PATH was set to point into a subdir of 
CMAKE_BINARY_DIR,
the code did nothing.
If it pointed directly at CMAKE_BINARY_DIR or some other location, it 
created
a linked resource. I tested this with Eclipse Europa (3.3) and Juno (4.2), 
and in this
case both versions of Eclipse complained that this is a bad location for a 
linked resource.

Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 5c7d400..eccc2c1 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -462,18 +462,6 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 this->CreateLinksForTargets(fout);
 }
 
-  // I'm not sure this makes too much sense. There can be different
-  // output directories in different subdirs, so we would need more of them.
-
-  // for EXECUTABLE_OUTPUT_PATH when not in binary dir
-  this->AppendOutLinkedResource(fout,
-mf->GetSafeDefinition("CMAKE_RUNTIME_OUTPUT_DIRECTORY"),
-mf->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH"));
-  // for LIBRARY_OUTPUT_PATH when not in binary dir
-  this->AppendOutLinkedResource(fout,
-mf->GetSafeDefinition("CMAKE_LIBRARY_OUTPUT_DIRECTORY"),
-mf->GetSafeDefinition("LIBRARY_OUTPUT_PATH"));
-
   fout << "\t\n";
 
   fout << "\n";
@@ -761,18 +749,6 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() 
const
   excludeFromOut += "**/CMakeFiles/";
   fout << "\n";
-  // add output entry for EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH
-  // - if it is a subdir of homeOutputDirectory, there is no need to add it
-  // - if it is not then create a linked resource and add the linked name
-  //   but check it doesn't conflict with other linked resources names
-  for (std::vector::const_iterator
-   it = this->OutLinkedResources.begin();
-   it != this->OutLinkedResources.end();
-   ++it)
-{
-fout << "EscapeForXML(*it)
- << "\"/>\n";
-}
 
   // add pre-processor definitions to allow eclipse to gray out sections
   emmited.clear();
@@ -1317,65 +1293,3 @@ void cmExtraEclipseCDT4Generator
 "\t\t\n"
 ;
 }
-
-bool cmExtraEclipseCDT4Generator
-::AppendOutLinkedResource(cmGeneratedFileStream& fout,
-  const std::string& defname,
-  const std::string& altdefname)
-{
-  if (defname.empty() && altdefname.empty())
-{
-return false;
-}
-
-  std::string outputPath = (defname.empty() ? altdefname : defname);
-
-  if (!cmSystemTools::FileIsFullPath(outputPath.c_str()))
-{
-outputPath = this->HomeOutputDirectory + "/" + outputPath;
-}
-
-  // in this case it's not necessary:
-  if (cmSystemTools::IsSubDirectory(outputPath.c_str(),
-this->HomeOutputDirectory.c_str()))
-{
-return false;
-}
-
-  // in these two cases Eclipse would complain:
-  if (cmSystemTools::IsSubDirectory(this->HomeOutputDirectory.c_str(),
-outputPath.c_str()))
-{
-return false;
-}
-  if (cmSystemTools::GetRealPath(ou

[Cmake-commits] CMake branch, next, updated. v2.8.9-119-g6da9e9a

[Alexander Neundorf]

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  6da9e9ab53459b3efd9a3e2623a01558b40387e6 (commit)
   via  9110d0eab4ed3b024ad485eaaf15b1d7e4c38744 (commit)
   via  d97b38529efb22579216c406c104c49ea89ba617 (commit)
   via  c4306dc8057c45bc5edfd18465f85790800124cd (commit)
  from  9ae27d461399f6bed55d2fa13df0eea7cb2f88e1 (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=6da9e9ab53459b3efd9a3e2623a01558b40387e6
commit 6da9e9ab53459b3efd9a3e2623a01558b40387e6
Merge: 9ae27d4 9110d0e
Author: Alexander Neundorf 
AuthorDate: Thu Aug 16 17:04:07 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Aug 16 17:04:07 2012 -0400

Merge topic 'HandleMacFrameworkIncludeDirs_13465' into next

9110d0e Eclipse on OSX: improve handling of framework include dirs (#13367)
d97b385 Eclipse on OSX: fix handling of framework include dirs (#13464)
c4306dc CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9110d0eab4ed3b024ad485eaaf15b1d7e4c38744
commit 9110d0eab4ed3b024ad485eaaf15b1d7e4c38744
Author: Alex Neundorf 
AuthorDate: Fri Aug 10 21:45:03 2012 +0200
Commit: Alex Neundorf 
CommitDate: Thu Aug 16 23:02:10 2012 +0200

Eclipse on OSX: improve handling of framework include dirs (#13367)

It seems that if cmake finds something like the following:
/System/Library/Frameworks/GLUT.framework/Headers
Eclipse doesn't like that and wants to have
/System/Library/Frameworks
instead

Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 5c7d400..99ca375 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -610,6 +610,16 @@ void cmExtraEclipseCDT4Generator::AppendIncludeDirectories(
 if (!inc->empty())
   {
   std::string dir = cmSystemTools::CollapseFullPath(inc->c_str());
+
+  // handle framework include dirs on OSX, the remainder after the
+  // Frameworks/ part has to be stripped
+  //   /System/Library/Frameworks/GLUT.framework/Headers
+  cmsys::RegularExpression 
frameworkRegex("(.+/Frameworks)/.+\\.framework/");
+  if(frameworkRegex.find(dir.c_str()))
+{
+dir = frameworkRegex.match(1);
+}
+
   if(emittedDirs.find(dir) == emittedDirs.end())
 {
 emittedDirs.insert(dir);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d97b38529efb22579216c406c104c49ea89ba617
commit d97b38529efb22579216c406c104c49ea89ba617
Author: Alex Neundorf 
AuthorDate: Fri Aug 10 21:28:40 2012 +0200
Commit: Alex Neundorf 
CommitDate: Thu Aug 16 23:02:10 2012 +0200

Eclipse on OSX: fix handling of framework include dirs (#13464)

On OSX, the output from gcc looks like this:
 /usr/include/c++/4.2.1
 /usr/include/c++/4.2.1/i686-apple-darwin10/x86_64
 /usr/include/c++/4.2.1/backward
 /usr/lib/gcc/i686-apple-darwin10/4.2.1/include
 /usr/include
 /System/Library/Frameworks (framework directory)
 /Library/Frameworks (framework directory)
End of search list.

The "(framework directory)" part needs to be removed so that Eclipse 
handles it properly

Alex

diff --git 
a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake 
b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
index 54a6418..1fa0157 100644
--- a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+++ b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
@@ -42,7 +42,10 @@ macro(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang 
_resultIncludeDirs _resultDefines
 # split the output into lines and then remove leading and trailing spaces 
from each of them:
 string(REGEX MATCHALL "[^\n]+\n" _includeLines "${CMAKE_MATCH_1}")
 foreach(nextLine ${_includeLines})
-  string(STRIP "${nextLine}" _includePath)
+  # on OSX, gcc says things like this:  "/System/Library/Frameworks 
(framework directory)", strip the last part
+  string(REGEX REPLACE "\\(framework directory\\)" "" nextLineNoFramework 
"${nextLine}")
+  # strip spaces at the beginning and the end
+  string(STRIP "${nextLineNoFramework}" _includePath)
   list(APPEND ${_resultIncludeDirs} "${_includePath}")
 endforeach()
 

---

Summary of changes:
 ...atorDetermineCompilerMacrosAndIncludeDir

[Cmake-commits] CMake branch, next, updated. v2.8.8-3615-gf607c0f

[Alexander Neundorf]

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  f607c0f7d5e1db6b5b2433f36ab0814334ee04cb (commit)
   via  4ea5dc5ba5d9e73d013d3a1166d321a8433a3384 (commit)
  from  05e94e90f78aba45c6f9acaa900bfed9d0b7c77a (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=f607c0f7d5e1db6b5b2433f36ab0814334ee04cb
commit f607c0f7d5e1db6b5b2433f36ab0814334ee04cb
Merge: 05e94e9 4ea5dc5
Author: Alexander Neundorf 
AuthorDate: Fri Aug 3 16:03:16 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Aug 3 16:03:16 2012 -0400

Merge topic 'EclipseFixBadLinkedResources' into next

4ea5dc5 Eclipse: fix #13358: don't create bad linked resources


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ea5dc5ba5d9e73d013d3a1166d321a8433a3384
commit 4ea5dc5ba5d9e73d013d3a1166d321a8433a3384
Author: Alex Neundorf 
AuthorDate: Sat Jul 28 18:42:47 2012 +0200
Commit: Alex Neundorf 
CommitDate: Sat Jul 28 18:42:47 2012 +0200

Eclipse: fix #13358: don't create bad linked resources

Don't create linked resources which point to CMAKE_BINARY_DIR
itself or one of its parent dirs. Eclipse complained about that.

Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 78a8704..5c7d400 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -1334,12 +1334,26 @@ bool cmExtraEclipseCDT4Generator
 {
 outputPath = this->HomeOutputDirectory + "/" + outputPath;
 }
+
+  // in this case it's not necessary:
   if (cmSystemTools::IsSubDirectory(outputPath.c_str(),
 this->HomeOutputDirectory.c_str()))
 {
 return false;
 }
 
+  // in these two cases Eclipse would complain:
+  if (cmSystemTools::IsSubDirectory(this->HomeOutputDirectory.c_str(),
+outputPath.c_str()))
+{
+return false;
+}
+  if (cmSystemTools::GetRealPath(outputPath.c_str())
+  == cmSystemTools::GetRealPath(this->HomeOutputDirectory.c_str()))
+{
+return false;
+}
+
   std::string name = this->GetPathBasename(outputPath);
 
   // make sure linked resource name is unique

---

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |   14 ++
 1 files changed, 14 insertions(+), 0 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.8-3581-g185faf5

[Alexander Neundorf]

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  185faf5db13866d04407d1c01b933b4330d235cd (commit)
   via  53cc1026bcf446c4e854bac7d6885879f4d8c64a (commit)
   via  bcccddc7e99336faabe7d15f121d41282773cfcc (commit)
  from  2a190dd059ab8293d989684fe560b898110a2ce8 (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=185faf5db13866d04407d1c01b933b4330d235cd
commit 185faf5db13866d04407d1c01b933b4330d235cd
Merge: 2a190dd 53cc102
Author: Alexander Neundorf 
AuthorDate: Sat Jul 28 06:02:18 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Jul 28 06:02:18 2012 -0400

Merge topic 'EclipseAddSupportForJuno' into next

53cc102 Eclipse: improve (fix ?) version detection on OSX
bcccddc Eclipse: add support for the 4.2 Juno release (#13367)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53cc1026bcf446c4e854bac7d6885879f4d8c64a
commit 53cc1026bcf446c4e854bac7d6885879f4d8c64a
Author: Alex Neundorf 
AuthorDate: Sat Jul 28 11:58:04 2012 +0200
Commit: Alex Neundorf 
CommitDate: Sat Jul 28 11:58:04 2012 +0200

Eclipse: improve (fix ?) version detection on OSX

This is probably related to a framework installation I guess.
This is part of the patch in #13367 from Nicholas Yue.

Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake 
b/Modules/CMakeFindEclipseCDT4.cmake
index 80c51c1..86c1a1b 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -24,6 +24,9 @@ FUNCTION(_FIND_ECLIPSE_VERSION)
 GET_FILENAME_COMPONENT(_REALPATH_CMAKE_ECLIPSE_EXECUTABLE 
"${CMAKE_ECLIPSE_EXECUTABLE}" REALPATH)
 GET_FILENAME_COMPONENT(_ECLIPSE_DIR 
"${_REALPATH_CMAKE_ECLIPSE_EXECUTABLE}" PATH)
 FILE(GLOB _ECLIPSE_FEATURE_DIR 
"${_ECLIPSE_DIR}/features/org.eclipse.platform*")
+IF(APPLE AND NOT _ECLIPSE_FEATURE_DIR)
+  FILE(GLOB _ECLIPSE_FEATURE_DIR 
"${_ECLIPSE_DIR}/../../../features/org.eclipse.platform*")
+ENDIF()
 IF("${_ECLIPSE_FEATURE_DIR}" MATCHES 
".+org.eclipse.platform_([0-9]+\\.[0-9]+).+")
   SET(_ECLIPSE_VERSION ${CMAKE_MATCH_1})
 ENDIF()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcccddc7e99336faabe7d15f121d41282773cfcc
commit bcccddc7e99336faabe7d15f121d41282773cfcc
Author: Alex Neundorf 
AuthorDate: Sat Jul 28 11:40:08 2012 +0200
Commit: Alex Neundorf 
CommitDate: Sat Jul 28 11:40:08 2012 +0200

Eclipse: add support for the 4.2 Juno release (#13367)

Thanks for the path to Nicholas Yue.

Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake 
b/Modules/CMakeFindEclipseCDT4.cmake
index a4264e7..80c51c1 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -37,6 +37,7 @@ FUNCTION(_FIND_ECLIPSE_VERSION)
   SET(_ECLIPSE_VERSION_NAME_3.5 "Galileo" )
   SET(_ECLIPSE_VERSION_NAME_3.6 "Helios" )
   SET(_ECLIPSE_VERSION_NAME_3.7 "Indigo" )
+  SET(_ECLIPSE_VERSION_NAME_4.2 "Juno" )
 
   IF(_ECLIPSE_VERSION)
 MESSAGE(STATUS "Found Eclipse version ${_ECLIPSE_VERSION} 
(${_ECLIPSE_VERSION_NAME_${_ECLIPSE_VERSION}})")
@@ -51,7 +52,9 @@ FUNCTION(_FIND_ECLIPSE_VERSION)
 "3.4 
(${_ECLIPSE_VERSION_NAME_3.4})"
 "3.5 
(${_ECLIPSE_VERSION_NAME_3.5})"
 "3.6 
(${_ECLIPSE_VERSION_NAME_3.6})"
-"3.7 
(${_ECLIPSE_VERSION_NAME_3.7})")
+"3.7 
(${_ECLIPSE_VERSION_NAME_3.7})"
+"4.2 
(${_ECLIPSE_VERSION_NAME_4.2})"
+  )
 ENDFUNCTION()
 
 _FIND_ECLIPSE_VERSION()

---

Summary of changes:
 Modules/CMakeFindEclipseCDT4.cmake |8 +++-
 1 files changed, 7 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.8-3333-gd83c8d1

[Alexander Neundorf]

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  d83c8d16b7b2cceadc9e031283ffae9244e48fa4 (commit)
   via  d7bc8dd6ea5fcecf613134764a040238cb115b4c (commit)
  from  92aadd68345a3aa3df5a480465c4e28aca8d4a59 (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=d83c8d16b7b2cceadc9e031283ffae9244e48fa4
commit d83c8d16b7b2cceadc9e031283ffae9244e48fa4
Merge: 92aadd6 d7bc8dd
Author: Alexander Neundorf 
AuthorDate: Wed Jun 27 17:41:46 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Jun 27 17:41:46 2012 -0400

Merge topic 'EclipseFixIncludeDirDetectionMinGW' into next

d7bc8dd Eclipse: fix #13313, always set LANG to C, also if unset


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7bc8dd6ea5fcecf613134764a040238cb115b4c
commit d7bc8dd6ea5fcecf613134764a040238cb115b4c
Author: Alex Neundorf 
AuthorDate: Mon Jun 25 23:09:27 2012 +0200
Commit: Alex Neundorf 
CommitDate: Mon Jun 25 23:09:27 2012 +0200

Eclipse: fix #13313, always set LANG to C, also if unset

Otherwise include dir detection does not work with MinGW on french systems.

Alex

diff --git 
a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake 
b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
index 1b4532d..455f95f 100644
--- a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+++ b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
@@ -80,15 +80,10 @@ ENDMACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang)
 SET(_orig_lc_all  $ENV{LC_ALL})
 SET(_orig_lc_messages $ENV{LC_MESSAGES})
 SET(_orig_lang$ENV{LANG})
-IF(_orig_lc_all)
-  SET(ENV{LC_ALL}  C)
-ENDIF()
-IF(_orig_lc_messages)
-  SET(ENV{LC_MESSAGES} C)
-ENDIF()
-IF(_orig_lang)
-  SET(ENV{LANG}C)
-ENDIF()
+
+SET(ENV{LC_ALL}  C)
+SET(ENV{LC_MESSAGES} C)
+SET(ENV{LANG}C)
 
 # Now check for C, works for gcc and Intel compiler at least
 IF (NOT CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS)
@@ -109,12 +104,6 @@ IF (NOT CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS)
 ENDIF ()
 
 # Restore original LC_ALL, LC_MESSAGES, and LANG
-IF(_orig_lc_all)
-  SET(ENV{LC_ALL}  ${_orig_lc_all})
-ENDIF()
-IF(_orig_lc_messages)
-  SET(ENV{LC_MESSAGES} ${_orig_lc_messages})
-ENDIF()
-IF(_orig_lang)
-  SET(ENV{LANG}${_orig_lang})
-ENDIF()
+SET(ENV{LC_ALL}  ${_orig_lc_all})
+SET(ENV{LC_MESSAGES} ${_orig_lc_messages})
+SET(ENV{LANG}${_orig_lang})

---

Summary of changes:
 ...atorDetermineCompilerMacrosAndIncludeDirs.cmake |   25 +--
 1 files changed, 7 insertions(+), 18 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.8-3308-g6d52cb8

[Alexander Neundorf]

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  6d52cb8f6ad489c777db89edb9b517521bb1f6cb (commit)
   via  20e133e38aa2e0556da61b1441fbd4bcacc925cc (commit)
   via  38df155dd394efd45dff887028b2e1a4c0969b03 (commit)
   via  e6a935f39b2d15677830fdba8090d8c725165ca9 (commit)
  from  61b157fb73046d4015e7800639ecafbeec623c4b (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=6d52cb8f6ad489c777db89edb9b517521bb1f6cb
commit 6d52cb8f6ad489c777db89edb9b517521bb1f6cb
Merge: 61b157f 20e133e
Author: Alexander Neundorf 
AuthorDate: Thu Jun 21 17:22:33 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jun 21 17:22:33 2012 -0400

Merge topic 'DetectManSection' into next

20e133e man documentation: detect man section from the given filename
38df155 documentation: preparation for making the man section configurable
e6a935f -remove trailing whitespace


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20e133e38aa2e0556da61b1441fbd4bcacc925cc
commit 20e133e38aa2e0556da61b1441fbd4bcacc925cc
Author: Alex Neundorf 
AuthorDate: Thu Jun 21 23:19:55 2012 +0200
Commit: Alex Neundorf 
CommitDate: Thu Jun 21 23:19:55 2012 +0200

man documentation: detect man section from the given filename

E.g. if you say cmake --help-custom-modules mymodules.7
cmake will now put section 7 into the generated manpage.

Alex

diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx
index 0f44e19..1b042ae 100644
--- a/Source/cmDocumentation.cxx
+++ b/Source/cmDocumentation.cxx
@@ -642,7 +642,8 @@ bool 
cmDocumentation::PrintRequestedDocumentation(std::ostream& os)
 
 
 cmDocumentation::Form cmDocumentation::GetFormFromFilename(
-   const std::string& filename)
+   const std::string& filename,
+   int* manSection)
 {
   std::string ext = cmSystemTools::GetFilenameLastExtension(filename);
   ext = cmSystemTools::UpperCase(ext);
@@ -659,6 +660,10 @@ cmDocumentation::Form cmDocumentation::GetFormFromFilename(
   // ".1" to ".9" should be manpages
   if ((ext.length()==2) && (ext[1] >='1') && (ext[1]<='9'))
 {
+if (manSection)
+  {
+  *manSection = ext[1] - '0';
+  }
 return cmDocumentation::ManForm;
 }
 
@@ -1128,49 +1133,57 @@ bool cmDocumentation::CheckOptions(int argc, const 
char* const* argv,
   {
   help.HelpType = cmDocumentation::Properties;
   GET_OPT_ARGUMENT(help.Filename);
-  help.HelpForm = this->GetFormFromFilename(help.Filename);
+  help.HelpForm = this->GetFormFromFilename(help.Filename,
+&help.ManSection);
   }
 else if(strcmp(argv[i], "--help-policies") == 0)
   {
   help.HelpType = cmDocumentation::Policies;
   GET_OPT_ARGUMENT(help.Filename);
-  help.HelpForm = this->GetFormFromFilename(help.Filename);
+  help.HelpForm = this->GetFormFromFilename(help.Filename,
+&help.ManSection);
   }
 else if(strcmp(argv[i], "--help-variables") == 0)
   {
   help.HelpType = cmDocumentation::Variables;
   GET_OPT_ARGUMENT(help.Filename);
-  help.HelpForm = this->GetFormFromFilename(help.Filename);
+  help.HelpForm = this->GetFormFromFilename(help.Filename,
+&help.ManSection);
   }
 else if(strcmp(argv[i], "--help-modules") == 0)
   {
   help.HelpType = cmDocumentation::Modules;
   GET_OPT_ARGUMENT(help.Filename);
-  help.HelpForm = this->GetFormFromFilename(help.Filename);
+  help.HelpForm = this->GetFormFromFilename(help.Filename,
+&help.ManSection);
   }
 else if(strcmp(argv[i], "--help-custom-modules") == 0)
   {
   help.HelpType = cmDocumentation::CustomModules;
   GET_OPT_ARGUMENT(help.Filename);
-  help.HelpForm = this->GetFormFromFilename(help.Filename);
+  help.HelpForm = this->GetFormFromFilename(help.Filename,
+&help.ManSection);
   }
 else if(strcmp(argv[i], "--help-commands") == 0)
   {
   help.HelpType = cmDocumentation::Commands;
   GET_OPT_ARGUMENT(help.Filename);
-  help.HelpForm = this-

[Cmake-commits] CMake branch, next, updated. v2.8.8-3173-g7343e73

[Alexander Neundorf]

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  7343e73937f37dda1de42d84b247f528dfca75b3 (commit)
   via  e4a2d5f9eeca03470192f0f0b4e3bc16ef33e084 (commit)
   via  7717d964b86f86e001641d1afea84c327e336ee7 (commit)
  from  a885c0574474456fd1b1ef93d2bfd3b33176470f (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=7343e73937f37dda1de42d84b247f528dfca75b3
commit 7343e73937f37dda1de42d84b247f528dfca75b3
Merge: a885c05 e4a2d5f
Author: Alexander Neundorf 
AuthorDate: Thu Jun 14 16:29:39 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jun 14 16:29:39 2012 -0400

Merge topic 'FailIfMocFails-13299' into next

e4a2d5f automoc: better error handling (#13299)
7717d96 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4a2d5f9eeca03470192f0f0b4e3bc16ef33e084
commit e4a2d5f9eeca03470192f0f0b4e3bc16ef33e084
Author: Alex Neundorf 
AuthorDate: Thu Jun 14 22:27:22 2012 +0200
Commit: Alex Neundorf 
CommitDate: Thu Jun 14 22:27:22 2012 +0200

automoc: better error handling (#13299)

automoc now fails immediately if moc fails, instead of continuing
and letting the build fail later on.

Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 113d678..65ecdf7 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -245,6 +245,7 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
 
 bool cmQtAutomoc::Run(const char* targetDirectory)
 {
+  bool success = true;
   cmake cm;
   cmGlobalGenerator* gg = this->CreateGlobalGenerator(&cm, targetDirectory);
   cmMakefile* makefile = gg->GetCurrentLocalGenerator()->GetMakefile();
@@ -256,7 +257,7 @@ bool cmQtAutomoc::Run(const char* targetDirectory)
 
   if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5")
 {
-this->RunAutomoc();
+success = this->RunAutomoc();
 }
 
   this->WriteOldMocDefinitionsFile(targetDirectory);
@@ -264,7 +265,7 @@ bool cmQtAutomoc::Run(const char* targetDirectory)
   delete gg;
   gg = NULL;
   makefile = NULL;
-  return true;
+  return success;
 }
 
 
@@ -578,7 +579,7 @@ bool cmQtAutomoc::RunAutomoc()
 
   if (this->RunMocFailed)
 {
-std::cerr << "returning failed.."<< std::endl;
+std::cerr << "moc failed..."<< std::endl;
 return false;
 }
   outStream.flush();
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 242..451aec8 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1699,8 +1699,8 @@ int cmake::ExecuteCMakeCommand(std::vector& 
args)
 else if (args[1] == "cmake_automoc")
   {
 cmQtAutomoc automoc;
-automoc.Run(args[2].c_str());
-return 0;
+bool automocSuccess = automoc.Run(args[2].c_str());
+return automocSuccess ? 0 : 1;
   }
 #endif
 

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 Source/cmQtAutomoc.cxx|7 ---
 Source/cmake.cxx  |4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.8-3147-g9c05d34

[Alexander Neundorf]

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  9c05d34c5ca8927250d0c783981549cbf33e0795 (commit)
   via  414bf6732bf504d200b5c00490f160271e5b1b50 (commit)
  from  fbfed8156e43f5897a08b2b3a3fb6fdffb9e9dca (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=9c05d34c5ca8927250d0c783981549cbf33e0795
commit 9c05d34c5ca8927250d0c783981549cbf33e0795
Merge: fbfed81 414bf67
Author: Alexander Neundorf 
AuthorDate: Wed Jun 13 16:51:59 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Wed Jun 13 16:51:59 2012 -0400

Merge topic 'EclipseParallelMakeForBuildProject' into next

414bf67 Eclipse: parallel build also for "Build project" #13287


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=414bf6732bf504d200b5c00490f160271e5b1b50
commit 414bf6732bf504d200b5c00490f160271e5b1b50
Author: Alex Neundorf 
AuthorDate: Wed Jun 13 22:49:45 2012 +0200
Commit: Alex Neundorf 
CommitDate: Wed Jun 13 22:49:45 2012 +0200

Eclipse: parallel build also for "Build project" #13287

Use ${CMAKE_ECLIPSE_MAKE_ARGUMENTS} also for the overall build command,
not only for the per-target commands.

Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 65077b3..dc9eb6a 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -286,6 +286,9 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 
   // set the make command
   std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
+  const std::string makeArgs = mf->GetSafeDefinition(
+   "CMAKE_ECLIPSE_MAKE_ARGUMENTS");
+
   fout <<
 "\t\t\t\t\n"
 "\t\t\t\t\torg.eclipse.cdt.make.core.enabledIncrementalBuild\n"
@@ -293,7 +296,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 "\t\t\t\t\n"
 "\t\t\t\t\n"
 "\t\t\t\t\torg.eclipse.cdt.make.core.build.command\n"
-"\t\t\t\t\t" + this->GetEclipsePath(make) + "\n"
+"\t\t\t\t\t" << this->GetEclipsePath(make) << "\n"
 "\t\t\t\t\n"
 "\t\t\t\t\n"
 "\t\t\t\t\torg.eclipse.cdt.make.core.contents\n"
@@ -305,7 +308,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 "\t\t\t\t\n"
 "\t\t\t\t\n"
 "\t\t\t\t\torg.eclipse.cdt.make.core.build.arguments\n"
-"\t\t\t\t\t\n"
+"\t\t\t\t\t" << makeArgs << "\n"
 "\t\t\t\t\n"
 "\t\t\t\t\n"
 "\t\t\t\t\torg.eclipse.cdt.make.core.buildLocation\n"

---

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.8-3136-g9267a6a

[Alexander Neundorf]

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  9267a6a1cdeea5b8847c903e114334280d6bb90c (commit)
   via  0b343cb71e00871591af28452fff8a577ce27a65 (commit)
  from  77f471b8405f93d8f56c4b5f4e31642d9f49 (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=9267a6a1cdeea5b8847c903e114334280d6bb90c
commit 9267a6a1cdeea5b8847c903e114334280d6bb90c
Merge: 77f471b 0b343cb
Author: Alexander Neundorf 
AuthorDate: Tue Jun 12 16:29:14 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Jun 12 16:29:14 2012 -0400

Merge topic 'RemoveASMDebugOutput' into next

0b343cb ASM compiler detection: remove debug output (#13270)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b343cb71e00871591af28452fff8a577ce27a65
commit 0b343cb71e00871591af28452fff8a577ce27a65
Author: Alex Neundorf 
AuthorDate: Tue Jun 12 22:27:34 2012 +0200
Commit: Alex Neundorf 
CommitDate: Tue Jun 12 22:27:34 2012 +0200

ASM compiler detection: remove debug output (#13270)

This must have been left in accidentially.

Alex

diff --git a/Modules/CMakeDetermineCompilerId.cmake 
b/Modules/CMakeDetermineCompilerId.cmake
index 686cc9b..67f5a59 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -302,12 +302,6 @@ FUNCTION(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang)
   TIMEOUT 10
   )
 
-IF("${lang}" STREQUAL "ASM")
-  MESSAGE(STATUS "Checked for ${vendor}")
-  MESSAGE(STATUS "   Output: -${output}-")
-  MESSAGE(STATUS "   Result: -${result}-")
-ENDIF("${lang}" STREQUAL "ASM")
-
 IF("${output}" MATCHES "${regex}")
   FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
 "Checking whether the ${lang} compiler is ${vendor} using \"${flags}\" 
"

---

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |6 --
 1 files changed, 0 insertions(+), 6 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.8-2922-g5cd83e8

[Alexander Neundorf]

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  5cd83e87123fce024b449d01d7e40f6742e5b5d4 (commit)
   via  14b213c0ceb9fb2882dc41574ebacaf0ef906fc1 (commit)
   via  00ae36fdfffe39fb71cb54f81990b44be81d6833 (commit)
  from  8ee9ec40bb9d5dab474dbd4daa158da55ffd (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=5cd83e87123fce024b449d01d7e40f6742e5b5d4
commit 5cd83e87123fce024b449d01d7e40f6742e5b5d4
Merge: 8ee9ec4 14b213c
Author: Alexander Neundorf 
AuthorDate: Wed May 23 14:51:01 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Wed May 23 14:51:01 2012 -0400

Merge topic 'HandleEmptySIZEOF_VOID_P' into next

14b213c add test for #13241: empty SIZEOF_VOIDP in 
write_basic_package_version_file
00ae36f write_basic_package_version_file() now works with unset 
CMAKE_SIZEOF_VOID_P


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14b213c0ceb9fb2882dc41574ebacaf0ef906fc1
commit 14b213c0ceb9fb2882dc41574ebacaf0ef906fc1
Author: Alex Neundorf 
AuthorDate: Wed May 23 20:48:47 2012 +0200
Commit: Alex Neundorf 
CommitDate: Wed May 23 20:48:47 2012 +0200

add test for #13241: empty SIZEOF_VOIDP in write_basic_package_version_file

Alex

diff --git a/Tests/FindPackageTest/CMakeLists.txt 
b/Tests/FindPackageTest/CMakeLists.txt
index 5862094..e85fb4d 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -363,10 +363,16 @@ endif()
 #-
 # Test write_basic_config_version_file().
 
+# also test that an empty CMAKE_SIZEOF_VOID_P is accepted:
+set(_CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
+set(CMAKE_SIZEOF_VOID_P "")
+
 
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/Foo123ConfigVersion.cmake
  VERSION 1.2.3
  COMPATIBILITY AnyNewerVersion)
 
+set(CMAKE_SIZEOF_VOID_P ${_CMAKE_SIZEOF_VOID_P})
+
 set(PACKAGE_FIND_VERSION 2.3.4)
 include(${CMAKE_CURRENT_BINARY_DIR}/Foo123ConfigVersion.cmake)
 if(PACKAGE_VERSION_COMPATIBLE)
@@ -379,6 +385,10 @@ if(NOT PACKAGE_VERSION_COMPATIBLE)
   message(SEND_ERROR "Did not find Foo123 with version 1.2.3 (0.0.1 was 
requested) !")
 endif()
 
+if(PACKAGE_VERSION_UNSUITABLE)
+  message(SEND_ERROR "PACKAGE_VERSION_UNSUITABLE set, but must not be !")
+endif()
+
 set(PACKAGE_FIND_VERSION 1.0.0)
 include(${CMAKE_CURRENT_BINARY_DIR}/Foo123ConfigVersion.cmake)
 if(NOT PACKAGE_VERSION_COMPATIBLE)
@@ -405,6 +415,7 @@ 
write_basic_config_version_file(${CMAKE_CURRENT_BINARY_DIR}/Boo123ConfigVersion.
 VERSION 1.2.3
 COMPATIBILITY SameMajorVersion)
 
+unset(PACKAGE_VERSION_UNSUITABLE)
 set(PACKAGE_VERSION_EXACT FALSE)
 set(PACKAGE_FIND_VERSION 2.3.4)
 set(PACKAGE_FIND_VERSION_MAJOR 2)
@@ -456,6 +467,7 @@ 
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/Bar123ConfigVersion
  VERSION 1.2.3.17
  COMPATIBILITY ExactVersion)
 
+unset(PACKAGE_VERSION_UNSUITABLE)
 set(PACKAGE_VERSION_EXACT FALSE)
 set(PACKAGE_FIND_VERSION 2.3.4)
 include(${CMAKE_CURRENT_BINARY_DIR}/Bar123ConfigVersion.cmake)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00ae36fdfffe39fb71cb54f81990b44be81d6833
commit 00ae36fdfffe39fb71cb54f81990b44be81d6833
Author: Alex Neundorf 
AuthorDate: Wed May 23 20:46:48 2012 +0200
Commit: Alex Neundorf 
CommitDate: Wed May 23 20:46:48 2012 +0200

write_basic_package_version_file() now works with unset CMAKE_SIZEOF_VOID_P

This fixes #13241.
If CMAKE_SIZEOF_VOID_P is not set, either in the installed or in the
using project, don't check for it.

Alex

diff --git a/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in 
b/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
index cf53db8..9f7f03e 100644
--- a/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
+++ b/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
@@ -18,6 +18,11 @@ else()
   endif()
 endif()
 
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, 
ignore it:
+if("${CMAKE_SIZEOF_VOID_P}"  STREQUAL ""  OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL 
"")
+   return()
+endif()
+
 # check that the installed version has the same 32/64bit-ness as the one which 
is currently searching:
 if(NOT "${CMAKE_SIZEOF_VOID_P}"  STREQUAL  "@CMAKE_SIZEOF_VOID_P@")
math(EXPR installedBits 

[Cmake-commits] CMake branch, next, updated. v2.8.8-2917-g683f838

[Alexander Neundorf]

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  683f838337494cb13eafa5867ef46929efb1a5d5 (commit)
   via  b71e731b9b91f9f79ab49838baae5bb5ab42c30e (commit)
   via  7ced0732e875ab7cf4797ef33bd4b897bc41eb53 (commit)
   via  b6fba35411053e334072a1203493140c67f3d30a (commit)
  from  e5f6155bc0cc474f679d1db33734216e7e3a1584 (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=683f838337494cb13eafa5867ef46929efb1a5d5
commit 683f838337494cb13eafa5867ef46929efb1a5d5
Merge: e5f6155 b71e731
Author: Alexander Neundorf 
AuthorDate: Tue May 22 16:41:25 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Tue May 22 16:41:25 2012 -0400

Merge topic 'MakeDefaultInstallComponentNameConfigurable' into next

b71e731 -add docs for ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
7ced073 make default install component name configurable
b6fba35 -strip trailing whitespace


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b71e731b9b91f9f79ab49838baae5bb5ab42c30e
commit b71e731b9b91f9f79ab49838baae5bb5ab42c30e
Author: Alex Neundorf 
AuthorDate: Sun May 13 17:48:13 2012 +0200
Commit: Alex Neundorf 
CommitDate: Mon May 14 22:19:30 2012 +0200

-add docs for ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}

Alex

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 897e516..6881236 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -523,6 +523,16 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
  "Variables That Change Behavior");
 
 cm->DefineProperty
+("CMAKE_INSTALL_DEFAULT_COMPONENT_NAME",  cmProperty::VARIABLE,
+ "Default component used in install() commands.",
+ "If an install() command is used without the COMPONENT argument, "
+ "these files will be grouped into a default component. The name of this "
+ "default install component will be taken from this variable.  "
+ "It defaults to \"Unspecified\". ",
+ false,
+ "Variables That Change Behavior");
+
+cm->DefineProperty
 ("CMAKE_FIND_LIBRARY_PREFIXES",  cmProperty::VARIABLE,
  "Prefixes to prepend when looking for libraries.",
  "This specifies what prefixes to add to library names when "

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ced0732e875ab7cf4797ef33bd4b897bc41eb53
commit 7ced0732e875ab7cf4797ef33bd4b897bc41eb53
Author: Alex Neundorf 
AuthorDate: Sun May 13 15:44:37 2012 +0200
Commit: Alex Neundorf 
CommitDate: Mon May 14 22:19:12 2012 +0200

make default install component name configurable

Until now an unnamed component was always named "Unspecified".
Now this name is taken from the new cmake variable 
CMAKE_INSTALL_DEFAULT_COMPONENT_NAME,
which is initialized to "Unspecified". But it can now be set to something
project-specific, per directory

Alex

diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake
index 45d1fbf..6c61d3d 100644
--- a/Modules/CMakeGenericSystem.cmake
+++ b/Modules/CMakeGenericSystem.cmake
@@ -168,6 +168,10 @@ ELSE(CMAKE_HOST_UNIX)
   SET(CMAKE_GENERIC_PROGRAM_FILES)
 ENDIF(CMAKE_HOST_UNIX)
 
+# Set a variable which will be used as component name in install() commands
+# where no COMPONENT has been given:
+SET(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "Unspecified")
+
 MARK_AS_ADVANCED(
   CMAKE_SKIP_RPATH
   CMAKE_SKIP_INSTALL_RPATH
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index d8522ee..4016734 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -55,6 +55,13 @@ bool cmInstallCommand::InitialPass(std::vector 
const& args,
   this->Makefile->GetLocalGenerator()
 ->GetGlobalGenerator()->EnableInstallTarget();
 
+  this->DefaultComponentName = this->Makefile->GetSafeDefinition(
+   "CMAKE_INSTALL_DEFAULT_COMPONENT_NAME");
+  if (this->DefaultComponentName.empty())
+{
+this->DefaultComponentName = "Unspecified";
+}
+
   // Switch among the command modes.
   if(args[0] == "SCRIPT")
 {
@@ -95,7 +102,7 @@ bool cmInstallCommand::InitialPass(std::vector 
const& args,
 //
 bool cmInstallCommand::HandleScriptMode(std::vector const& args)
 {
-  std::string component("Unspecified");
+  std::st

[Cmake-commits] CMake branch, next, updated. v2.8.8-2859-g6835c5a

[Alexander Neundorf]

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  6835c5a3969620c1a3127f5931503eec1a255588 (commit)
   via  b1d7c4b1d241445da31482ad893ec992bdccdabf (commit)
   via  c7dab4b93668e44ce07b810a08f171f8eb847785 (commit)
   via  b149d1ed05eb5bca8b3107de6a16f5fddbe8b7d5 (commit)
  from  8091746496f9583eec3e6456e3b5e5fd87e4 (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=6835c5a3969620c1a3127f5931503eec1a255588
commit 6835c5a3969620c1a3127f5931503eec1a255588
Merge: 8091746 b1d7c4b
Author: Alexander Neundorf 
AuthorDate: Sun May 13 08:40:05 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Sun May 13 08:40:05 2012 -0400

Merge topic 'FeatureSummaryNicerFormatting' into next

b1d7c4b FeatureSummary.cmake: nicer formatting
c7dab4b CMake Nightly Date Stamp
b149d1e CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1d7c4b1d241445da31482ad893ec992bdccdabf
commit b1d7c4b1d241445da31482ad893ec992bdccdabf
Author: Alex Neundorf 
AuthorDate: Sun May 13 14:37:51 2012 +0200
Commit: Alex Neundorf 
CommitDate: Sun May 13 14:37:51 2012 +0200

FeatureSummary.cmake: nicer formatting

Alex

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index cef647e..a5b94d1 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -318,7 +318,7 @@ FUNCTION(_FS_GET_FEATURE_SUMMARY _property _var 
_includeQuiet)
 
 GET_PROPERTY(_info  GLOBAL PROPERTY _CMAKE_${_currentFeature}_PURPOSE)
 FOREACH(_purpose ${_info})
-  SET(_currentFeatureText "${_currentFeatureText}\n   * ${_purpose}")
+  SET(_currentFeatureText "${_currentFeatureText}\n   ${_purpose}")
 ENDFOREACH()
 
   ENDIF(includeThisOne)
@@ -399,7 +399,7 @@ FUNCTION(FEATURE_SUMMARY)
   SET(_tmp)
   _FS_GET_FEATURE_SUMMARY( ${part} _tmp ${_FS_INCLUDE_QUIET_PACKAGES})
   IF(_tmp)
-SET(_fullText "${_fullText}\n\n-- ${title_${part}}\n${_tmp}")
+SET(_fullText "${_fullText}\n-- ${title_${part}}\n${_tmp}\n")
 IF("${part}" STREQUAL "REQUIRED_PACKAGES_NOT_FOUND")
   SET(requiredPackagesNotFound TRUE)
 ENDIF()

---

Summary of changes:
 Modules/FeatureSummary.cmake |4 ++--
 Source/CMakeVersion.cmake|2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.8-2819-ga026199

[Alexander Neundorf]

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  a02619930e10121c29189d6c20da1a7b1d7f9efd (commit)
   via  1f8f58a0b9a7883aedf7a4bcb185e9784db4f13b (commit)
   via  b4a189fd14bd2abf1dba61cd06e540eb8744159e (commit)
  from  d6ff0a7ecad91b20dfb219cc17ab33dd1a940a09 (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=a02619930e10121c29189d6c20da1a7b1d7f9efd
commit a02619930e10121c29189d6c20da1a7b1d7f9efd
Merge: d6ff0a7 1f8f58a
Author: Alexander Neundorf 
AuthorDate: Sun May 6 10:35:25 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Sun May 6 10:35:25 2012 -0400

Merge topic 'FixMultipleResultsInFeatureSummary' into next

1f8f58a fix #13195: avoid multiple mentions of found packages
b4a189f CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f8f58a0b9a7883aedf7a4bcb185e9784db4f13b
commit 1f8f58a0b9a7883aedf7a4bcb185e9784db4f13b
Author: Alex Neundorf 
AuthorDate: Sun May 6 16:32:10 2012 +0200
Commit: Alex Neundorf 
CommitDate: Sun May 6 16:32:10 2012 +0200

fix #13195: avoid multiple mentions of found packages

Now before adding a package to the list of found or not-found
packages, the package is remvoed from both lists before.

Alex

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 4f9ba7e..be47f95 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1368,41 +1368,73 @@ bool cmFindPackageCommand::ReadListFile(const char* f, 
PolicyScopeRule psr)
 }
 
 //
-void cmFindPackageCommand::AppendToProperty(const char* propertyName)
+void cmFindPackageCommand::AppendToFoundProperty(bool found)
 {
-  std::string propertyValue;
-  const char *prop =
-  this->Makefile->GetCMakeInstance()->GetProperty(propertyName);
-  if (prop && *prop)
+  std::vector foundContents;
+  const char *foundProp =
+ this->Makefile->GetCMakeInstance()->GetProperty("PACKAGES_FOUND");
+  if (foundProp && *foundProp)
 {
-propertyValue = prop;
+std::string tmp = foundProp;
 
-std::vector contents;
-cmSystemTools::ExpandListArgument(propertyValue, contents, false);
-
-bool alreadyInserted = false;
-for(std::vector::const_iterator it = contents.begin();
-  it != contents.end(); ++ it )
+cmSystemTools::ExpandListArgument(tmp, foundContents, false);
+std::vector::iterator nameIt = std::find(
+   foundContents.begin(), foundContents.end(), this->Name);
+if(nameIt != foundContents.end())
   {
-  if (*it == this->Name)
-{
-alreadyInserted = true;
-break;
-}
+  foundContents.erase(nameIt);
   }
-if (!alreadyInserted)
+}
+
+  std::vector notFoundContents;
+  const char *notFoundProp =
+ this->Makefile->GetCMakeInstance()->GetProperty("PACKAGES_NOT_FOUND");
+  if (notFoundProp && *notFoundProp)
+{
+std::string tmp = notFoundProp;
+
+cmSystemTools::ExpandListArgument(tmp, notFoundContents, false);
+std::vector::iterator nameIt = std::find(
+ notFoundContents.begin(), notFoundContents.end(), this->Name);
+if(nameIt != notFoundContents.end())
   {
-  propertyValue += ";";
-  propertyValue += this->Name;
+  notFoundContents.erase(nameIt);
   }
 }
+
+  if(found)
+{
+foundContents.push_back(this->Name);
+}
   else
 {
-propertyValue = this->Name;
+notFoundContents.push_back(this->Name);
+}
+
+
+  std::string tmp;
+  const char* sep ="";
+  for(size_t i=0; iMakefile->GetCMakeInstance()->SetProperty("PACKAGES_FOUND",
+  tmp.c_str());
+
+  tmp = "";
+  sep = "";
+  for(size_t i=0; iMakefile->GetCMakeInstance()->SetProperty(propertyName,
-  propertyValue.c_str());
- }
+  this->Makefile->GetCMakeInstance()->SetProperty("PACKAGES_NOT_FOUND",
+  tmp.c_str());
+}
 
 //
 void cmFindPackageCommand::AppendSuccessInformation()
@@ -1413,14 +1445,10 @@ void cmFindPackageCommand::AppendSuccessInformation()
 
   const char* upperResult = this->Makefile->GetDefinition(upperFound.c_str());
   const char* 

[Cmake-commits] CMake branch, next, updated. v2.8.7-3437-g6668ef8

[Alexander Neundorf]

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  6668ef86590a6577be9d46f935a695ddc5ebfa06 (commit)
   via  38d4c1ed0503917954e4ad6d29898006af89c67d (commit)
  from  9d9aa82388b0b013b4f32d6d3e0ee187a95ebdf9 (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=6668ef86590a6577be9d46f935a695ddc5ebfa06
commit 6668ef86590a6577be9d46f935a695ddc5ebfa06
Merge: 9d9aa82 38d4c1e
Author: Alexander Neundorf 
AuthorDate: Mon Apr 9 08:56:18 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Apr 9 08:56:18 2012 -0400

Merge topic 'OBJECTLibrariesInCodeBlocks' into next

38d4c1e CodeBlocks: improve support for OBJECT libraries


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38d4c1ed0503917954e4ad6d29898006af89c67d
commit 38d4c1ed0503917954e4ad6d29898006af89c67d
Author: Alex Neundorf 
AuthorDate: Mon Apr 9 14:53:47 2012 +0200
Commit: Alex Neundorf 
CommitDate: Mon Apr 9 14:53:47 2012 +0200

CodeBlocks: improve support for OBJECT libraries

This commit creates a dummy text file for each OBJECT library for
the CodeBlocks generator, so the generated project file can reference
a unique file for each target. Most probably these files are unused.

Alex

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx 
b/Source/cmExtraCodeBlocksGenerator.cxx
index e0574ea..a458860 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -534,6 +534,31 @@ void cmExtraCodeBlocksGenerator
 }
 
 
+// Write a dummy file for OBJECT libraries, so C::B can reference some file
+std::string cmExtraCodeBlocksGenerator::CreateDummyTargetFile(
+cmMakefile* mf, cmTarget* target) const
+{
+  // this file doesn't seem to be used by C::B in custom makefile mode,
+  // but we generate a unique file for each OBJECT library so in case
+  // C::B uses it in some way, the targets don't interfere with each other.
+  std::string filename = mf->GetCurrentOutputDirectory();
+  filename += "/";
+  filename += mf->GetLocalGenerator()->GetTargetDirectory(*target);
+  filename += "/";
+  filename += target->GetName();
+  filename += ".objlib";
+  cmGeneratedFileStream fout(filename.c_str());
+  if(fout)
+{
+fout << "# This is a dummy file for the OBJECT library "
+ << target->GetName()
+ << " for the CMake CodeBlocks project generator.\n"
+ << "# Don't edit, this file will be overwritten.\n";
+}
+  return filename;
+}
+
+
 // Generate the xml code for one target.
 void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   const char* targetName,
@@ -572,10 +597,11 @@ void 
cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   }
 
 const char* buildType = makefile->GetDefinition("CMAKE_BUILD_TYPE");
-const char* location = 0;
+std::string location;
 if ( target->GetType()==cmTarget::OBJECT_LIBRARY)
   {
-  location = "dummy"; // hmm, what to use here ?
+  location = this->CreateDummyTargetFile(const_cast(makefile),
+ target);
   }
 else
   {
diff --git a/Source/cmExtraCodeBlocksGenerator.h 
b/Source/cmExtraCodeBlocksGenerator.h
index 57751fc..e0a64ca 100644
--- a/Source/cmExtraCodeBlocksGenerator.h
+++ b/Source/cmExtraCodeBlocksGenerator.h
@@ -44,6 +44,8 @@ private:
 
   void CreateNewProjectFile(const std::vector& lgs,
 const std::string& filename);
+  std::string CreateDummyTargetFile(cmMakefile* mf, cmTarget* target) const;
+
   std::string GetCBCompilerId(const cmMakefile* mf);
   int GetCBTargetType(cmTarget* target);
   std::string BuildMakeCommand(const std::string& make, const char* makefile,

---

Summary of changes:
 Source/cmExtraCodeBlocksGenerator.cxx |   30 --
 Source/cmExtraCodeBlocksGenerator.h   |2 ++
 2 files changed, 30 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.7-3381-gdb23207

[Alexander Neundorf]

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  db232079fc54545a73f82c82c91e64bf3df87efd (commit)
   via  d2ed3c7dee72a41339ff95fb7aefac60778234df (commit)
   via  41d1a73e5b142349d9b61e371f36a89f7ae73ac7 (commit)
  from  0a10b14be71de2238341c594ea267c03e41c92a5 (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=db232079fc54545a73f82c82c91e64bf3df87efd
commit db232079fc54545a73f82c82c91e64bf3df87efd
Merge: 0a10b14 d2ed3c7
Author: Alexander Neundorf 
AuthorDate: Sat Mar 31 10:04:02 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Mar 31 10:04:02 2012 -0400

Merge topic 'OBJECTLibrariesInCodeBlocks' into next

d2ed3c7 -fix #13081: support OBJECT libraries in CodeBlocks/QtCreator 
projects
41d1a73 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2ed3c7dee72a41339ff95fb7aefac60778234df
commit d2ed3c7dee72a41339ff95fb7aefac60778234df
Author: Alex Neundorf 
AuthorDate: Sat Mar 31 16:01:37 2012 +0200
Commit: Alex Neundorf 
CommitDate: Sat Mar 31 16:01:37 2012 +0200

-fix #13081: support OBJECT libraries in CodeBlocks/QtCreator projects

Alex

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx 
b/Source/cmExtraCodeBlocksGenerator.cxx
index ccb17f0..e0574ea 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -383,6 +383,7 @@ void cmExtraCodeBlocksGenerator
 case cmTarget::STATIC_LIBRARY:
 case cmTarget::SHARED_LIBRARY:
 case cmTarget::MODULE_LIBRARY:
+case cmTarget::OBJECT_LIBRARY:
   {
   this->AppendTarget(fout, ti->first.c_str(), &ti->second,
  make.c_str(), makefile, compiler.c_str());
@@ -420,6 +421,7 @@ void cmExtraCodeBlocksGenerator
 case cmTarget::STATIC_LIBRARY:
 case cmTarget::SHARED_LIBRARY:
 case cmTarget::MODULE_LIBRARY:
+case cmTarget::OBJECT_LIBRARY:
 case cmTarget::UTILITY: // can have sources since 2.6.3
   {
   const std::vector&sources=ti->second.GetSourceFiles();
@@ -570,7 +572,17 @@ void 
cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
   }
 
 const char* buildType = makefile->GetDefinition("CMAKE_BUILD_TYPE");
-fout<<" GetLocation(buildType)
+const char* location = 0;
+if ( target->GetType()==cmTarget::OBJECT_LIBRARY)
+  {
+  location = "dummy"; // hmm, what to use here ?
+  }
+else
+  {
+  location = target->GetLocation(buildType);
+  }
+
+fout<<" \n"
   " \n"
   " \n"
@@ -728,7 +740,8 @@ int cmExtraCodeBlocksGenerator::GetCBTargetType(cmTarget* 
target)
   return 1;
   }
 }
-  else if ( target->GetType()==cmTarget::STATIC_LIBRARY)
+  else if (( target->GetType()==cmTarget::STATIC_LIBRARY)
+|| (target->GetType()==cmTarget::OBJECT_LIBRARY))
 {
 return 2;
 }

---

Summary of changes:
 Source/cmExtraCodeBlocksGenerator.cxx |   17 +++--
 Source/kwsys/kwsysDateStamp.cmake |2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.7-3378-g0a10b14

[Alexander Neundorf]

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  0a10b14be71de2238341c594ea267c03e41c92a5 (commit)
   via  f93d03df435224594d21dc250b516e954e1dd86f (commit)
   via  7d99247454687cade1e7aff69fb411e1ec4f8f50 (commit)
   via  43fa86b60ff5196fc5b5fbc84649567b0eccf939 (commit)
  from  ac1dc84cfc767403a54ef3c5fcd194d33b877f49 (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=0a10b14be71de2238341c594ea267c03e41c92a5
commit 0a10b14be71de2238341c594ea267c03e41c92a5
Merge: ac1dc84 f93d03d
Author: Alexander Neundorf 
AuthorDate: Fri Mar 30 16:02:58 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Mar 30 16:02:58 2012 -0400

Merge topic 'OBJECTLibrariesInEclipse' into next

f93d03d fix #13054: support OBJECT libraries in Eclipse
7d99247 KWSys Nightly Date Stamp
43fa86b KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f93d03df435224594d21dc250b516e954e1dd86f
commit f93d03df435224594d21dc250b516e954e1dd86f
Author: Alex Neundorf 
AuthorDate: Fri Mar 30 21:59:14 2012 +0200
Commit: Alex Neundorf 
CommitDate: Fri Mar 30 21:59:14 2012 +0200

fix #13054: support OBJECT libraries in Eclipse

Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index ebd7c7f..65077b3 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -501,6 +501,7 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
 case cmTarget::STATIC_LIBRARY:
 case cmTarget::SHARED_LIBRARY:
 case cmTarget::MODULE_LIBRARY:
+case cmTarget::OBJECT_LIBRARY:
   {
   const char* prefix = (ti->second.GetType()==cmTarget::EXECUTABLE ?
   "[exe] " : "[lib] ");
@@ -1017,6 +1018,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() 
const
case cmTarget::STATIC_LIBRARY:
case cmTarget::SHARED_LIBRARY:
case cmTarget::MODULE_LIBRARY:
+   case cmTarget::OBJECT_LIBRARY:
  {
  const char* prefix = (ti->second.GetType()==cmTarget::EXECUTABLE ?
   "[exe] " : "[lib] ");

---

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |2 ++
 Source/kwsys/kwsysDateStamp.cmake  |2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.7-3350-gcee132f

[Alexander Neundorf]

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  cee132f0cea0c8ff7e6cb0c0ec3b3c3987c4bc5c (commit)
   via  9b32475587c1b7a911e5c635611c1fe5296b8740 (commit)
   via  2066511ca9a0b86d45e07357ebec8dd07f1c93b9 (commit)
   via  c652812af741c2468ad5b58e789244700aa51be5 (commit)
  from  4b37c3cb6fe6282e82b8d5bd52e51254153be2f7 (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=cee132f0cea0c8ff7e6cb0c0ec3b3c3987c4bc5c
commit cee132f0cea0c8ff7e6cb0c0ec3b3c3987c4bc5c
Merge: 4b37c3c 9b32475
Author: Alexander Neundorf 
AuthorDate: Mon Mar 26 16:16:36 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Mar 26 16:16:36 2012 -0400

Merge topic 'AutomocProperCMakeEscaping_13018' into next

9b32475 automoc: add define to test which caused bug #13018
2066511 automoc: fix #13018, proper cmake escaping to avoid false rebuilds
c652812 make cmLocalGenerator::EscapeForCMake() static


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b32475587c1b7a911e5c635611c1fe5296b8740
commit 9b32475587c1b7a911e5c635611c1fe5296b8740
Author: Alex Neundorf 
AuthorDate: Mon Mar 26 22:11:46 2012 +0200
Commit: Alex Neundorf 
CommitDate: Mon Mar 26 22:11:46 2012 +0200

automoc: add define to test which caused bug #13018

This does not really test that the bug is fixed, but at least it makes
it easy to check manually whether the bug is there or not.
I have to see whether I can build a test which does test that
a target is not rebuilt everytime.

Alex

diff --git a/Tests/QtAutomoc/CMakeLists.txt b/Tests/QtAutomoc/CMakeLists.txt
index d255a5a..5e3686d 100644
--- a/Tests/QtAutomoc/CMakeLists.txt
+++ b/Tests/QtAutomoc/CMakeLists.txt
@@ -8,7 +8,7 @@ include(UseQt4)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-add_definitions(-DFOO)
+add_definitions(-DFOO -DSomeDefine="Barx")
 
 # enable relaxed mode so automoc can handle all the special cases:
 set(CMAKE_AUTOMOC_RELAXED_MODE TRUE)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2066511ca9a0b86d45e07357ebec8dd07f1c93b9
commit 2066511ca9a0b86d45e07357ebec8dd07f1c93b9
Author: Alex Neundorf 
AuthorDate: Tue Mar 20 22:52:05 2012 +0100
Commit: Alex Neundorf 
CommitDate: Mon Mar 26 21:45:27 2012 +0200

automoc: fix #13018, proper cmake escaping to avoid false rebuilds

The variables stored in the AutomocInfo.cmake file were not properly
escaped, so when reading them back they could turn into lists, if they
contained double quotes initially.
This patch fixes this by using cmLocalGenerator::EscapeForCMake() to
escape the variables properly.

Alex

diff --git a/Modules/AutomocInfo.cmake.in b/Modules/AutomocInfo.cmake.in
index 29dab97..13f2161 100644
--- a/Modules/AutomocInfo.cmake.in
+++ b/Modules/AutomocInfo.cmake.in
@@ -1,9 +1,9 @@
-set(AM_SOURCES "@_moc_files@" )
-set(AM_HEADERS "@_moc_headers@" )
-set(AM_MOC_COMPILE_DEFINITIONS "@_moc_compile_defs@")
-set(AM_MOC_DEFINITIONS "@_moc_defs@")
-set(AM_MOC_INCLUDES "@_moc_incs@")
-set(AM_MOC_OPTIONS "@_moc_options@")
+set(AM_SOURCES @_moc_files@ )
+set(AM_HEADERS @_moc_headers@ )
+set(AM_MOC_COMPILE_DEFINITIONS @_moc_compile_defs@)
+set(AM_MOC_DEFINITIONS @_moc_defs@)
+set(AM_MOC_INCLUDES @_moc_incs@)
+set(AM_MOC_OPTIONS @_moc_options@)
 set(AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE 
"@CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE@")
 set(AM_CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@/")
 set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@/")
@@ -12,5 +12,5 @@ set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/")
 set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/")
 set(AM_QT_VERSION_MAJOR "@QT_VERSION_MAJOR@" )
 set(AM_Qt5Core_VERSION_MAJOR "@Qt5Core_VERSION_MAJOR@" )
-set(AM_TARGET_NAME "@_moc_target_name@")
+set(AM_TARGET_NAME @_moc_target_name@)
 set(AM_RELAXED_MODE "@_moc_relaxed_mode@")
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 0d0d80c..8b899bc 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -202,13 +202,20 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
   cmMakefile::ScopePushPop varScope(makefile);
   static_cast(varScope);
 
-  makefile->AddDefinition("_moc_target_name", automocTargetName.c_str());
-  makefile->AddDefinition("_moc_incs", _moc_incs.c_str());
-  makefile->AddDefinition("_moc_defs", _moc_defs.c_str());
-  makefile->AddDefini

[Cmake-commits] CMake branch, next, updated. v2.8.7-3320-g407d2b7

[Alexander Neundorf]

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  407d2b73fa3de19590943d025cec93ad7d352b6c (commit)
   via  1ab4b3e123ad6681f420244b4a944df550af6050 (commit)
  from  5afdc89dafe23e0ba24f46a6d4b5465dbdd8b569 (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=407d2b73fa3de19590943d025cec93ad7d352b6c
commit 407d2b73fa3de19590943d025cec93ad7d352b6c
Merge: 5afdc89 1ab4b3e
Author: Alexander Neundorf 
AuthorDate: Tue Mar 20 17:16:08 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Mar 20 17:16:08 2012 -0400

Merge topic 'MinorFixForEcos' into next

1ab4b3e guard eCos.cmake against multiple inclusion (#12987)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ab4b3e123ad6681f420244b4a944df550af6050
commit 1ab4b3e123ad6681f420244b4a944df550af6050
Author: Alex Neundorf 
AuthorDate: Tue Mar 20 22:13:47 2012 +0100
Commit: Alex Neundorf 
CommitDate: Tue Mar 20 22:13:47 2012 +0100

guard eCos.cmake against multiple inclusion (#12987)

Alex

diff --git a/Modules/Platform/eCos.cmake b/Modules/Platform/eCos.cmake
index f0881c0..b437c1a 100644
--- a/Modules/Platform/eCos.cmake
+++ b/Modules/Platform/eCos.cmake
@@ -1,5 +1,12 @@
 # support for eCos http://ecos.sourceware.org
-SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")# -pic 
+
+# Guard against multiple inclusion, which e.g. leads to multiple calls to 
add_definition() #12987
+IF(__ECOS_CMAKE_INCLUDED)
+  RETURN()
+ENDIF()
+SET(__ECOS_CMAKE_INCLUDED TRUE)
+
+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")# -pic
 SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "")   # -shared
 SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") # +s, flag for exe link to 
use shared lib
 SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "")   # -rpath

---

Summary of changes:
 Modules/Platform/eCos.cmake |9 -
 1 files changed, 8 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.7-3318-g5afdc89

[Alexander Neundorf]

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  5afdc89dafe23e0ba24f46a6d4b5465dbdd8b569 (commit)
   via  00af40b29b5170b9709b6a676bf765595d9a0aee (commit)
  from  e93b9ffc78a129b0acc9f57d7a68d04711fdd1fa (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=5afdc89dafe23e0ba24f46a6d4b5465dbdd8b569
commit 5afdc89dafe23e0ba24f46a6d4b5465dbdd8b569
Merge: e93b9ff 00af40b
Author: Alexander Neundorf 
AuthorDate: Tue Mar 20 17:09:24 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Mar 20 17:09:24 2012 -0400

Merge topic 'UseRealPathWhenFindingEclipse' into next

00af40b Eclipse: fix #13036, make version detection work with symlinks


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00af40b29b5170b9709b6a676bf765595d9a0aee
commit 00af40b29b5170b9709b6a676bf765595d9a0aee
Author: Alex Neundorf 
AuthorDate: Tue Mar 20 22:06:38 2012 +0100
Commit: Alex Neundorf 
CommitDate: Tue Mar 20 22:06:38 2012 +0100

Eclipse: fix #13036, make version detection work with symlinks

This patch uses get_filename_component(REALPATH) so symlinks in the path
to Eclipse are resolved, which makes the version detection work in such 
cases.

Alex

diff --git a/Modules/CMakeFindEclipseCDT4.cmake 
b/Modules/CMakeFindEclipseCDT4.cmake
index dd06128..a4264e7 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -20,7 +20,9 @@ FIND_PROGRAM(CMAKE_ECLIPSE_EXECUTABLE NAMES eclipse DOC "The 
Eclipse executable"
 FUNCTION(_FIND_ECLIPSE_VERSION)
   # This code is in a function so the variables used here have only local scope
   IF(CMAKE_ECLIPSE_EXECUTABLE)
-GET_FILENAME_COMPONENT(_ECLIPSE_DIR "${CMAKE_ECLIPSE_EXECUTABLE}" PATH)
+# use REALPATH to resolve symlinks 
(http://public.kitware.com/Bug/view.php?id=13036)
+GET_FILENAME_COMPONENT(_REALPATH_CMAKE_ECLIPSE_EXECUTABLE 
"${CMAKE_ECLIPSE_EXECUTABLE}" REALPATH)
+GET_FILENAME_COMPONENT(_ECLIPSE_DIR 
"${_REALPATH_CMAKE_ECLIPSE_EXECUTABLE}" PATH)
 FILE(GLOB _ECLIPSE_FEATURE_DIR 
"${_ECLIPSE_DIR}/features/org.eclipse.platform*")
 IF("${_ECLIPSE_FEATURE_DIR}" MATCHES 
".+org.eclipse.platform_([0-9]+\\.[0-9]+).+")
   SET(_ECLIPSE_VERSION ${CMAKE_MATCH_1})

---

Summary of changes:
 Modules/CMakeFindEclipseCDT4.cmake |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.7-3314-g6da315f

[Alexander Neundorf]

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  6da315f20996c4a4f838269568af4c265f9cf04f (commit)
   via  6d100f9f469b48ad25a3958e2b4865a9d9d37523 (commit)
   via  d81d83c218be6f8047c1c9cea63e69bc1ad4d9c0 (commit)
   via  b15c0b418bc1239cfea1c605603e61c74023a8fb (commit)
   via  34108cd3b3bf992c0e77ae604125cb73e023f6a8 (commit)
   via  cdabde82c27e4bbf6a4fb54a96b6f0af520ac761 (commit)
   via  f2e0a18761a7b0aa16b7f22e82481aed7b160f58 (commit)
  from  f65e72c9794f4649ce6e0abe9882aba02bbeb6ad (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=6da315f20996c4a4f838269568af4c265f9cf04f
commit 6da315f20996c4a4f838269568af4c265f9cf04f
Merge: f65e72c 6d100f9
Author: Alexander Neundorf 
AuthorDate: Tue Mar 20 15:56:51 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Mar 20 15:56:51 2012 -0400

Merge topic 'ImprovedCOMPONENTSSupportInFindPackage2' into next

6d100f9 find_package: Test rejection of required+optional components
d81d83c add macro check_required_components() to 
configure_package_config_file()
b15c0b4 FPHSA(): add HANDLE_COMPONENTS option
34108cd find_package: add documentation for OPTIONAL_COMPONENTS
cdabde8 FPHSA(): add missing "]" to documentation
f2e0a18 find_package: add OPTIONAL_COMPONENTS keyword


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d100f9f469b48ad25a3958e2b4865a9d9d37523
commit 6d100f9f469b48ad25a3958e2b4865a9d9d37523
Author: Brad King 
AuthorDate: Mon Mar 19 10:49:01 2012 -0400
Commit: Brad King 
CommitDate: Mon Mar 19 10:53:36 2012 -0400

find_package: Test rejection of required+optional components

diff --git 
a/Tests/RunCMake/find_package/ComponentRequiredAndOptional-result.txt 
b/Tests/RunCMake/find_package/ComponentRequiredAndOptional-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/find_package/ComponentRequiredAndOptional-result.txt
@@ -0,0 +1 @@
+1
diff --git 
a/Tests/RunCMake/find_package/ComponentRequiredAndOptional-stderr.txt 
b/Tests/RunCMake/find_package/ComponentRequiredAndOptional-stderr.txt
new file mode 100644
index 000..db8f512
--- /dev/null
+++ b/Tests/RunCMake/find_package/ComponentRequiredAndOptional-stderr.txt
@@ -0,0 +1,8 @@
+CMake Error at ComponentRequiredAndOptional.cmake:1 \(find_package\):
+  find_package called with components that are both required and optional:
+
+CompA
+CompB
+
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/find_package/ComponentRequiredAndOptional.cmake 
b/Tests/RunCMake/find_package/ComponentRequiredAndOptional.cmake
new file mode 100644
index 000..0355f5a
--- /dev/null
+++ b/Tests/RunCMake/find_package/ComponentRequiredAndOptional.cmake
@@ -0,0 +1 @@
+find_package(NotHere REQUIRED CompA CompB CompC OPTIONAL_COMPONENTS CompA 
CompB CompD)
diff --git a/Tests/RunCMake/find_package/RunCMakeTest.cmake 
b/Tests/RunCMake/find_package/RunCMakeTest.cmake
index 34fa733..42705b7 100644
--- a/Tests/RunCMake/find_package/RunCMakeTest.cmake
+++ b/Tests/RunCMake/find_package/RunCMakeTest.cmake
@@ -1,5 +1,6 @@
 include(RunCMake)
 
+run_cmake(ComponentRequiredAndOptional)
 run_cmake(MissingNormal)
 run_cmake(MissingNormalRequired)
 run_cmake(MissingNormalVersion)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d81d83c218be6f8047c1c9cea63e69bc1ad4d9c0
commit d81d83c218be6f8047c1c9cea63e69bc1ad4d9c0
Author: Alex Neundorf 
AuthorDate: Sun Mar 18 21:26:37 2012 +0100
Commit: Brad King 
CommitDate: Mon Mar 19 10:53:36 2012 -0400

add macro check_required_components() to configure_package_config_file()

As discussed on cmake-developers, this patch adds a macro
check_required_components() to the file configured via
configure_package_config_file(), so for proper handling
of components in Config.cmake files users can simply call

check_required_components(PackageName)

and this will do the right thing.

Alex

diff --git a/Modules/CMakePackageConfigHelpers.cmake 
b/Modules/CMakePackageConfigHelpers.cmake
index 98cd560..48039e5 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -2,7 +2,8 @@
 #
 #CONFIGURE_PACKAGE_CONFIG_FILE(  INSTALL_DESTINATION 
 #   [PATH_VARS   
... ]
-#   [NO_SET_AND_CHECK_MACRO] )
+#

[Cmake-commits] CMake branch, next, updated. v2.8.7-3192-gf524357

[Alexander Neundorf]

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  f5243578b93208ede6243223e2ae800196976a66 (commit)
   via  0cf84472d7bf7c62b4f7db5052765cb88ec29eef (commit)
   via  56ae3f94129aebd03af6778895a322a86dc9db77 (commit)
   via  16c0c7376c4ab26a4f0ec667f5888ba746a0617e (commit)
  from  61e71612d6e39d3366a0a08ae0fd0da82a000339 (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=f5243578b93208ede6243223e2ae800196976a66
commit f5243578b93208ede6243223e2ae800196976a66
Merge: 61e7161 0cf8447
Author: Alexander Neundorf 
AuthorDate: Sun Mar 18 06:53:26 2012 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Mar 18 06:53:26 2012 -0400

Merge topic 'find_package_set_FOUND_VariableInConfigFile' into next

0cf8447 find_package: additional test for checking the error message
56ae3f9 find_package: add test for setting Foo_FOUND to FALSE in a Config 
file
16c0c73 find_package: allow Config.cmake to set _FOUND to FALSE


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cf84472d7bf7c62b4f7db5052765cb88ec29eef
commit 0cf84472d7bf7c62b4f7db5052765cb88ec29eef
Author: Alex Neundorf 
AuthorDate: Tue Mar 13 21:19:56 2012 +0100
Commit: Brad King 
CommitDate: Tue Mar 13 16:56:52 2012 -0400

find_package: additional test for checking the error message

This patch adds a test which checks the error message, which is
produced in the case that a Config file has set Foo_FOUND to FALSE
by itself.

Alex

diff --git a/Tests/RunCMake/find_package/RunCMakeTest.cmake 
b/Tests/RunCMake/find_package/RunCMakeTest.cmake
index ba57f99..34fa733 100644
--- a/Tests/RunCMake/find_package/RunCMakeTest.cmake
+++ b/Tests/RunCMake/find_package/RunCMakeTest.cmake
@@ -12,3 +12,4 @@ run_cmake(MissingConfigOneName)
 run_cmake(MissingConfigRequired)
 run_cmake(MissingConfigVersion)
 run_cmake(MixedModeOptions)
+run_cmake(SetFoundFALSE)
diff --git a/Tests/RunCMake/find_package/SetFoundFALSE-stderr.txt 
b/Tests/RunCMake/find_package/SetFoundFALSE-stderr.txt
new file mode 100644
index 000..695f645
--- /dev/null
+++ b/Tests/RunCMake/find_package/SetFoundFALSE-stderr.txt
@@ -0,0 +1,9 @@
+CMake Warning at SetFoundFALSE.cmake:2 \(find_package\):
+  Found package configuration file:
+
+.*/Tests/RunCMake/find_package/SetFoundFALSEConfig.cmake
+
+  but it set SetFoundFALSE_FOUND to FALSE so package "SetFoundFALSE" is
+  considered to be NOT FOUND.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/find_package/SetFoundFALSE.cmake 
b/Tests/RunCMake/find_package/SetFoundFALSE.cmake
new file mode 100644
index 000..fbcec3c
--- /dev/null
+++ b/Tests/RunCMake/find_package/SetFoundFALSE.cmake
@@ -0,0 +1,2 @@
+set(SetFoundFALSE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+find_package(SetFoundFALSE CONFIG)
diff --git a/Tests/RunCMake/find_package/SetFoundFALSEConfig.cmake 
b/Tests/RunCMake/find_package/SetFoundFALSEConfig.cmake
new file mode 100644
index 000..ae6bd14
--- /dev/null
+++ b/Tests/RunCMake/find_package/SetFoundFALSEConfig.cmake
@@ -0,0 +1 @@
+set(SetFoundFALSE_FOUND FALSE)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56ae3f94129aebd03af6778895a322a86dc9db77
commit 56ae3f94129aebd03af6778895a322a86dc9db77
Author: Alex Neundorf 
AuthorDate: Sat Mar 10 12:18:58 2012 +0100
Commit: Brad King 
CommitDate: Tue Mar 13 16:56:52 2012 -0400

find_package: add test for setting Foo_FOUND to FALSE in a Config file

Alex

diff --git a/Tests/FindPackageTest/CMakeLists.txt 
b/Tests/FindPackageTest/CMakeLists.txt
index 73f24e0..eba9db9 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -82,6 +82,7 @@ SET(PACKAGES
   RecursiveA RecursiveB RecursiveC
   ArchA ArchB ArchC ArchD
   EnvA EnvB
+  SetFoundTRUE SetFoundFALSE
   ${CMakeTestSystemPackage}
   )
 FOREACH(p ${PACKAGES})
@@ -117,6 +118,10 @@ FIND_PACKAGE(VersionedC 4.0 EXACT NAMES zot)
 FIND_PACKAGE(VersionedD 1.1 EXACT NAMES Baz)
 FIND_PACKAGE(VersionedE 1.2 EXACT NAMES Baz)
 
+# Test Config files which set Xyz_FOUND themselves:
+FIND_PACKAGE(SetFoundTRUE NO_MODULE)
+FIND_PACKAGE(SetFoundFALSE NO_MODULE)
+
 # Test wrong initial path when result is present.
 SET(WrongA_DIR "${VersionedD_DIR}")
 FIND_PACKAGE(WrongA 1.2 EXACT NAMES Baz)
@@ -201,6 +206,8 @@ SET(ArchC_EXPECTED "lib/arch/zot-3.1/zot-config.cmake")
 SET(ArchD_EXPECTED "lib/arch/cmake/zot-4.0/zot-config.cmake")
 SET(EnvA_EXPECTED "lib/zot-3.1/zot-config.cmake")
 SET(EnvB_MISSING "

[Cmake-commits] CMake branch, next, updated. v2.8.7-3153-ga948b62

[Alexander Neundorf]

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  a948b62ff8c0f72f89f2638222986d782cba47f1 (commit)
   via  e390f87dd197c18e560fb7381f9dad8d15a31297 (commit)
   via  5d1822391765f1466a07884810919c8549556e0a (commit)
   via  1c69cd8febb41c45d4269d6fef24277a60ed3733 (commit)
   via  71c16e457c795bc6635515f026c5f9f8d952b59d (commit)
  from  ab8fc0f1e52eb47d7d1443e2ca2bed9e01daa61c (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=a948b62ff8c0f72f89f2638222986d782cba47f1
commit a948b62ff8c0f72f89f2638222986d782cba47f1
Merge: ab8fc0f e390f87
Author: Alexander Neundorf 
AuthorDate: Sat Mar 10 10:27:59 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Sat Mar 10 10:27:59 2012 -0500

Merge topic 'ExactVersionModeForVersionFile' into next

e390f87 WriteBasicConfigVersionFile: add test for ExactVersion mode
5d18223 write_basic_package_version_file: add ExactVersion mode
1c69cd8 write_basic_package_version_file(): improve documentation
71c16e4 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e390f87dd197c18e560fb7381f9dad8d15a31297
commit e390f87dd197c18e560fb7381f9dad8d15a31297
Author: Alex Neundorf 
AuthorDate: Sat Mar 10 16:19:02 2012 +0100
Commit: Alex Neundorf 
CommitDate: Sat Mar 10 16:19:02 2012 +0100

WriteBasicConfigVersionFile: add test for ExactVersion mode

Alex

diff --git a/Tests/FindPackageTest/CMakeLists.txt 
b/Tests/FindPackageTest/CMakeLists.txt
index a4f213b..73f24e0 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -421,3 +421,73 @@ endif()
 if(PACKAGE_VERSION_UNSUITABLE)
   message(SEND_ERROR "PACKAGE_VERSION_UNSUITABLE set, but must not be !")
 endif()
+
+###
+
+write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/Bar123ConfigVersion.cmake
+ VERSION 1.2.3.17
+ COMPATIBILITY ExactVersion)
+
+set(PACKAGE_VERSION_EXACT FALSE)
+set(PACKAGE_FIND_VERSION 2.3.4)
+include(${CMAKE_CURRENT_BINARY_DIR}/Bar123ConfigVersion.cmake)
+if(PACKAGE_VERSION_COMPATIBLE)
+  message(SEND_ERROR "Found Bar123 with version 1.2.3 (2.3.4 was requested) !")
+endif()
+if(PACKAGE_VERSION_EXACT)
+  message(SEND_ERROR "PACKAGE_VERSION_EXACT set, although it should not be !")
+endif()
+
+set(PACKAGE_FIND_VERSION 1.2)
+include(${CMAKE_CURRENT_BINARY_DIR}/Bar123ConfigVersion.cmake)
+if(PACKAGE_VERSION_COMPATIBLE)
+  message(SEND_ERROR "Found Bar123 with version 1.2.3 (1.2 was requested) !")
+endif()
+if(PACKAGE_VERSION_EXACT)
+  message(SEND_ERROR "PACKAGE_VERSION_EXACT set, although it should not be !")
+endif()
+
+set(PACKAGE_FIND_VERSION 1)
+include(${CMAKE_CURRENT_BINARY_DIR}/Bar123ConfigVersion.cmake)
+if(PACKAGE_VERSION_COMPATIBLE)
+  message(SEND_ERROR "Found Bar123 with version 1.2.3 (1 was requested) !")
+endif()
+if(PACKAGE_VERSION_EXACT)
+  message(SEND_ERROR "PACKAGE_VERSION_EXACT set, although it should not be !")
+endif()
+
+set(PACKAGE_FIND_VERSION 1.2.3.4)
+include(${CMAKE_CURRENT_BINARY_DIR}/Bar123ConfigVersion.cmake)
+if(NOT PACKAGE_VERSION_COMPATIBLE)
+  message(SEND_ERROR "Did not find Bar123 with version 1.2.3 (1.2.3.4 was 
requested) !")
+endif()
+if(PACKAGE_VERSION_EXACT)
+  message(SEND_ERROR "PACKAGE_VERSION_EXACT set, although it should not be !")
+endif()
+
+set(PACKAGE_FIND_VERSION 1.2.3)
+set(PACKAGE_VERSION_EXACT FALSE)
+set(PACKAGE_VERSION_COMPATIBLE FALSE)
+include(${CMAKE_CURRENT_BINARY_DIR}/Bar123ConfigVersion.cmake)
+if(NOT PACKAGE_VERSION_COMPATIBLE)
+  message(SEND_ERROR "Did not find Bar123 with version 1.2.3 (1.2.3 was 
requested) !")
+endif()
+if(PACKAGE_VERSION_EXACT)
+  message(SEND_ERROR "PACKAGE_VERSION_EXACT set, although it should not be !")
+endif()
+
+
+set(PACKAGE_FIND_VERSION 1.2.3.17)
+set(PACKAGE_VERSION_EXACT FALSE)
+set(PACKAGE_VERSION_COMPATIBLE FALSE)
+include(${CMAKE_CURRENT_BINARY_DIR}/Bar123ConfigVersion.cmake)
+if(NOT PACKAGE_VERSION_COMPATIBLE)
+  message(SEND_ERROR "Did not find Bar123 with version 1.2.3 (1.2.3.17 was 
requested) !")
+endif()
+if(NOT PACKAGE_VERSION_EXACT)
+  message(SEND_ERROR "PACKAGE_VERSION_EXACT not set, although it should be !")
+endif()
+
+if(PACKAGE_VERSION_UNSUITABLE)
+  message(SEND_ERROR "PACKAGE_VERSION_UNSUITABLE set, but must not be !")
+endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d1822391765f1466a07884810919c8549556e0a
commit 5d1822391

[Cmake-commits] CMake branch, next, updated. v2.8.7-3085-g7f2ecf8

[Alexander Neundorf]

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  7f2ecf88bc9eec8f9de2cdad70d14852f3170da6 (commit)
   via  e2e031c329f5eef5587279d52171e292512efd79 (commit)
   via  228350a246bfb6c5bb0c3c5c304e6b3cc3dbfa7b (commit)
  from  1772856682f36fbc7bdaee2d5712aad6b629f063 (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=7f2ecf88bc9eec8f9de2cdad70d14852f3170da6
commit 7f2ecf88bc9eec8f9de2cdad70d14852f3170da6
Merge: 1772856 e2e031c
Author: Alexander Neundorf 
AuthorDate: Tue Mar 6 15:46:51 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Mar 6 15:46:51 2012 -0500

Merge topic 'MakingConfigFilesEasier_ConfigureMacro' into next

e2e031c configure_package_config_file(): remove "HELPER_" infix
228350a configure_package_config_file(): fix wording


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2e031c329f5eef5587279d52171e292512efd79
commit e2e031c329f5eef5587279d52171e292512efd79
Author: Alex Neundorf 
AuthorDate: Tue Mar 6 21:40:34 2012 +0100
Commit: Alex Neundorf 
CommitDate: Tue Mar 6 21:40:34 2012 +0100

configure_package_config_file(): remove "HELPER_" infix

Alex

diff --git a/Modules/CMakePackageConfigHelpers.cmake 
b/Modules/CMakePackageConfigHelpers.cmake
index 60b108e..b174e98 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -29,9 +29,9 @@
 # resulting FooConfig.cmake file relocatable.
 # Usage:
 #   1. write a FooConfig.cmake.in file as you are used to
-#   2. insert a line containing only the string "@PACKAGE_HELPER_INIT@"
-#   3. instead of SET(FOO_DIR "@SOME_INSTALL_DIR@"), use SET(FOO_DIR 
"@PACKAGE_HELPER_SOME_INSTALL_DIR@")
-#  (this must be after the @PACKAGE_HELPER_INIT@ line)
+#   2. insert a line containing only the string "@PACKAGE_INIT@"
+#   3. instead of SET(FOO_DIR "@SOME_INSTALL_DIR@"), use SET(FOO_DIR 
"@PACKAGE_SOME_INSTALL_DIR@")
+#  (this must be after the @PACKAGE_INIT@ line)
 #   4. instead of using the normal CONFIGURE_FILE(), use 
CONFIGURE_PACKAGE_CONFIG_FILE()
 #
 # The  and  arguments are the input and output file, the same 
way
@@ -42,7 +42,7 @@
 #
 # The variables  to  given as PATH_VARS are the variables which 
contain
 # install destinations. For each of them the macro will create a helper 
variable
-# PACKAGE_HELPER_. These helper variables must be used
+# PACKAGE_. These helper variables must be used
 # in the FooConfig.cmake.in file for setting the installed location. They are 
calculated
 # by CONFIGURE_PACKAGE_CONFIG_FILE() so that they are always relative to the
 # installed location of the package. This works both for relative and also for 
absolute locations.
@@ -102,10 +102,10 @@
 # With a FooConfig.cmake.in:
 #   set(FOO_VERSION x.y.z)
 #   ...
-#   @PACKAGE_HELPER_INIT@
+#   @PACKAGE_INIT@
 #   ...
-#   set_and_check(FOO_INCLUDE_DIR "@PACKAGE_HELPER_INCLUDE_INSTALL_DIR@")
-#   set_and_check(FOO_SYSCONFIG_DIR "@PACKAGE_HELPER_SYSCONFIG_INSTALL_DIR@")
+#   set_and_check(FOO_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+#   set_and_check(FOO_SYSCONFIG_DIR "@PACKAGE_SYSCONFIG_INSTALL_DIR@")
 
 
 #=
@@ -158,20 +158,20 @@ function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile 
_outputFile)
 else()
   if(IS_ABSOLUTE "${${var}}")
 string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${PACKAGE_PREFIX_DIR}"
-PACKAGE_HELPER_${var} "${${var}}")
+PACKAGE_${var} "${${var}}")
   else()
-set(PACKAGE_HELPER_${var} "\${PACKAGE_PREFIX_DIR}/${${var}}")
+set(PACKAGE_${var} "\${PACKAGE_PREFIX_DIR}/${${var}}")
   endif()
 endif()
   endforeach()
 
-  set(PACKAGE_HELPER_INIT "
-### Expanded from @PACKAGE_HELPER_INIT@ by configure_package_config_file() 
###
+  set(PACKAGE_INIT "
+### Expanded from @PACKAGE_INIT@ by configure_package_config_file() ###
 get_filename_component(PACKAGE_PREFIX_DIR 
\"\${CMAKE_CURRENT_LIST_DIR}/${PACKAGE_RELATIVE_PATH}\" ABSOLUTE)
 ")
 
   if(NOT CCF_NO_SET_AND_CHECK_MACRO)
-set(PACKAGE_HELPER_INIT "${PACKAGE_HELPER_INIT}
+set(PACKAGE_INIT "${PACKAGE_INIT}
 macro(set_and_check _var _file)
   set(\${_var} \"\${_file}\")
   if(NOT EXISTS \"\${_file}\")
@@ -181,7 +181,7 @@ endmacro()
 ")
   endif()
 
-

[Cmake-commits] CMake branch, next, updated. v2.8.7-3067-gbc66108

[Alexander Neundorf]

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  bc661082500d1b66e06b621ce2c565f3fa1e8361 (commit)
   via  c91a54db3766aea8f8ab9d5a011db3bba67b12d4 (commit)
  from  666c6d9a63f98daed3a1a3000b0249df1be04731 (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=bc661082500d1b66e06b621ce2c565f3fa1e8361
commit bc661082500d1b66e06b621ce2c565f3fa1e8361
Merge: 666c6d9 c91a54d
Author: Alexander Neundorf 
AuthorDate: Tue Mar 6 15:18:50 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Mar 6 15:18:50 2012 -0500

Merge topic 'find_package_fatal_error_if_required_and_config_not_found' 
into next

c91a54d find_package: error out if REQUIRED Config has not been found


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c91a54db3766aea8f8ab9d5a011db3bba67b12d4
commit c91a54db3766aea8f8ab9d5a011db3bba67b12d4
Author: Alex Neundorf 
AuthorDate: Tue Mar 6 21:16:24 2012 +0100
Commit: Alex Neundorf 
CommitDate: Tue Mar 6 21:16:24 2012 +0100

find_package: error out if REQUIRED Config has not been found

If in Config mode a configuration file could not be found, cmake printed
an error, but did not actually stop processing. With SetFatalErrorOccured
it does.

Alex

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 9177162..f8139f9 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1062,6 +1062,10 @@ bool cmFindPackageCommand::HandlePackageMode()
 
 this->Makefile->IssueMessage(
   this->Required? cmake::FATAL_ERROR : cmake::WARNING, e.str());
+if (this->Required)
+  {
+  cmSystemTools::SetFatalErrorOccured();
+  }
 
 if (!aw.str().empty())
   {

---

Summary of changes:
 Source/cmFindPackageCommand.cxx |4 
 1 files changed, 4 insertions(+), 0 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.7-2839-g18d8ef2

[Alexander Neundorf]

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  18d8ef268ab8f20b9e78277db61b5db952864411 (commit)
   via  497a6b2cdf854a8160976eb22cf92929acc60282 (commit)
   via  7e3132ac4ed0d17e0ed1283f0a556f7928f6ec87 (commit)
   via  41c627952ed06a62eab35f68235f9e06c3eba2d3 (commit)
  from  2ebf28ea430b136d67dd50468ea7578842421cf9 (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=18d8ef268ab8f20b9e78277db61b5db952864411
commit 18d8ef268ab8f20b9e78277db61b5db952864411
Merge: 2ebf28e 497a6b2
Author: Alexander Neundorf 
AuthorDate: Thu Feb 23 15:43:57 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Feb 23 15:43:57 2012 -0500

Merge topic 'MakingConfigFilesEasier_ConfigureMacro' into next

497a6b2 wrap write_basic_config_version_file as 
write_basic_package_version_file()
7e3132a configure_package_config_file(): add test and fix bug
41c6279 add CMakePackageConfigHelpers: configure_package_config_file()


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=497a6b2cdf854a8160976eb22cf92929acc60282
commit 497a6b2cdf854a8160976eb22cf92929acc60282
Author: Alex Neundorf 
AuthorDate: Fri Feb 17 00:36:18 2012 +0100
Commit: Alex Neundorf 
CommitDate: Fri Feb 17 00:36:18 2012 +0100

wrap write_basic_config_version_file as write_basic_package_version_file()

So the name fits better with configure_package_config_file(), as
discussed on the mailing list. Adapt the documentation accordingly.

Alex

diff --git a/Modules/CMakePackageConfigHelpers.cmake 
b/Modules/CMakePackageConfigHelpers.cmake
index 5c9b3f5..e66999b 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -58,7 +58,32 @@
 # When using the NO_SET_AND_CHECK_MACRO, this macro is not generated into the
 # FooConfig.cmake file.
 #
-# Example:
+# For an example see below the documentation for 
WRITE_BASIC_PACKAGE_VERSION_FILE().
+#
+#
+#  WRITE_BASIC_PACKAGE_VERSION_FILE( filename VERSION major.minor.patch 
COMPATIBILITY (AnyNewerVersion|SameMajorVersion) )
+#
+# Writes a file for use as ConfigVersion.cmake file to .
+# See the documentation of FIND_PACKAGE() for details on this.
+#filename is the output filename, it should be in the build tree.
+#major.minor.patch is the version number of the project to be installed
+# The COMPATIBILITY mode AnyNewerVersion means that the installed package 
version
+# will be considered compatible if it is newer or exactly the same as the 
requested version.
+# If SameMajorVersion is used instead, then the behaviour differs from 
AnyNewerVersion
+# in that the major version number must be the same as requested, e.g. version 
2.0 will
+# not be considered compatible if 1.0 is requested.
+# If your project has more elaborated version matching rules, you will need to 
write your
+# own custom ConfigVersion.cmake file instead of using this macro.
+#
+# Internally, this macro executes configure_file() to create the resulting
+# version file. Depending on the COMPATIBLITY, either the file
+# BasicConfigVersion-SameMajorVersion.cmake.in or 
BasicConfigVersion-AnyNewerVersion.cmake.in
+# is used. Please note that these two files are internal to CMake and you 
should
+# not call configure_file() on them yourself, but they can be used as starting
+# point to create more sophisticted custom ConfigVersion.cmake files.
+#
+#
+# Example using both configure_package_config_file() and 
write_basic_package_version_file():
 # CMakeLists.txt:
 #   set(INCLUDE_INSTALL_DIR include/ ... CACHE )
 #   set(LIB_INSTALL_DIR lib/ ... CACHE )
@@ -68,9 +93,13 @@
 #   configure_package_config_file(FooConfig.cmake.in 
${CMAKE_CURRENT_BINARY_DIR}/FooConfig.cmake
 # INSTALL_DESTINATION 
${LIB_INSTALL_DIR}/Foo/cmake
 # PATH_VARS INCLUDE_INSTALL_DIR 
SYSCONFIG_INSTALL_DIR)
-#  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FooConfig.cmake DESTINATION 
${LIB_INSTALL_DIR}/Foo/cmake )
+#   
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/FooConfigVersion.cmake
+#VERSION 1.2.3
+#COMPATIBILITY SameMajorVersion )
+#   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FooConfig.cmake 
${CMAKE_CURRENT_BINARY_DIR}/FooConfigVersion.cmake
+#   DESTINATION ${LIB_INSTALL_DIR}/Foo/cmake )
 #
-# FooConfig.cmake.in:
+# With a FooConfig.cmake.in:
 #   set(FOO_VERSION x.y.z)
 #   ...
 #   @PACKAGE_HELPER_INIT@
@@ -94,6 +123,12 @@
 
 include(CMakeParseArguments)
 
+include(WriteBasicConfigV

[Cmake-commits] CMake branch, next, updated. v2.8.7-2709-g7339cab

[Alexander Neundorf]

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  7339cab0d39c5bcdceca220d4397b796a6fbab56 (commit)
   via  54e1f6f5a572e47c5598fd53e3b9eb0a66739def (commit)
  from  704a6b00f36f8bfbafd05c074500d63768a13989 (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=7339cab0d39c5bcdceca220d4397b796a6fbab56
commit 7339cab0d39c5bcdceca220d4397b796a6fbab56
Merge: 704a6b0 54e1f6f
Author: Alexander Neundorf 
AuthorDate: Sat Feb 18 15:02:15 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Sat Feb 18 15:02:15 2012 -0500

Merge topic 'GenerateExportHeader_MinorFix' into next

54e1f6f GenerateExportHeader: use double quotes around _gcc_version


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54e1f6f5a572e47c5598fd53e3b9eb0a66739def
commit 54e1f6f5a572e47c5598fd53e3b9eb0a66739def
Author: Alex Neundorf 
AuthorDate: Sat Feb 18 20:58:19 2012 +0100
Commit: Alex Neundorf 
CommitDate: Sat Feb 18 20:58:19 2012 +0100

GenerateExportHeader: use double quotes around _gcc_version

The GenerateExportHeaders test was failing on one machine, the version
could not be determined there, so the _gcc_version was empty,
so the first argument to if() was empty, so it complained:
http://open.cdash.org/testDetails.php?test=135623436&build=2016288
Use double quotes to turn the non-existant first argument into an empty
string.

Alex

diff --git a/Modules/GenerateExportHeader.cmake 
b/Modules/GenerateExportHeader.cmake
index 781b6e7..f3f61f6 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -173,7 +173,7 @@ macro(_test_compiler_hidden_visibility)
 _gcc_version "${_gcc_version_info}")
 endif()
 
-if(${_gcc_version} VERSION_LESS "4.2")
+if("${_gcc_version}" VERSION_LESS "4.2")
   set(GCC_TOO_OLD TRUE)
   message(WARNING "GCC version older than 4.2")
 endif()

---

Summary of changes:
 Modules/GenerateExportHeader.cmake |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.7-2676-ga341fe5

[Alexander Neundorf]

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  a341fe5a8f14f9fbf314e7ac927795ba38ef8c13 (commit)
   via  939991dbe6350eb0d9ac8983be67c776fce0baad (commit)
   via  ba1ea104670df8cb86728c4d0fb4ca48d45364af (commit)
  from  f131113d11ca69ec71f090b402fbd04a38e14c41 (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=a341fe5a8f14f9fbf314e7ac927795ba38ef8c13
commit a341fe5a8f14f9fbf314e7ac927795ba38ef8c13
Merge: f131113 939991d
Author: Alexander Neundorf 
AuthorDate: Fri Feb 17 10:44:38 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Feb 17 10:44:38 2012 -0500

Merge topic 'HandleTargetsInCMakeRequiredLibraries' into next

939991d fix bootstrap: move while() and endwhile() into the bootstrap build
ba1ea10 strip trailing whitespace


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=939991dbe6350eb0d9ac8983be67c776fce0baad
commit 939991dbe6350eb0d9ac8983be67c776fce0baad
Author: Alex Neundorf 
AuthorDate: Fri Feb 17 16:42:06 2012 +0100
Commit: Alex Neundorf 
CommitDate: Fri Feb 17 16:42:06 2012 +0100

fix bootstrap: move while() and endwhile() into the bootstrap build

Alex

diff --git a/Source/cmBootstrapCommands.cxx b/Source/cmBootstrapCommands.cxx
index cb5dc4c..9097a74 100644
--- a/Source/cmBootstrapCommands.cxx
+++ b/Source/cmBootstrapCommands.cxx
@@ -38,6 +38,7 @@
 #include "cmEndFunctionCommand.cxx"
 #include "cmEndIfCommand.cxx"
 #include "cmEndMacroCommand.cxx"
+#include "cmEndWhileCommand.cxx"
 #include "cmExecProgramCommand.cxx"
 #include "cmExecuteProcessCommand.cxx"
 #include "cmExternalMakefileProjectGenerator.cxx"
@@ -91,6 +92,7 @@
 #include "cmTryCompileCommand.cxx"
 #include "cmTryRunCommand.cxx"
 #include "cmUnsetCommand.cxx"
+#include "cmWhileCommand.cxx"
 
 void GetBootstrapCommands(std::list& commands)
 {
@@ -116,6 +118,7 @@ void GetBootstrapCommands(std::list& commands)
   commands.push_back(new cmEndFunctionCommand);
   commands.push_back(new cmEndIfCommand);
   commands.push_back(new cmEndMacroCommand);
+  commands.push_back(new cmEndWhileCommand);
   commands.push_back(new cmExecProgramCommand);
   commands.push_back(new cmExecuteProcessCommand);
   commands.push_back(new cmFileCommand);
@@ -164,4 +167,5 @@ void GetBootstrapCommands(std::list& commands)
   commands.push_back(new cmTryCompileCommand);
   commands.push_back(new cmTryRunCommand);
   commands.push_back(new cmUnsetCommand);
+  commands.push_back(new cmWhileCommand);
 }
diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx
index bb1e4e2..49ed967 100644
--- a/Source/cmCommands.cxx
+++ b/Source/cmCommands.cxx
@@ -14,7 +14,6 @@
 #include "cmAuxSourceDirectoryCommand.cxx"
 #include "cmBuildNameCommand.cxx"
 #include "cmElseIfCommand.cxx"
-#include "cmEndWhileCommand.cxx"
 #include "cmExportCommand.cxx"
 #include "cmExportLibraryDependencies.cxx"
 #include "cmFLTKWrapUICommand.cxx"
@@ -34,7 +33,6 @@
 #include "cmVariableRequiresCommand.cxx"
 #include "cmVariableWatchCommand.cxx"
 
-#include "cmWhileCommand.cxx"
 #include "cmWriteFileCommand.cxx"
 
 // This one must be last because it includes windows.h and
@@ -53,7 +51,6 @@ void GetPredefinedCommands(std::list&
   commands.push_back(new cmAuxSourceDirectoryCommand);
   commands.push_back(new cmBuildNameCommand);
   commands.push_back(new cmElseIfCommand);
-  commands.push_back(new cmEndWhileCommand);
   commands.push_back(new cmExportCommand);
   commands.push_back(new cmExportLibraryDependenciesCommand);
   commands.push_back(new cmFLTKWrapUICommand);
@@ -73,7 +70,6 @@ void GetPredefinedCommands(std::list&
   commands.push_back(new cmUtilitySourceCommand);
   commands.push_back(new cmVariableRequiresCommand);
   commands.push_back(new cmVariableWatchCommand);
-  commands.push_back(new cmWhileCommand);
   commands.push_back(new cmWriteFileCommand);
 #endif
 }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba1ea104670df8cb86728c4d0fb4ca48d45364af
commit ba1ea104670df8cb86728c4d0fb4ca48d45364af
Author: Alex Neundorf 
AuthorDate: Fri Feb 17 16:41:14 2012 +0100
Commit: Alex Neundorf 
CommitDate: Fri Feb 17 16:41:14 2012 +0100

strip trailing whitespace

Alex

diff --git a/Source/cmBootstrapCommands.cxx b/Source/cmBootstrapCommands.cxx
index 554f452..cb5dc4c 100644
--- a/Source/cmBootstrapCommands.cxx
+++ b/Source/cmBootstrapCommands.cxx
@@ -

[Cmake-commits] CMake branch, next, updated. v2.8.7-2673-gf131113

[Alexander Neundorf]

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  f131113d11ca69ec71f090b402fbd04a38e14c41 (commit)
   via  fd866f01d484c14b57eb3c2619a06142d6ac85df (commit)
   via  d46bce95aa3bba22f921906bf74afacc3b6251c9 (commit)
   via  2a48331e5d1ba855429b8c35e832143f18764e1b (commit)
   via  d03606a19cc05872baf23269ae8ec61d2e0719e8 (commit)
  from  ffdef8726313f88bcfc534f37a989db8c5b93c47 (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=f131113d11ca69ec71f090b402fbd04a38e14c41
commit f131113d11ca69ec71f090b402fbd04a38e14c41
Merge: ffdef87 fd866f0
Author: Alexander Neundorf 
AuthorDate: Fri Feb 17 05:47:48 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Fri Feb 17 05:47:48 2012 -0500

Merge topic 'FindPackage_ImprovedErrorMessages' into next

fd866f0 find_package: print the error message if an invalid CONFIGS name is 
used
d46bce9 find_package(): improved error message, mention version number
2a48331 find_package(): improved error message mentioning CMAKE_PREFIX_PATH
d03606a KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd866f01d484c14b57eb3c2619a06142d6ac85df
commit fd866f01d484c14b57eb3c2619a06142d6ac85df
Author: Alex Neundorf 
AuthorDate: Fri Feb 17 11:43:27 2012 +0100
Commit: Alex Neundorf 
CommitDate: Fri Feb 17 11:45:24 2012 +0100

find_package: print the error message if an invalid CONFIGS name is used

Alex

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index c3e472b..a166f89 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -538,6 +538,7 @@ bool cmFindPackageCommand
 e << "given CONFIGS option followed by invalid file name \""
   << args[i] << "\".  The names given must be file names without "
   << "a path and with a \".cmake\" extension.";
+this->SetError(e.str().c_str());
 return false;
 }
   this->Configs.push_back(args[i]);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d46bce95aa3bba22f921906bf74afacc3b6251c9
commit d46bce95aa3bba22f921906bf74afacc3b6251c9
Author: Alex Neundorf 
AuthorDate: Fri Feb 17 11:37:29 2012 +0100
Commit: Alex Neundorf 
CommitDate: Fri Feb 17 11:45:18 2012 +0100

find_package(): improved error message, mention version number

Now when Find-module or the config file have not been found at all,
the required version is printed too, so the user knows which version
of the package he has to install:

CMake Error at CMakeLists.txt:7 (find_package):
  Could not find a configuration file for package ecm
  (requested version 0.0.4) with one of the following names:

ecmConfig.cmake
ecm-config.cmake

  To find the configuration file, set CMAKE_PREFIX_PATH to the installation
  prefix of ecm, or set ecm_DIR to the
  directory containing a CMake configuration file for ecm.

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 4fcb4e7..c3e472b 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -911,6 +911,14 @@ bool cmFindPackageCommand::HandlePackageMode()
   }
 else
   {
+  std::string requestedVersionString;
+  if(!this->Version.empty())
+{
+requestedVersionString = " (requested version ";
+requestedVersionString += this->Version;
+requestedVersionString += ")";
+}
+
   e << "Could not find ";
   if(!this->NoModule)
 {
@@ -919,11 +927,12 @@ bool cmFindPackageCommand::HandlePackageMode()
   if(this->Configs.size() == 1)
 {
 e << "a configuration file named " << this->Configs[0]
-  << " for package " << this->Name << ".\n";
+  << " for package " << this->Name << requestedVersionString << ".\n";
 }
   else
 {
 e << "a configuration file for package " << this->Name
+  << requestedVersionString
   << " with one of the following names:\n";
 for(std::vector::const_iterator ci=this->Configs.begin();
 ci != this->Configs.end(); ++ci)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a48331e5d1ba855429b8c35e832143f18764e1b
commit 2a48331e5d1ba8

[Cmake-commits] CMake branch, next, updated. v2.8.7-2662-gf08963b

[Alexander Neundorf]

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  f08963bf9baf9312ec01ecb8f4eb57486c27083f (commit)
   via  43118d04cbb08814fd98e87afeadcfb703277606 (commit)
  from  d8d31a644abde62197ba3dad669420e87339a924 (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=f08963bf9baf9312ec01ecb8f4eb57486c27083f
commit f08963bf9baf9312ec01ecb8f4eb57486c27083f
Merge: d8d31a6 43118d0
Author: Alexander Neundorf 
AuthorDate: Thu Feb 16 17:39:44 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Feb 16 17:39:44 2012 -0500

Merge topic 'HandleTargetsInCMakeRequiredLibraries' into next

43118d0 CMakeExpandImportedTargets: add CONFIGURATION parameter


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43118d04cbb08814fd98e87afeadcfb703277606
commit 43118d04cbb08814fd98e87afeadcfb703277606
Author: Alex Neundorf 
AuthorDate: Thu Feb 16 23:35:43 2012 +0100
Commit: Alex Neundorf 
CommitDate: Thu Feb 16 23:35:43 2012 +0100

CMakeExpandImportedTargets: add CONFIGURATION parameter

As pointed out by Brad, now that cmake_expand_imported_targets() is
more generic, hardcoding to use CMAKE_TRY_COMPILE_CONFIGURATION is not
a good idea. So add a CONFIGURATION parameter, which defaults to
CMAKE_CONFIGURATION_TYPES[0] (if set) or CMAKE_BUILD_TYPE otherwise.

Use this with ${CMAKE_TRY_COMPILE_CONFIGURATION} in all the Check*.cmake
files.

Alex

diff --git a/Modules/CMakeExpandImportedTargets.cmake 
b/Modules/CMakeExpandImportedTargets.cmake
index 88dedeb..fba071a 100644
--- a/Modules/CMakeExpandImportedTargets.cmake
+++ b/Modules/CMakeExpandImportedTargets.cmake
@@ -1,13 +1,19 @@
-# CMAKE_EXPAND_IMPORTED_TARGETS( LIBRARIES lib1 lib2...libN)
+# CMAKE_EXPAND_IMPORTED_TARGETS( LIBRARIES lib1 lib2...libN
+# [CONFIGURATION ] )
 #
 # CMAKE_EXPAND_IMPORTED_TARGETS() takes a list of libraries and replaces
 # all imported targets contained in this list with their actual file paths
 # of the referenced libraries on disk, including the libraries from their
 # link interfaces.
+# If a CONFIGURATION is given, it uses the respective configuration of the
+# imported targets if it exists. If no CONFIGURATION is given, it uses
+# the first configuration from ${CMAKE_CONFIGURATION_TYPES} if set, otherwise
+# ${CMAKE_BUILD_TYPE}.
 # This macro is used by all Check*.cmake files which use
 # TRY_COMPILE() or TRY_RUN() and support CMAKE_REQUIRED_LIBRARIES , so that
 # these checks support imported targets in CMAKE_REQUIRED_LIBRARIES:
-#cmake_expand_imported_targets(expandedLibs LIBRARIES 
${CMAKE_REQUIRED_LIBRARIES} )
+#cmake_expand_imported_targets(expandedLibs LIBRARIES 
${CMAKE_REQUIRED_LIBRARIES}
+#   CONFIGURATION 
"${CMAKE_TRY_COMPILE_CONFIGURATION}" )
 
 
 #=
@@ -24,16 +30,31 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
+include(CMakeParseArguments)
 
-function(CMAKE_EXPAND_IMPORTED_TARGETS _RESULT _LIB)
+function(CMAKE_EXPAND_IMPORTED_TARGETS _RESULT )
 
-   if(NOT "${_LIB}" STREQUAL "LIBRARIES")
-  message(FATAL_ERROR "cmake_expand_imported_targets() called with bad 
second argument \"${_LIB}\", expected keyword \"LIBRARIES\".")
+   set(options )
+   set(oneValueArgs CONFIGURATION )
+   set(multiValueArgs LIBRARIES )
+
+   cmake_parse_arguments(CEIT "${options}" "${oneValueArgs}" 
"${multiValueArgs}"  ${ARGN})
+
+   if(CEIT_UNPARSED_ARGUMENTS)
+  message(FATAL_ERROR "Unknown keywords given to 
CMAKE_EXPAND_IMPORTED_TARGETS(): \"${CEIT_UNPARSED_ARGUMENTS}\"")
+   endif()
+
+   if(NOT CEIT_CONFIGURATION)
+  if(CMAKE_CONFIGURATION_TYPES)
+ list(GET CMAKE_CONFIGURATION_TYPES 0 CEIT_CONFIGURATION)
+  else()
+ set(CEIT_CONFIGURATION ${CMAKE_BUILD_TYPE})
+  endif()
endif()
 
# handle imported library targets
 
-   set(_CCSR_REQ_LIBS ${ARGN})
+   set(_CCSR_REQ_LIBS ${CEIT_LIBRARIES})
 
set(_CHECK_FOR_IMPORTED_TARGETS TRUE)
set(_CCSR_LOOP_COUNTER 0)
@@ -61,7 +82,7 @@ function(CMAKE_EXPAND_IMPORTED_TARGETS _RESULT _LIB)
 
 # if one of the imported configurations equals 
${CMAKE_TRY_COMPILE_CONFIGURATION},
 # use it, otherwise simply use the first one:
-list(FIND _importedConfigs "${CMAKE_TRY_COMPILE_CONFIGURATION}" 
_configInd

[Cmake-commits] CMake branch, next, updated. v2.8.7-2655-gc3c9b50

[Alexander Neundorf]

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  c3c9b50240cc6a57897a6c3593282545e82cf85e (commit)
   via  df3505f510dc3469bb3af3cc40cac54159dfc7d6 (commit)
  from  29fe3cbd7d5cb34465203abd4e27dcbe12103bd2 (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=c3c9b50240cc6a57897a6c3593282545e82cf85e
commit c3c9b50240cc6a57897a6c3593282545e82cf85e
Merge: 29fe3cb df3505f
Author: Alexander Neundorf 
AuthorDate: Thu Feb 16 15:25:23 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Feb 16 15:25:23 2012 -0500

Merge topic 'HandleTargetsInCMakeRequiredLibraries' into next

df3505f cmake_expand_imported_targets(): add documentation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df3505f510dc3469bb3af3cc40cac54159dfc7d6
commit df3505f510dc3469bb3af3cc40cac54159dfc7d6
Author: Alex Neundorf 
AuthorDate: Thu Feb 16 21:23:18 2012 +0100
Commit: Alex Neundorf 
CommitDate: Thu Feb 16 21:23:18 2012 +0100

cmake_expand_imported_targets(): add documentation

Alex

diff --git a/Modules/CMakeExpandImportedTargets.cmake 
b/Modules/CMakeExpandImportedTargets.cmake
index bb5b845..88dedeb 100644
--- a/Modules/CMakeExpandImportedTargets.cmake
+++ b/Modules/CMakeExpandImportedTargets.cmake
@@ -1,13 +1,14 @@
+# CMAKE_EXPAND_IMPORTED_TARGETS( LIBRARIES lib1 lib2...libN)
+#
+# CMAKE_EXPAND_IMPORTED_TARGETS() takes a list of libraries and replaces
+# all imported targets contained in this list with their actual file paths
+# of the referenced libraries on disk, including the libraries from their
+# link interfaces.
+# This macro is used by all Check*.cmake files which use
+# TRY_COMPILE() or TRY_RUN() and support CMAKE_REQUIRED_LIBRARIES , so that
+# these checks support imported targets in CMAKE_REQUIRED_LIBRARIES:
+#cmake_expand_imported_targets(expandedLibs LIBRARIES 
${CMAKE_REQUIRED_LIBRARIES} )
 
-# This is a helper function used by all Check*.cmake files which use
-# TRY_COMPILE() or TRY_RUN() and support CMAKE_REQUIRED_LIBRARIES .
-# It takes the CMAKE_REQUIRED_LIBRARY variable and searches it for imported
-# (library) targets. Since the project created by TRY_COMPILE() (and TRY_RUN())
-# does not know about these imported targets, this macro here replaces these
-# imported targets with the actual library files on disk and it also
-# adds the libraries from the link interface of these imported targets.
-# E.g the imported target KDE4__kdeui is replaced on my system with 
/opt/kdelibs/lib/libkdeui.so
-# and the link interface libraries, which includes e.g. 
/opt/kdelibs/lib/libkdecore.so.
 
 #=
 # Copyright 2012 Kitware, Inc.

---

Summary of changes:
 Modules/CMakeExpandImportedTargets.cmake |   19 ++-
 1 files changed, 10 insertions(+), 9 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.7-2637-g7733734

[Alexander Neundorf]

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  7733734dfd1f408ceb2b2dc350ebe93c034b5163 (commit)
   via  b2951624dc1f007b21f8b1ba12f5c60465172b37 (commit)
   via  e2042b68d36e0881bfc00f926a275dda3d6cbc9d (commit)
  from  4e006d6624ce569e2760b1ddc1f44838d3e2fe6a (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=7733734dfd1f408ceb2b2dc350ebe93c034b5163
commit 7733734dfd1f408ceb2b2dc350ebe93c034b5163
Merge: 4e006d6 b295162
Author: Alexander Neundorf 
AuthorDate: Thu Feb 16 03:42:14 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Feb 16 03:42:14 2012 -0500

Merge topic 'FindX11_SearchXxf86vm' into next

b295162 fix #6976: FindX11 also searches for X11_Xxf86vm_LIB
e2042b6 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2951624dc1f007b21f8b1ba12f5c60465172b37
commit b2951624dc1f007b21f8b1ba12f5c60465172b37
Author: Alex Neundorf 
AuthorDate: Thu Feb 16 09:36:27 2012 +0100
Commit: Alex Neundorf 
CommitDate: Thu Feb 16 09:36:27 2012 +0100

fix #6976: FindX11 also searches for X11_Xxf86vm_LIB

This contains a change, which changes the behaviour a bit:
now X11_xf86vmode_FOUND is only set to TRUE and the include directory
is added to X11_INCLUDE_DIR, if additionally to X11_xf86vmode_INCLUDE_PATH
also X11_Xxf86vm_LIB has been found.
I hope this doesn't cause regressions somewhere.

Alex

diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
index 1735bd4..76fb3c9 100644
--- a/Modules/FindX11.cmake
+++ b/Modules/FindX11.cmake
@@ -20,7 +20,7 @@
 #X11_XShm_INCLUDE_PATH, (in X11_Xext_LIB),  
X11_XShm_FOUND
 #X11_Xshape_INCLUDE_PATH,   (in X11_Xext_LIB),  
X11_Xshape_FOUND
 #X11_xf86misc_INCLUDE_PATH, X11_Xxf86misc_LIB,  
X11_xf86misc_FOUND
-#X11_xf86vmode_INCLUDE_PATH,
X11_xf86vmode_FOUND
+#X11_xf86vmode_INCLUDE_PATH,X11_Xxf86vm_LIB 
X11_xf86vmode_FOUND
 #X11_Xfixes_INCLUDE_PATH,   X11_Xfixes_LIB, 
X11_Xfixes_FOUND
 #X11_Xft_INCLUDE_PATH,  X11_Xft_LIB,
X11_Xft_FOUND
 #X11_Xi_INCLUDE_PATH,   X11_Xi_LIB, 
X11_Xi_FOUND
@@ -146,6 +146,7 @@ IF (UNIX)
   FIND_LIBRARY(X11_XTest_LIB Xtst${X11_LIB_SEARCH_PATH})
   FIND_LIBRARY(X11_Xv_LIB Xv ${X11_LIB_SEARCH_PATH})
   FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc   ${X11_LIB_SEARCH_PATH})
+  FIND_LIBRARY(X11_Xxf86vm_LIB Xxf86vm   ${X11_LIB_SEARCH_PATH})
 
   SET(X11_LIBRARY_DIR "")
   IF(X11_X11_LIB)
@@ -270,10 +271,10 @@ IF (UNIX)
  SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_xf86misc_INCLUDE_PATH})
   ENDIF (X11_xf86misc_INCLUDE_PATH  AND X11_Xxf86misc_LIB)
 
-  IF (X11_xf86vmode_INCLUDE_PATH)
+  IF (X11_xf86vmode_INCLUDE_PATH AND X11_Xxf86vm_LIB)
  SET(X11_xf86vmode_FOUND TRUE)
  SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_xf86vmode_INCLUDE_PATH})
-  ENDIF (X11_xf86vmode_INCLUDE_PATH)
+  ENDIF (X11_xf86vmode_INCLUDE_PATH AND X11_Xxf86vm_LIB)
 
   IF (X11_Xcursor_INCLUDE_PATH AND X11_Xcursor_LIB)
  SET(X11_Xcursor_FOUND TRUE)
@@ -443,6 +444,7 @@ IF (UNIX)
 X11_XRes_INCLUDE_PATH
 X11_Xxf86misc_LIB
 X11_xf86misc_INCLUDE_PATH
+X11_Xxf86vm_LIB
 X11_xf86vmode_INCLUDE_PATH
 X11_Xi_LIB
 X11_Xi_INCLUDE_PATH

---

Summary of changes:
 Modules/FindX11.cmake |8 +---
 Source/kwsys/kwsysDateStamp.cmake |2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v2.8.7-2634-g4e006d6

[Alexander Neundorf]

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  4e006d6624ce569e2760b1ddc1f44838d3e2fe6a (commit)
   via  3b488228032e32f03a639af3a084a4e5ad3201bd (commit)
  from  2128373082002cd11c2e3802d8346fc6d83df6f3 (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=4e006d6624ce569e2760b1ddc1f44838d3e2fe6a
commit 4e006d6624ce569e2760b1ddc1f44838d3e2fe6a
Merge: 2128373 3b48822
Author: Alexander Neundorf 
AuthorDate: Thu Feb 16 02:30:36 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Feb 16 02:30:36 2012 -0500

Merge topic 'FindGetTextFixMultipleTargets' into next

3b48822 FindGetText: fix multiple targets with the same name problem 
(CMP0002)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b488228032e32f03a639af3a084a4e5ad3201bd
commit 3b488228032e32f03a639af3a084a4e5ad3201bd
Author: Alex Neundorf 
AuthorDate: Sun Feb 12 18:57:28 2012 +0100
Commit: Alex Neundorf 
CommitDate: Sun Feb 12 18:57:28 2012 +0100

FindGetText: fix multiple targets with the same name problem (CMP0002)

The functions in FindGettext create a custom target. If the functions
are called multiple times, multiple times the same target is created.
This works only if CMP0002 is set to OLD.
With this patch there is only one central target created, and each
invocation of the function creates a target with a unique name and
make the central target depend on this one.

Alex

diff --git a/Modules/FindGettext.cmake b/Modules/FindGettext.cmake
index 635090b..6dbc026 100644
--- a/Modules/FindGettext.cmake
+++ b/Modules/FindGettext.cmake
@@ -61,6 +61,17 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gettext
 
 INCLUDE(CMakeParseArguments)
 
+FUNCTION(_GETTEXT_GET_UNIQUE_TARGET_NAME _name _unique_name)
+   SET(propertyName "_GETTEXT_UNIQUE_COUNTER_${_name}")
+   GET_PROPERTY(currentCounter GLOBAL PROPERTY "${propertyName}")
+   IF(NOT currentCounter)
+  SET(currentCounter 1)
+   ENDIF()
+   SET(${_unique_name} "${_name}_${currentCounter}" PARENT_SCOPE)
+   MATH(EXPR currentCounter "${currentCounter} + 1")
+   SET_PROPERTY(GLOBAL PROPERTY ${propertyName} ${currentCounter} )
+ENDFUNCTION()
+
 MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
# make it a real variable, so we can modify it here
SET(_firstPoFile "${_firstPoFileArg}")
@@ -94,7 +105,15 @@ MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
 
ENDFOREACH (_currentPoFile )
 
-   ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles})
+   IF(NOT TARGET translations)
+  ADD_CUSTOM_TARGET(translations)
+   ENDIF()
+
+  _GETTEXT_GET_UNIQUE_TARGET_NAME(translations uniqueTargetName)
+
+   ADD_CUSTOM_TARGET(${uniqueTargetName} ${_addToAll} DEPENDS ${_gmoFiles})
+
+   ADD_DEPENDENCIES(translations ${uniqueTargetName})
 
 ENDMACRO(GETTEXT_CREATE_TRANSLATIONS )
 
@@ -133,11 +152,20 @@ FUNCTION(GETTEXT_PROCESS_POT_FILE _potFile)
   LIST(APPEND _gmoFiles ${_gmoFile})
ENDFOREACH (_lang )
 
+  IF(NOT TARGET potfiles)
+ ADD_CUSTOM_TARGET(potfiles)
+  ENDIF()
+
+  _GETTEXT_GET_UNIQUE_TARGET_NAME( potfiles uniqueTargetName)
+
IF(_parsedArguments_ALL)
-  ADD_CUSTOM_TARGET(potfiles ALL DEPENDS ${_gmoFiles})
+  ADD_CUSTOM_TARGET(${uniqueTargetName} ALL DEPENDS ${_gmoFiles})
ELSE(_parsedArguments_ALL)
-  ADD_CUSTOM_TARGET(potfiles DEPENDS ${_gmoFiles})
+  ADD_CUSTOM_TARGET(${uniqueTargetName} DEPENDS ${_gmoFiles})
ENDIF(_parsedArguments_ALL)
+
+   ADD_DEPENDENCIES(potfiles ${uniqueTargetName})
+
 ENDFUNCTION(GETTEXT_PROCESS_POT_FILE)
 
 
@@ -165,11 +193,21 @@ FUNCTION(GETTEXT_PROCESS_PO_FILES _lang)
   LIST(APPEND _gmoFiles ${_gmoFile})
ENDFOREACH(_current_PO_FILE)
 
+
+  IF(NOT TARGET pofiles)
+ ADD_CUSTOM_TARGET(pofiles)
+  ENDIF()
+
+  _GETTEXT_GET_UNIQUE_TARGET_NAME( pofiles uniqueTargetName)
+
IF(_parsedArguments_ALL)
-  ADD_CUSTOM_TARGET(pofiles ALL DEPENDS ${_gmoFiles})
+  ADD_CUSTOM_TARGET(${uniqueTargetName} ALL DEPENDS ${_gmoFiles})
ELSE(_parsedArguments_ALL)
-  ADD_CUSTOM_TARGET(pofiles DEPENDS ${_gmoFiles})
+  ADD_CUSTOM_TARGET(${uniqueTargetName} DEPENDS ${_gmoFiles})
ENDIF(_parsedArguments_ALL)
+
+   ADD_DEPENDENCIES(pofiles ${uniqueTargetName})
+
 ENDFUNCTION(GETTEXT_PROCESS_PO_FILES)
 
 IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )

---

Summary of changes:
 Modules/FindGettext.cmake |   48 
 1 files ch

[Cmake-commits] CMake branch, next, updated. v2.8.7-2566-g5994d9d

[Alexander Neundorf]

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  5994d9dab7647a44d88bc6e7aadee60e379daf9f (commit)
   via  e6c5b9452a0e49d93e775169bb5bf63ea016df5e (commit)
  from  85f3d9ad47f019242cb91478d8142bb79d19dd85 (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=5994d9dab7647a44d88bc6e7aadee60e379daf9f
commit 5994d9dab7647a44d88bc6e7aadee60e379daf9f
Merge: 85f3d9a e6c5b94
Author: Alexander Neundorf 
AuthorDate: Sat Feb 11 12:22:21 2012 -0500
Commit: CMake Topic Stage 
CommitDate: Sat Feb 11 12:22:21 2012 -0500

Merge topic 'FixFeatureSummaryForREQUIREDPackages' into next

e6c5b94 fix FeatureSummary for REQUIRED packages, they were reported as 
OPTIONAL


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6c5b9452a0e49d93e775169bb5bf63ea016df5e
commit e6c5b9452a0e49d93e775169bb5bf63ea016df5e
Author: Alex Neundorf 
AuthorDate: Sat Feb 11 18:04:26 2012 +0100
Commit: Alex Neundorf 
CommitDate: Sat Feb 11 18:04:26 2012 +0100

fix FeatureSummary for REQUIRED packages, they were reported as OPTIONAL

Alex

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 7d3f09b..22bb628 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1226,6 +1226,15 @@ void cmFindPackageCommand::AppendSuccessInformation()
 }
   this->Makefile->GetCMakeInstance()->SetProperty(versionInfoPropName.c_str(),
   versionInfo.c_str());
+  if (this->Required)
+{
+std::string requiredInfoPropName = "_CMAKE_";
+requiredInfoPropName += this->Name;
+requiredInfoPropName += "_TYPE";
+this->Makefile->GetCMakeInstance()->SetProperty(
+ requiredInfoPropName.c_str(), "REQUIRED");
+}
+
 
   // Restore original state of "_FIND_" variables we set.
   this->RestoreFindDefinitions();

---

Summary of changes:
 Source/cmFindPackageCommand.cxx |9 +
 1 files changed, 9 insertions(+), 0 deletions(-)


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