[Cmake-commits] CMake branch, master, updated. v2.8.11-186-gdc85291

[Brad King]

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

The branch, master has been updated
   via  dc85291c57be92e6f4a9b86ae87d5639fbb4dd6f (commit)
   via  74f24b28423751bd775b66e13078db2fa71a932d (commit)
  from  239604685d3cd0a9f0e96bb69314ed98df9e3bea (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=dc85291c57be92e6f4a9b86ae87d5639fbb4dd6f
commit dc85291c57be92e6f4a9b86ae87d5639fbb4dd6f
Merge: 2396046 74f24b2
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 24 09:19:43 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 24 09:19:43 2013 -0400

Merge topic 'geh-add-missing-test'

74f24b2 Tests/Module/GenerateExportHeader: Test exported free-function


---

Summary of changes:
 .../libsharedtest/CMakeLists.txt   |1 +
 1 files changed, 1 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, master, updated. v2.8.11-190-g6aba976

[Brad King]

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

The branch, master has been updated
   via  6aba97642737873921f312e0bbaf18edfabf6e6f (commit)
   via  7e24997fedbcaa4f1db8e295ca1845dadf50ff55 (commit)
  from  a2e80aaa822eee5ee5e27857f711d18857b7aa74 (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=6aba97642737873921f312e0bbaf18edfabf6e6f
commit 6aba97642737873921f312e0bbaf18edfabf6e6f
Merge: a2e80aa 7e24997
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 24 09:20:20 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 24 09:20:20 2013 -0400

Merge topic 'geh-cleanup-identifiers'

7e24997 GenerateExportHeader: Generate only C identifiers as defines


---

Summary of changes:
 Modules/GenerateExportHeader.cmake |6 ++
 Tests/Module/GenerateExportHeader/CMakeLists.txt   |3 +++
 .../c_identifier/CMakeLists.txt|   13 +
 .../c_identifier/c_identifier_class.cpp|7 +++
 .../c_identifier/c_identifier_class.h  |   13 +
 .../GenerateExportHeader/c_identifier/main.cpp |8 
 6 files changed, 50 insertions(+), 0 deletions(-)
 create mode 100644 
Tests/Module/GenerateExportHeader/c_identifier/CMakeLists.txt
 create mode 100644 
Tests/Module/GenerateExportHeader/c_identifier/c_identifier_class.cpp
 create mode 100644 
Tests/Module/GenerateExportHeader/c_identifier/c_identifier_class.h
 create mode 100644 Tests/Module/GenerateExportHeader/c_identifier/main.cpp


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-2203-gc36e027

[Brad King]

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  c36e02752875791e7e5fe534bd1753a37c8cfd97 (commit)
   via  6aba97642737873921f312e0bbaf18edfabf6e6f (commit)
   via  a2e80aaa822eee5ee5e27857f711d18857b7aa74 (commit)
   via  dc85291c57be92e6f4a9b86ae87d5639fbb4dd6f (commit)
   via  239604685d3cd0a9f0e96bb69314ed98df9e3bea (commit)
   via  14d90d81de5ecdeb23a0798865f83598689f237d (commit)
   via  4ae24a105e418068abe85e300c33a7e6a7754d69 (commit)
   via  795e369e6b23e397e6cd8a8fe7769790f7e2800d (commit)
   via  3cc5d3883e295f231ed449721c43699fbd205a0b (commit)
  from  8d488bfe39388cd7a2d51b03949421a6ad994d6f (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=c36e02752875791e7e5fe534bd1753a37c8cfd97
commit c36e02752875791e7e5fe534bd1753a37c8cfd97
Merge: 8d488bf 6aba976
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 24 09:24:45 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri May 24 09:24:45 2013 -0400

Merge branch 'master' into next


---

Summary of changes:
 Source/CMakeVersion.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-2205-g07473a6

[Brad King]

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  07473a69c38a87f5d365d6a28125a37a954df8f7 (commit)
   via  015309fc9f87babaadc2510eb80298b1f2389e8c (commit)
  from  c36e02752875791e7e5fe534bd1753a37c8cfd97 (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=07473a69c38a87f5d365d6a28125a37a954df8f7
commit 07473a69c38a87f5d365d6a28125a37a954df8f7
Merge: c36e027 015309f
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 24 09:39:15 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 24 09:39:15 2013 -0400

Merge topic 'silence-vs6-warnings' into next

015309f Tests/CompileDefinitions: Avoid spaces in defines on VS 6


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=015309fc9f87babaadc2510eb80298b1f2389e8c
commit 015309fc9f87babaadc2510eb80298b1f2389e8c
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed May 22 10:25:27 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri May 24 09:35:43 2013 -0400

Tests/CompileDefinitions: Avoid spaces in defines on VS 6

The VS 6 IDE does not like spaces in definition values so CMake drops
them and warns.  The Tests/CompileDefinitions test C code that looks for
the dropped definitions already knows to skip them, but CMake still
warns.  Silence the warnings by avoiding such values in the first place
on VS 6.

diff --git a/Tests/CompileDefinitions/CMakeLists.txt 
b/Tests/CompileDefinitions/CMakeLists.txt
index d3e9a3e..930d220 100644
--- a/Tests/CompileDefinitions/CMakeLists.txt
+++ b/Tests/CompileDefinitions/CMakeLists.txt
@@ -5,6 +5,7 @@ project(CompileDefinitions)
 
 if (${CMAKE_GENERATOR} STREQUAL Visual Studio 6)
 add_definitions(-DNO_SPACES_IN_DEFINE_VALUES)
+set(NO_SPACES_IN_DEFINE_VALUES 1)
 endif()
 
 # Use compile flags to tell executables which config is built
diff --git a/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt 
b/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
index d3886a1..23e0134 100644
--- a/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
+++ b/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
@@ -1,8 +1,15 @@
 
 project(add_definitions_command)
 
-add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun -DCMAKE_IS_=Fun 
-DCMAKE_IS_REALLY=Very Fun)
-add_definitions(-DCMAKE_IS_=Fun -DCMAKE_IS_REALLY=Very Fun -DCMAKE_IS_FUN 
-DCMAKE_IS=Fun)
+add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun -DCMAKE_IS_=Fun)
+if (NOT NO_SPACES_IN_DEFINE_VALUES)
+  add_definitions(-DCMAKE_IS_REALLY=Very Fun)
+endif()
+add_definitions(-DCMAKE_IS_=Fun)
+if (NOT NO_SPACES_IN_DEFINE_VALUES)
+  add_definitions(-DCMAKE_IS_REALLY=Very Fun)
+endif()
+add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun)
 add_definitions(-DBUILD_IS_DEBUG=$CONFIG:Debug 
-DBUILD_IS_NOT_DEBUG=$NOT:$CONFIG:Debug)
 
 add_executable(add_definitions_command_executable ../compiletest.cpp)
diff --git 
a/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
 
b/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
index 5587f7f..55108db 100644
--- 
a/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
+++ 
b/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
@@ -7,7 +7,9 @@ 
add_executable(add_definitions_command_with_target_prop_executable ../compiletes
 
 set_target_properties(add_definitions_command_with_target_prop_executable 
PROPERTIES COMPILE_DEFINITIONS CMAKE_IS_=Fun)
 
-set_property(TARGET add_definitions_command_with_target_prop_executable APPEND 
PROPERTY COMPILE_DEFINITIONS CMAKE_IS_REALLY=Very Fun)
+if (NOT NO_SPACES_IN_DEFINE_VALUES)
+  set_property(TARGET add_definitions_command_with_target_prop_executable 
APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS_REALLY=Very Fun)
+endif()
 
 add_definitions(-DCMAKE_IS_FUN)
 
diff --git a/Tests/CompileDefinitions/target_prop/CMakeLists.txt 
b/Tests/CompileDefinitions/target_prop/CMakeLists.txt
index 66a3aa6..6bf9c5c 100644
--- a/Tests/CompileDefinitions/target_prop/CMakeLists.txt
+++ b/Tests/CompileDefinitions/target_prop/CMakeLists.txt
@@ -5,7 +5,11 @@ add_executable(target_prop_executable ../compiletest.cpp)
 
 set_target_properties(target_prop_executable PROPERTIES COMPILE_DEFINITIONS 
CMAKE_IS_FUN)
 
-set_property(TARGET target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS 
CMAKE_IS_REALLY=Very Fun CMAKE_IS=Fun)
+if (NOT NO_SPACES_IN_DEFINE_VALUES)
+  set_property(TARGET target_prop_executable APPEND PROPERTY 
COMPILE_DEFINITIONS CMAKE_IS_REALLY=Very Fun CMAKE_IS=Fun)
+else

[Cmake-commits] CMake branch, next, updated. v2.8.11-2207-gfa05305

[Brad King]

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  fa0530550650e586c9b642d84cd689456c73d283 (commit)
   via  c35961b010da87492a60afb6e5dd7436ea36ed8b (commit)
  from  07473a69c38a87f5d365d6a28125a37a954df8f7 (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=fa0530550650e586c9b642d84cd689456c73d283
commit fa0530550650e586c9b642d84cd689456c73d283
Merge: 07473a6 c35961b
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 24 15:47:52 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 24 15:47:52 2013 -0400

Merge topic 'ExternalData-no-re-stage' into next

c35961b ExternalData: Do not re-stage staged object files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c35961b010da87492a60afb6e5dd7436ea36ed8b
commit c35961b010da87492a60afb6e5dd7436ea36ed8b
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 24 15:33:38 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri May 24 15:45:38 2013 -0400

ExternalData: Do not re-stage staged object files

The ExternalData_LINK_CONTENT option tells ExternalData to convert real
data files it finds into content links and to stage the original
content in a .ExternalData_algo_hash file.  However, after a data
object has been staged it is possible that a user-provided pattern in
the REGEX: option will later match the staged object file.  We must
not process staged object files even when a user pattern matches them.

Fix the implementation to not match a staged object file as a normal
data file for conversion.  Extend the RunCMake.ExternalData test to
cover this case.

diff --git a/Modules/ExternalData.cmake b/Modules/ExternalData.cmake
index 187f408..8332725 100644
--- a/Modules/ExternalData.cmake
+++ b/Modules/ExternalData.cmake
@@ -551,7 +551,10 @@ function(_ExternalData_arg_find_files pattern regex)
   set(relname ${entry})
   set(alg )
 endif()
-if(x${relname} MATCHES ^x${regex}$ AND NOT IS_DIRECTORY 
${top_src}/${entry})
+if(x${relname} MATCHES ^x${regex}$ # matches
+AND NOT IS_DIRECTORY ${top_src}/${entry} # not a directory
+AND NOT x${relname} MATCHES (^x|/)\\.ExternalData_ # not staged obj
+)
   set(name ${top_src}/${relname})
   set(file ${top_bin}/${relname})
   if(alg)
diff --git a/Tests/RunCMake/ExternalData/LinkDirectory1-stdout.txt 
b/Tests/RunCMake/ExternalData/LinkDirectory1-stdout.txt
new file mode 100644
index 000..953ea68
--- /dev/null
+++ b/Tests/RunCMake/ExternalData/LinkDirectory1-stdout.txt
@@ -0,0 +1,5 @@
+-- Linked Dir/ToLink.txt.md5 to ExternalData 
MD5/c18ff9804c8deec9eaeb17063cda8b7b
+-- Raw data correctly transformed to content link!
+-- Staged content exists!
+-- Staged content is correct!
+-- Staged content was correctly not re-staged!
diff --git a/Tests/RunCMake/ExternalData/LinkDirectory1.cmake 
b/Tests/RunCMake/ExternalData/LinkDirectory1.cmake
new file mode 100644
index 000..541fc79
--- /dev/null
+++ b/Tests/RunCMake/ExternalData/LinkDirectory1.cmake
@@ -0,0 +1,37 @@
+include(ExternalData)
+set(ExternalData_LINK_CONTENT MD5)
+set(ExternalData_SOURCE_ROOT ${CMAKE_CURRENT_BINARY_DIR})
+set(ExternalData_BINARY_ROOT ${CMAKE_CURRENT_BINARY_DIR}/ExternalData)
+set(input ${CMAKE_CURRENT_BINARY_DIR}/Dir)
+set(output ${CMAKE_CURRENT_BINARY_DIR}/ExternalData/Dir)
+set(staged ${input}/.ExternalData_MD5_c18ff9804c8deec9eaeb17063cda8b7b)
+set(content To be transformed into a content link.)
+file(REMOVE ${staged})
+file(REMOVE_RECURSE ${input})
+file(WRITE ${input}/ToLink.txt ${content})
+ExternalData_Expand_Arguments(Data args DATA{${input}/,REGEX:.*})
+if(x${args} STREQUAL x${output})
+  message(STATUS Raw data correctly transformed to content link!)
+else()
+  message(FATAL_ERROR Data reference transformed to:\n  ${args}\n
+but we expected:\n  ${output})
+endif()
+if(EXISTS ${staged})
+  message(STATUS Staged content exists!)
+else()
+  message(FATAL_ERROR Staged content missing!)
+endif()
+
+# Expand again to check whether staged content is ignored.
+ExternalData_Expand_Arguments(Data args DATA{${input}/,REGEX:.*})
+file(STRINGS ${staged} staged_content LIMIT_INPUT 1024)
+if(${content} STREQUAL ${staged_content})
+  message(STATUS Staged content is correct!)
+else()
+  message(STATUS Staged content is incorrect!)
+endif()
+if(EXISTS ${staged}.md5)
+  message(FATAL_ERROR Staged content was incorrectly re-staged!)
+else()
+  message(STATUS Staged content was correctly not re-staged!)
+endif()
diff --git a/Tests/RunCMake/ExternalData/RunCMakeTest.cmake 
b

[Cmake-commits] CMake branch, next, updated. v2.8.11-2213-g32d5f92

[Brad King]

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  32d5f9222eeca7a9ac0e15e7f36d64f8d6932fa6 (commit)
   via  e65ef08bf2719ffd1cc4226f9594ff7127ad8b5e (commit)
  from  8252abe4f37642139ee239aec67503a3ab0cdfa2 (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=32d5f9222eeca7a9ac0e15e7f36d64f8d6932fa6
commit 32d5f9222eeca7a9ac0e15e7f36d64f8d6932fa6
Merge: 8252abe e65ef08
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 24 16:33:55 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 24 16:33:55 2013 -0400

Merge topic 'fix-try_compile-library-spaces' into next

e65ef08 try_compile: Fix quoting of libraries in generated CMakeLists.txt


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e65ef08bf2719ffd1cc4226f9594ff7127ad8b5e
commit e65ef08bf2719ffd1cc4226f9594ff7127ad8b5e
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 24 16:27:31 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri May 24 16:30:26 2013 -0400

try_compile: Fix quoting of libraries in generated CMakeLists.txt

Since commit 236133e7 (Handle targets in the LINK_LIBRARIES of
try_compile, 2013-02-09) libraries passed to the new LINK_LIBRARIES
option of try_compile are not quoted inside the generated CMakeLists.txt
file.  Quote the library names so they re-parse correctly when loaded by
CMake to configure and generate the test project.

Reported-by: Bogdan Cristea crist...@gmail.com

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 9f38b25..ebfcae0 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -111,7 +111,7 @@ int 
cmCoreTryCompile::TryCompileCode(std::vectorstd::string const argv)
   ++i)
 {
 extraArgs++;
-libsToLink += argv[i] +  ;
+libsToLink += \ + argv[i] + \ ;
 cmTarget *tgt = this-Makefile-FindTargetToUse(argv[i].c_str());
 if (!tgt)
   {

---

Summary of changes:
 Source/cmCoreTryCompile.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.11-2215-ge90e20c

[Brad King]

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  e90e20c15cd6833133f973cec136e7326da35250 (commit)
   via  b8cc6f4eba0b7349de81a48aea18a43f99e78ca5 (commit)
  from  32d5f9222eeca7a9ac0e15e7f36d64f8d6932fa6 (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=e90e20c15cd6833133f973cec136e7326da35250
commit e90e20c15cd6833133f973cec136e7326da35250
Merge: 32d5f92 b8cc6f4
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 24 16:42:53 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 24 16:42:53 2013 -0400

Merge topic 'fix-include_directories-whitespace-handling' into next

b8cc6f4 include_directories: Fix handling of empty or space-only entries


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8cc6f4eba0b7349de81a48aea18a43f99e78ca5
commit b8cc6f4eba0b7349de81a48aea18a43f99e78ca5
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon May 20 12:25:59 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri May 24 16:40:58 2013 -0400

include_directories: Fix handling of empty or space-only entries

Since commit 0d46e9a0 (Store includes from the same include_directories
call together., 2013-01-20) we accidentally use such entries.  Fix the
code to drop them instead.  Update the IncludeDirectories test to cover
this case.

Reported-by: Christophe Giboudeaux cgiboude...@gmx.com

diff --git a/Source/cmIncludeDirectoryCommand.cxx 
b/Source/cmIncludeDirectoryCommand.cxx
index ffb0e80..30c1743 100644
--- a/Source/cmIncludeDirectoryCommand.cxx
+++ b/Source/cmIncludeDirectoryCommand.cxx
@@ -116,13 +116,19 @@ void cmIncludeDirectoryCommand::GetIncludes(const 
std::string arg,
   {
   std::string inc = arg.substr(lastPos,pos);
   this-NormalizeInclude(inc);
-  incs.push_back(inc);
+  if (!inc.empty())
+{
+incs.push_back(inc);
+}
   }
 lastPos = pos + 1;
 }
   std::string inc = arg.substr(lastPos);
   this-NormalizeInclude(inc);
-  incs.push_back(inc);
+  if (!inc.empty())
+{
+incs.push_back(inc);
+}
 }
 
 void cmIncludeDirectoryCommand::NormalizeInclude(std::string inc)
@@ -133,6 +139,11 @@ void 
cmIncludeDirectoryCommand::NormalizeInclude(std::string inc)
 {
 inc.assign(inc, b, 1+e-b);   // copy the remaining substring
 }
+  else
+{
+inc = ;
+return;
+}
 
   if (!cmSystemTools::IsOff(inc.c_str()))
 {
diff --git a/Tests/IncludeDirectories/CMakeLists.txt 
b/Tests/IncludeDirectories/CMakeLists.txt
index 8a60f17..3e3ecc9 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -58,3 +58,14 @@ get_property(propContentAfter DIRECTORY PROPERTY 
INCLUDE_DIRECTORIES)
 if (NOT propContentAfter STREQUAL )
   message(SEND_ERROR Clearing DIRECTORY property failed.)
 endif()
+
+add_library(empty_entry_test SHARED empty.cpp)
+set_target_properties(empty_entry_test PROPERTIES INCLUDE_DIRECTORIES )
+include_directories(/one/two
+   
+
+)
+get_target_property(incs empty_entry_test INCLUDE_DIRECTORIES)
+if (NOT incs STREQUAL ;/one/two)
+  message(SEND_ERROR Empty include_directories entry was not ignored.)
+endif()
diff --git a/Tests/IncludeDirectories/empty.cpp 
b/Tests/IncludeDirectories/empty.cpp
new file mode 100644
index 000..1787013
--- /dev/null
+++ b/Tests/IncludeDirectories/empty.cpp
@@ -0,0 +1,4 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int empty() { return 0; }

---

Summary of changes:


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, master, updated. v2.8.11-192-ga6c8dce

[Brad King]

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

The branch, master has been updated
   via  a6c8dcee64407aa885ffdd2ad17ad294ca6aeccc (commit)
   via  b8cc6f4eba0b7349de81a48aea18a43f99e78ca5 (commit)
  from  6aba97642737873921f312e0bbaf18edfabf6e6f (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=a6c8dcee64407aa885ffdd2ad17ad294ca6aeccc
commit a6c8dcee64407aa885ffdd2ad17ad294ca6aeccc
Merge: 6aba976 b8cc6f4
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 24 16:43:25 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 24 16:43:25 2013 -0400

Merge topic 'fix-include_directories-whitespace-handling'

b8cc6f4 include_directories: Fix handling of empty or space-only entries


---

Summary of changes:


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-2245-gc14659f

[Brad King]

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  c14659fcdebb753d41f91b9498a246fd10486539 (commit)
   via  a2099a8e8d2b97d2a2f91cbc06a4078f7c5b7139 (commit)
  from  43e18bef9b0c6f6c4aba2c4b2ecbadbea05a8c3c (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=c14659fcdebb753d41f91b9498a246fd10486539
commit c14659fcdebb753d41f91b9498a246fd10486539
Merge: 43e18be a2099a8
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 28 09:34:06 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 28 09:34:06 2013 -0400

Merge topic 'SelectLibraryConfigurations-cached-library' into next

a2099a8 SelectLibraryConfigurations: Fix for cached base_LIBRARY


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2099a8e8d2b97d2a2f91cbc06a4078f7c5b7139
commit a2099a8e8d2b97d2a2f91cbc06a4078f7c5b7139
Author: Bjoern Thiel bth...@gwdg.de
AuthorDate: Tue May 28 05:25:00 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 28 09:26:34 2013 -0400

SelectLibraryConfigurations: Fix for cached base_LIBRARY

The line

  set( ${basename}_LIBRARY )

removes the normal variable, but if the corresponding cached variable is
present then line

  list( APPEND ${basename}_LIBRARY optimized ${_libname} )

uses that and fails.  Replace the original line with

  set( ${basename}_LIBRARY  )

to set the normal variable to empty instead of unsetting it.

diff --git a/Modules/SelectLibraryConfigurations.cmake 
b/Modules/SelectLibraryConfigurations.cmake
index 62137bb..5bca064 100644
--- a/Modules/SelectLibraryConfigurations.cmake
+++ b/Modules/SelectLibraryConfigurations.cmake
@@ -62,7 +62,7 @@ macro( select_library_configurations basename )
 # if the generator supports configuration types or CMAKE_BUILD_TYPE
 # is set, then set optimized and debug options.
 if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-set( ${basename}_LIBRARY )
+set( ${basename}_LIBRARY  )
 foreach( _libname IN LISTS ${basename}_LIBRARY_RELEASE )
 list( APPEND ${basename}_LIBRARY optimized ${_libname} )
 endforeach()

---

Summary of changes:
 Modules/SelectLibraryConfigurations.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-2247-g898a30c

[Brad King]

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  898a30ce6278153dc4c8d37363c4d6445800df43 (commit)
   via  3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a (commit)
  from  c14659fcdebb753d41f91b9498a246fd10486539 (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=898a30ce6278153dc4c8d37363c4d6445800df43
commit 898a30ce6278153dc4c8d37363c4d6445800df43
Merge: c14659f 3de9bb4
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 28 09:45:40 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 28 09:45:40 2013 -0400

Merge topic 'FindImageMagick-v6-includes' into next

3de9bb4 FindImageMagick: Find v6 include dir (#14174)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a
commit 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a
Author: Funda Wang fundaw...@gmail.com
AuthorDate: Tue May 28 06:17:49 2013 +
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 28 09:43:29 2013 -0400

FindImageMagick: Find v6 include dir (#14174)

The header files of ImageMagick are now located at
prefix/include/ImageMagick-6 instead of prefix/include/ImageMagick.

diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index cd97b38..02a5777 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header)
   ${ImageMagick_INCLUDE_DIRS}
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include
 PATH_SUFFIXES
-  ImageMagick
+  ImageMagick ImageMagick-6
 DOC Path to the ImageMagick include dir.
 )
   find_library(ImageMagick_${component}_LIBRARY

---

Summary of changes:
 Modules/FindImageMagick.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, master, updated. v2.8.11-202-g7cde91c

[Brad King]

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

The branch, master has been updated
   via  7cde91cc8c0d2a2152183c1bb40ebae36ce60307 (commit)
   via  015309fc9f87babaadc2510eb80298b1f2389e8c (commit)
  from  be85fa4a8916819514ca5c5c01db14733d5b9bce (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=7cde91cc8c0d2a2152183c1bb40ebae36ce60307
commit 7cde91cc8c0d2a2152183c1bb40ebae36ce60307
Merge: be85fa4 015309f
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 28 10:42:23 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 28 10:42:23 2013 -0400

Merge topic 'silence-vs6-warnings'

015309f Tests/CompileDefinitions: Avoid spaces in defines on VS 6


---

Summary of changes:
 Tests/CompileDefinitions/CMakeLists.txt|1 +
 .../add_definitions_command/CMakeLists.txt |   11 +--
 .../CMakeLists.txt |4 +++-
 .../CompileDefinitions/target_prop/CMakeLists.txt  |6 +-
 4 files changed, 18 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, master, updated. v2.8.11-208-g590a41b

[Brad King]

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

The branch, master has been updated
   via  590a41ba0ead92f3989b3c226632c29fac76bf2e (commit)
   via  e65ef08bf2719ffd1cc4226f9594ff7127ad8b5e (commit)
  from  07942da96cc2db73877f0ed916edf16dc9476a85 (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=590a41ba0ead92f3989b3c226632c29fac76bf2e
commit 590a41ba0ead92f3989b3c226632c29fac76bf2e
Merge: 07942da e65ef08
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 28 10:42:40 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 28 10:42:40 2013 -0400

Merge topic 'fix-try_compile-library-spaces'

e65ef08 try_compile: Fix quoting of libraries in generated CMakeLists.txt


---

Summary of changes:
 Source/cmCoreTryCompile.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, master, updated. v2.8.11-204-g93e9291

[Brad King]

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

The branch, master has been updated
   via  93e9291da73b845ac8c7e70921a4deb400f4f1fc (commit)
   via  8961c4b68bdf3202be0451a68418922cf869439c (commit)
  from  7cde91cc8c0d2a2152183c1bb40ebae36ce60307 (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=93e9291da73b845ac8c7e70921a4deb400f4f1fc
commit 93e9291da73b845ac8c7e70921a4deb400f4f1fc
Merge: 7cde91c 8961c4b
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 28 10:42:29 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 28 10:42:29 2013 -0400

Merge topic 'fix-protobuf-threads'

8961c4b FindProtobuf: also find pthread


---

Summary of changes:
 Modules/FindProtobuf.cmake |   13 +
 1 files changed, 13 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-2255-g89d6d32

[Brad King]

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  89d6d32e92dd250417718323455a7e5a22f795f6 (commit)
   via  590a41ba0ead92f3989b3c226632c29fac76bf2e (commit)
   via  07942da96cc2db73877f0ed916edf16dc9476a85 (commit)
   via  93e9291da73b845ac8c7e70921a4deb400f4f1fc (commit)
   via  7cde91cc8c0d2a2152183c1bb40ebae36ce60307 (commit)
   via  be85fa4a8916819514ca5c5c01db14733d5b9bce (commit)
   via  9c1393217c34f3fae101d5852df67a71edebb605 (commit)
   via  97c2166de4c6f19d95e68034a1c5d7bdf14446da (commit)
  from  898a30ce6278153dc4c8d37363c4d6445800df43 (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=89d6d32e92dd250417718323455a7e5a22f795f6
commit 89d6d32e92dd250417718323455a7e5a22f795f6
Merge: 898a30c 590a41b
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 28 10:41:30 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 28 10:41:30 2013 -0400

Merge branch 'master' into next


---

Summary of changes:
 Source/CMakeVersion.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, master, updated. v2.8.11-198-g9c13932

[Brad King]

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

The branch, master has been updated
   via  9c1393217c34f3fae101d5852df67a71edebb605 (commit)
   via  81b5fb5b0dd82fb6d68512275a54c50585aafee1 (commit)
  from  97c2166de4c6f19d95e68034a1c5d7bdf14446da (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=9c1393217c34f3fae101d5852df67a71edebb605
commit 9c1393217c34f3fae101d5852df67a71edebb605
Merge: 97c2166 81b5fb5
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 28 10:42:12 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue May 28 10:42:12 2013 -0400

Merge topic 'use-java-use-parse-arguments'

81b5fb5 UseJava.cmake: fully use cmake_parse_arguments in add_jar


---

Summary of changes:
 Modules/UseJava.cmake |   93 ++--
 1 files changed, 58 insertions(+), 35 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-2301-g7f692b1

[Brad King]

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  7f692b1ddb83ae7ab67d48a1718aeb3e033408b6 (commit)
   via  2c0c59a2e182e25844ded2a551a79e58ab3b3c49 (commit)
   via  927012979e54a69d9d49f188ce73f7b4ca2fb073 (commit)
   via  6927b25affcb9e2e01fb226970fd91db143b5101 (commit)
  from  f1977e36c024b42c8f408e9ef2e2756a5410b6de (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=7f692b1ddb83ae7ab67d48a1718aeb3e033408b6
commit 7f692b1ddb83ae7ab67d48a1718aeb3e033408b6
Merge: f1977e3 2c0c59a
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed May 29 08:59:14 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed May 29 08:59:14 2013 -0400

Merge topic 'update-kwsys' into next

2c0c59a Merge branch 'upstream-kwsys' into update-kwsys
9270129 KWSys 2013-05-29 (725e541e)
6927b25 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c0c59a2e182e25844ded2a551a79e58ab3b3c49
commit 2c0c59a2e182e25844ded2a551a79e58ab3b3c49
Merge: 6927b25 9270129
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed May 29 08:56:20 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed May 29 08:56:20 2013 -0400

Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=927012979e54a69d9d49f188ce73f7b4ca2fb073
commit 927012979e54a69d9d49f188ce73f7b4ca2fb073
Author: KWSys Robot kwro...@kitware.com
AuthorDate: Wed May 29 08:55:14 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed May 29 08:56:13 2013 -0400

KWSys 2013-05-29 (725e541e)

Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ 725e541e | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' f4928d44..725e541e
Brad King (1):
  9fd64779 SystemTools: Fix FileIsDirectory with long paths

Rolf Eike Beer (3):
  e8269442 Tests: fix a warning with acc
  87abd647 SystemInformation: fix truncation warnings
  039d9598 fix warnings about sizeof() return value truncation

Change-Id: I1c459346a622610eac62dfcd3abd0e73c5a83494

diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 9e2a93d..9db1dee 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -1471,7 +1471,7 @@ int 
SystemInformationImplementation::GetFullyQualifiedDomainName(
   {
   char host[NI_MAXHOST]={'\0'};
 
-  int addrlen
+  socklen_t addrlen
 = (fam==AF_INET?sizeof(struct sockaddr_in):sizeof(struct 
sockaddr_in6));
 
   ierr=getnameinfo(
@@ -3487,7 +3487,7 @@ bool SystemInformationImplementation::QueryLinuxMemory()
 bool have[6] = { false, false, false, false, false, false };
 unsigned long value[6];
 int count = 0;
-while(fgets(buffer, sizeof(buffer), fd))
+while(fgets(buffer, static_castint(sizeof(buffer)), fd))
   {
   for(int i=0; i  6; ++i)
 {
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 394d65e..158217e 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -2742,14 +2742,23 @@ bool SystemTools::FileIsDirectory(const char* name)
 }
 
   // Remove any trailing slash from the name except in a root component.
-  char buffer[KWSYS_SYSTEMTOOLS_MAXPATH];
+  char local_buffer[KWSYS_SYSTEMTOOLS_MAXPATH];
+  std::string string_buffer;
   size_t last = length-1;
   if(last  0  (name[last] == '/' || name[last] == '\\')
  strcmp(name, /) !=0  name[last-1] != ':')
 {
-memcpy(buffer, name, last);
-buffer[last] = 0;
-name = buffer;
+if(last  sizeof(local_buffer))
+  {
+  memcpy(local_buffer, name, last);
+  local_buffer[last] = 0;
+  name = local_buffer;
+  }
+else
+  {
+  string_buffer.append(name, last);
+  name = string_buffer.c_str();
+  }
 }
 
   // Now check the file node type.
diff --git a/testIOS.cxx b/testIOS.cxx
index 3b971e2..f0c7f1a 100644
--- a/testIOS.cxx
+++ b/testIOS.cxx
@@ -48,7 +48,7 @@ int testIOS(int, char*[])
 return 1;
 }
   static const unsigned char array[] = { 
0xff,0x4f,0xff,0x51,0x00,0x29,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x07,0x01,0x01,0xff,0x52,0x00,0x0c,0x00,0x00,0x00,0x01,0x00,0x05,0x04,0x04,0x00,0x01,0xff,0x5c,0x00,0x13,0x40,0x40,0x48,0x48,0x50,0x48,0x48,0x50,0x48,0x48,0x50,0x48,0x48,0x50,0x48,0x48,0x50,0xff,0x64,0x00,0x2c

[Cmake-commits] CMake branch, next, updated. v2.8.11-2305-g026e51a

[Brad King]

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  026e51ac00810d47a1639b4380e27edccfd5cf25 (commit)
   via  7378792b4938d32c5eefc5bb485ecae1a7ec95fb (commit)
   via  4ab10e063d8f640d9a3fa029fe9993e94f4096c3 (commit)
   via  045d6ae0b042d4e6e3c4540c32559c58cb4153b0 (commit)
  from  7f692b1ddb83ae7ab67d48a1718aeb3e033408b6 (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=026e51ac00810d47a1639b4380e27edccfd5cf25
commit 026e51ac00810d47a1639b4380e27edccfd5cf25
Merge: 7f692b1 7378792
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed May 29 08:59:33 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed May 29 08:59:33 2013 -0400

Merge topic 'fix-FileIsDirectory-SEGV' into next

7378792 if: Add test for IS_DIRECTORY
4ab10e0 Merge branch 'master' into fix-FileIsDirectory-SEGV
045d6ae KWSys: Fix SystemTools::FileIsDirectory with long paths (#14176)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7378792b4938d32c5eefc5bb485ecae1a7ec95fb
commit 7378792b4938d32c5eefc5bb485ecae1a7ec95fb
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 28 11:13:24 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 28 11:35:32 2013 -0400

if: Add test for IS_DIRECTORY

Add a RunCMake.if test to cover if() command behavior.  Start with a
test for IS_DIRECTORY cases with an existing directory and a long path,
both with a trailing slash.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index f676107..a0168a6 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -72,6 +72,7 @@ add_RunCMake_test(add_dependencies)
 add_RunCMake_test(build_command)
 add_RunCMake_test(find_package)
 add_RunCMake_test(get_filename_component)
+add_RunCMake_test(if)
 add_RunCMake_test(include)
 add_RunCMake_test(include_directories)
 add_RunCMake_test(list)
diff --git a/Tests/RunCMake/if/CMakeLists.txt b/Tests/RunCMake/if/CMakeLists.txt
new file mode 100644
index 000..e8db6b0
--- /dev/null
+++ b/Tests/RunCMake/if/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/if/IsDirectory-stdout.txt 
b/Tests/RunCMake/if/IsDirectory-stdout.txt
new file mode 100644
index 000..b89446a
--- /dev/null
+++ b/Tests/RunCMake/if/IsDirectory-stdout.txt
@@ -0,0 +1 @@
+CMAKE_CURRENT_SOURCE_DIR exists, tested with trailing slash
diff --git a/Tests/RunCMake/if/IsDirectory.cmake 
b/Tests/RunCMake/if/IsDirectory.cmake
new file mode 100644
index 000..23d126d
--- /dev/null
+++ b/Tests/RunCMake/if/IsDirectory.cmake
@@ -0,0 +1,5 @@
+if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/)
+  message(STATUS CMAKE_CURRENT_SOURCE_DIR exists, tested with trailing slash)
+else()
+  message(FATAL_ERROR CMAKE_CURRENT_SOURCE_DIR does not exist!)
+endif()
diff --git a/Tests/RunCMake/if/IsDirectoryLong-stdout.txt 
b/Tests/RunCMake/if/IsDirectoryLong-stdout.txt
new file mode 100644
index 000..5e62754
--- /dev/null
+++ b/Tests/RunCMake/if/IsDirectoryLong-stdout.txt
@@ -0,0 +1 @@
+Directory path with length 94208 correctly does not exist.
diff --git a/Tests/RunCMake/if/IsDirectoryLong.cmake 
b/Tests/RunCMake/if/IsDirectoryLong.cmake
new file mode 100644
index 000..0e93be7
--- /dev/null
+++ b/Tests/RunCMake/if/IsDirectoryLong.cmake
@@ -0,0 +1,10 @@
+set(d /long/path/to/directory)
+foreach(i RANGE 11)
+  set(d ${d}${d})
+endforeach()
+string(LENGTH ${d} dl)
+if(IS_DIRECTORY ${d}/)
+  message(FATAL_ERROR Directory should not exist!)
+else()
+  message(STATUS Directory path with length ${dl} correctly does not exist.)
+endif()
diff --git a/Tests/RunCMake/if/RunCMakeTest.cmake 
b/Tests/RunCMake/if/RunCMakeTest.cmake
new file mode 100644
index 000..6b6b74b
--- /dev/null
+++ b/Tests/RunCMake/if/RunCMakeTest.cmake
@@ -0,0 +1,4 @@
+include(RunCMake)
+
+run_cmake(IsDirectory)
+run_cmake(IsDirectoryLong)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ab10e063d8f640d9a3fa029fe9993e94f4096c3
commit 4ab10e063d8f640d9a3fa029fe9993e94f4096c3
Merge: 045d6ae 07afd4f
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue May 28 11:34:28 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue May 28 11:34:50 2013 -0400

Merge branch 'master' into fix-FileIsDirectory-SEGV

Resolve conflict in Source/kwsys/SystemTools.cxx by combining the two
changes.

diff --cc Source/kwsys/SystemTools.cxx
index 8b25d60,394d65e..158217e
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx

[Cmake-commits] CMake branch, next, updated. v2.8.11-2307-gc6501c1

[Brad King]

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  c6501c12359669a30d92776bc0ea7256c0848161 (commit)
   via  cbe3f2072bdd181660bc4f9174a73febd3ed5230 (commit)
  from  026e51ac00810d47a1639b4380e27edccfd5cf25 (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=c6501c12359669a30d92776bc0ea7256c0848161
commit c6501c12359669a30d92776bc0ea7256c0848161
Merge: 026e51a cbe3f20
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed May 29 09:07:31 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed May 29 09:07:31 2013 -0400

Merge topic 'xcode-shlib-versioning' into next

cbe3f20 Xcode: Add support for shared library versioning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbe3f2072bdd181660bc4f9174a73febd3ed5230
commit cbe3f2072bdd181660bc4f9174a73febd3ed5230
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Mon May 13 20:45:35 2013 -0600
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed May 29 09:05:00 2013 -0400

Xcode: Add support for shared library versioning

Add a post-build command to shared library targets to create the
versioning symbolic links.

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 2e6b71e..6e5d449 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -207,12 +207,8 @@ if(${CMAKE_BACKWARDS_COMPATIBILITY} MATCHES 
^1\\.[0-6]$)
 ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined 
suppress)
 endif()
 
-if(NOT XCODE)
-  # Enable shared library versioning.  This flag is not actually referenced
-  # but the fact that the setting exists will cause the generators to support
-  # soname computation.
-  set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG -install_name)
-endif()
+# Enable shared library versioning.
+set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG -install_name)
 
 # Xcode does not support -isystem yet.
 if(XCODE)
diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 240d60c..9bbf186 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1319,8 +1319,40 @@ void 
cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
 = cmtarget.GetPreBuildCommands();
   std::vectorcmCustomCommand const  prelink
 = cmtarget.GetPreLinkCommands();
-  std::vectorcmCustomCommand const  postbuild
+  std::vectorcmCustomCommand postbuild
 = cmtarget.GetPostBuildCommands();
+
+  if(cmtarget.GetType() == cmTarget::SHARED_LIBRARY 
+!cmtarget.IsFrameworkOnApple())
+{
+cmCustomCommandLines cmd;
+cmd.resize(1);
+cmd[0].push_back(this-CurrentMakefile-GetDefinition(CMAKE_COMMAND));
+cmd[0].push_back(-E);
+cmd[0].push_back(cmake_symlink_library);
+std::string str_file = $TARGET_FILE:;
+str_file += cmtarget.GetName();
+str_file += ;
+std::string str_so_file = $TARGET_SONAME_FILE:;
+str_so_file += cmtarget.GetName();
+str_so_file += ;
+std::string str_link_file = $TARGET_LINKER_FILE:;
+str_link_file += cmtarget.GetName();
+str_link_file += ;
+cmd[0].push_back(str_file);
+cmd[0].push_back(str_so_file);
+cmd[0].push_back(str_link_file);
+
+cmCustomCommand command(this-CurrentMakefile,
+  std::vectorstd::string(),
+  std::vectorstd::string(),
+  cmd,
+  Creating symlinks,
+  );
+
+postbuild.push_back(command);
+}
+
   std::vectorcmSourceFile*const classes = cmtarget.GetSourceFiles();
   // add all the sources
   std::vectorcmCustomCommand commands;
@@ -1797,9 +1829,34 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget target,
   std::string pnprefix;
   std::string pnbase;
   std::string pnsuffix;
-
   target.GetFullNameComponents(pnprefix, pnbase, pnsuffix, configName);
 
+  const char* version = target.GetProperty(VERSION);
+  const char* soversion = target.GetProperty(SOVERSION);
+  if(!target.HasSOName(configName) || target.IsFrameworkOnApple())
+{
+version = 0;
+soversion = 0;
+}
+  if(version  !soversion)
+{
+soversion = version;
+}
+  if(!version  soversion)
+{
+version = soversion;
+}
+
+  std::string realName = pnbase;
+  std::string soName = pnbase;
+  if(version  soversion)
+{
+realName += .;
+realName += version;
+soName += .;
+soName += soversion;
+}
+
   // Set attributes to specify the proper name for the target.
   std::string pndir = this-CurrentMakefile-GetCurrentOutputDirectory();
   if(target.GetType() == cmTarget::STATIC_LIBRARY ||
@@ -1857,7 +1914,7 @@ void 
cmGlobalXCodeGenerator

[Cmake-commits] CMake branch, master, updated. v2.8.11-213-gd721a9c

[Brad King]

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

The branch, master has been updated
   via  d721a9cf6ad7e5354f2c4e9f88ae8a408ecd7411 (commit)
   via  2c0c59a2e182e25844ded2a551a79e58ab3b3c49 (commit)
   via  927012979e54a69d9d49f188ce73f7b4ca2fb073 (commit)
  from  fafa66c7f0430992e5e3388a8a3c707014ee534d (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=d721a9cf6ad7e5354f2c4e9f88ae8a408ecd7411
commit d721a9cf6ad7e5354f2c4e9f88ae8a408ecd7411
Merge: fafa66c 2c0c59a
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu May 30 08:57:23 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu May 30 08:57:23 2013 -0400

Merge topic 'update-kwsys'

2c0c59a Merge branch 'upstream-kwsys' into update-kwsys
9270129 KWSys 2013-05-29 (725e541e)


---

Summary of changes:
 Source/kwsys/SystemInformation.cxx |4 ++--
 Source/kwsys/SystemTools.cxx   |   17 +
 Source/kwsys/testIOS.cxx   |2 +-
 Source/kwsys/testSystemInformation.cxx |4 ++--
 4 files changed, 18 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.11-2330-g0186e44

[Brad King]

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  0186e444917cb95d3589897d785931d83f6d905d (commit)
   via  585cfa51dec828ddc4b12e6005f3137b231d6cb3 (commit)
   via  d721a9cf6ad7e5354f2c4e9f88ae8a408ecd7411 (commit)
   via  fafa66c7f0430992e5e3388a8a3c707014ee534d (commit)
  from  511774171f6bab24f83985dbb10728acba910791 (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=0186e444917cb95d3589897d785931d83f6d905d
commit 0186e444917cb95d3589897d785931d83f6d905d
Merge: 5117741 585cfa5
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu May 30 08:56:35 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu May 30 08:56:35 2013 -0400

Merge branch 'master' into next


---

Summary of changes:
 Source/CMakeVersion.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-2367-g7c4018e

[Brad King]

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  7c4018ef8c52e89fc95062d9c0c09053a59949df (commit)
   via  363825cd55595b7de62fcf610836f6156a9f1a31 (commit)
  from  700224e26b4ff22656368d539b90eaa0f4be4063 (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=7c4018ef8c52e89fc95062d9c0c09053a59949df
commit 7c4018ef8c52e89fc95062d9c0c09053a59949df
Merge: 700224e 363825c
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu May 30 16:29:12 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu May 30 16:29:12 2013 -0400

Merge topic 'FindBoost-normalize-slashes' into next

363825c FindBoost: Fix handling of \ in input paths (#14179)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=363825cd55595b7de62fcf610836f6156a9f1a31
commit 363825cd55595b7de62fcf610836f6156a9f1a31
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu May 30 16:11:11 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu May 30 16:20:55 2013 -0400

FindBoost: Fix handling of \ in input paths (#14179)

In commit 5b9149e0 (FindBoost: Overhaul caching and search repeat
behavior, 2012-09-24) we refactored the internal library search to use a
_Boost_FIND_LIBRARY macro to wrap around find_library calls.  However,
CMake macros re-process escape sequences when evaluating calls inside
the macro after substituting placeholders (a historical bug).  In order
to avoid escape sequences, convert backslashes to forward slashes before
passing arguments to the _Boost_FIND_LIBRARY macro.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 8d8b10c..0a9ffc1 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -928,9 +928,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
 message(STATUS [ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] 
Searching for ${UPPERCOMPONENT}_LIBRARY_RELEASE: 
${_boost_RELEASE_NAMES})
   endif()
+
+  # Avoid passing backslashes to _Boost_FIND_LIBRARY due to macro re-parsing.
+  string(REPLACE \\ / _boost_LIBRARY_SEARCH_DIRS_tmp 
${_boost_LIBRARY_SEARCH_DIRS})
+
   _Boost_FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
 NAMES ${_boost_RELEASE_NAMES}
-HINTS ${_boost_LIBRARY_SEARCH_DIRS}
+HINTS ${_boost_LIBRARY_SEARCH_DIRS_tmp}
 NAMES_PER_DIR
 DOC ${_boost_docstring_release}
 )
@@ -960,9 +964,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
 message(STATUS [ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] 
Searching for ${UPPERCOMPONENT}_LIBRARY_DEBUG: 
${_boost_DEBUG_NAMES})
   endif()
+
+  # Avoid passing backslashes to _Boost_FIND_LIBRARY due to macro re-parsing.
+  string(REPLACE \\ / _boost_LIBRARY_SEARCH_DIRS_tmp 
${_boost_LIBRARY_SEARCH_DIRS})
+
   _Boost_FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
 NAMES ${_boost_DEBUG_NAMES}
-HINTS ${_boost_LIBRARY_SEARCH_DIRS}
+HINTS ${_boost_LIBRARY_SEARCH_DIRS_tmp}
 NAMES_PER_DIR
 DOC ${_boost_docstring_debug}
 )

---

Summary of changes:
 Modules/FindBoost.cmake |   12 ++--
 1 files changed, 10 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.11-2378-ge554e6c

[Brad King]

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  e554e6c415a7030cbadb263004d07ba1bfb5d5bc (commit)
   via  cca955a27cf3fc8344ee3dce213472b61e1edef7 (commit)
  from  42f3e8e18d7e8077e2ec37f8edcff20a1dd295fd (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=e554e6c415a7030cbadb263004d07ba1bfb5d5bc
commit e554e6c415a7030cbadb263004d07ba1bfb5d5bc
Merge: 42f3e8e cca955a
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 31 09:21:29 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 31 09:21:29 2013 -0400

Merge topic 'vs-RootNamespace' into next

cca955a VS: Add VS_GLOBAL_ROOTNAMESPACE target property


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cca955a27cf3fc8344ee3dce213472b61e1edef7
commit cca955a27cf3fc8344ee3dce213472b61e1edef7
Author: John Farrier john.farr...@digitalinblue.com
AuthorDate: Wed May 29 20:16:36 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri May 31 09:15:30 2013 -0400

VS: Add VS_GLOBAL_ROOTNAMESPACE target property

Add a setting for Visual Studio projects for the root namespace in the
Globals PropertyGroup section of the project file.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 66c22b1..40c9798 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1303,6 +1303,11 @@ void cmTarget::DefineProperties(cmake *cm)
  this value with \ManagedCProj\, for example, in a Visual 
  Studio managed C++ unit test project.);
   cm-DefineProperty
+(VS_GLOBAL_ROOTNAMESPACE, cmProperty::TARGET,
+ Visual Studio project root namespace.,
+ Sets the \RootNamespace\ attribute for a generated Visual Studio 
+ project.  The attribute will be generated only if this is set.);
+  cm-DefineProperty
 (VS_DOTNET_REFERENCES, cmProperty::TARGET,
  Visual Studio managed project .NET references,
  Adds one or more semicolon-delimited .NET references to a 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx 
b/Source/cmVisualStudio10TargetGenerator.cxx
index 933bf95..61a3427 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -262,6 +262,15 @@ void cmVisualStudio10TargetGenerator::Generate()
   /Keyword\n;
 }
 
+  const char* vsGlobalRootNamespace =
+this-Target-GetProperty(VS_GLOBAL_ROOTNAMESPACE);
+  if(vsGlobalRootNamespace)
+{
+this-WriteString(RootNamespace, 2);
+(*this-BuildFileStream)  cmVS10EscapeXML(vsGlobalRootNamespace) 
+  /RootNamespace\n;
+}
+
   this-WriteString(Platform, 2);
   (*this-BuildFileStream)  this-Platform  /Platform\n;
   const char* projLabel = this-Target-GetProperty(PROJECT_LABEL);

---

Summary of changes:
 Source/cmTarget.cxx|5 +
 Source/cmVisualStudio10TargetGenerator.cxx |9 +
 2 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, master, updated. v2.8.11-222-g7b8a4c3

[Brad King]

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

The branch, master has been updated
   via  7b8a4c3e6f04879bb47ad99a93d2a748b5ac4406 (commit)
   via  3aa9ce441f010362e404e6f9126ecd3028de76b9 (commit)
   via  0b39fefeac550c8277ebde308fcb9198e43e46a7 (commit)
   via  53164ac997f6ce2a4fd1245956a815bfdb893c27 (commit)
  from  4836c5ab48d1aa3ed1ed8601f459b80d3ed2ab1f (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=7b8a4c3e6f04879bb47ad99a93d2a748b5ac4406
commit 7b8a4c3e6f04879bb47ad99a93d2a748b5ac4406
Merge: 4836c5a 3aa9ce4
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 31 09:33:22 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 31 09:33:22 2013 -0400

Merge topic 'fix-INCLUDE_DIRECTORIES-genex-read'

3aa9ce4 GenexEval: Fix evaluation of INCLUDE_DIRECTORIES target property.
0b39fef GenexEval: Extract a getLinkedTargetsContent from 
TargetPropertyNode.
53164ac cmTarget: Remove some hardcoding of transitive property names.


---

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx |  114 +++-
 1 files changed, 77 insertions(+), 37 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, master, updated. v2.8.11-226-g1f73d65

[Brad King]

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

The branch, master has been updated
   via  1f73d65177991354c3c27683bf3dbae45082d460 (commit)
   via  363825cd55595b7de62fcf610836f6156a9f1a31 (commit)
  from  69cc67611ad1745f37d61361b931c1bc2ca0596c (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=1f73d65177991354c3c27683bf3dbae45082d460
commit 1f73d65177991354c3c27683bf3dbae45082d460
Merge: 69cc676 363825c
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 31 09:33:35 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 31 09:33:35 2013 -0400

Merge topic 'FindBoost-normalize-slashes'

363825c FindBoost: Fix handling of \ in input paths (#14179)


---

Summary of changes:
 Modules/FindBoost.cmake |   12 ++--
 1 files changed, 10 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, master, updated. v2.8.11-228-g5377ac4

[Brad King]

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

The branch, master has been updated
   via  5377ac42896402510571fa0ee26c6bf32f132e21 (commit)
   via  e5375442ff20fde45e70de318c5aa2f1e4bb190a (commit)
  from  1f73d65177991354c3c27683bf3dbae45082d460 (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=5377ac42896402510571fa0ee26c6bf32f132e21
commit 5377ac42896402510571fa0ee26c6bf32f132e21
Merge: 1f73d65 e537544
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 31 09:33:54 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 31 09:33:54 2013 -0400

Merge topic 'fix-try_compile-library-spaces'

e537544 try_compile: Trim whitespace from LINK_LIBRARIES entries


---

Summary of changes:
 Source/cmCoreTryCompile.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.11-2384-gf981d59

[Brad King]

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  f981d599efdbc7a72613213c3290c93bd331758e (commit)
   via  5377ac42896402510571fa0ee26c6bf32f132e21 (commit)
   via  1f73d65177991354c3c27683bf3dbae45082d460 (commit)
   via  69cc67611ad1745f37d61361b931c1bc2ca0596c (commit)
   via  7b8a4c3e6f04879bb47ad99a93d2a748b5ac4406 (commit)
   via  4836c5ab48d1aa3ed1ed8601f459b80d3ed2ab1f (commit)
  from  e554e6c415a7030cbadb263004d07ba1bfb5d5bc (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=f981d599efdbc7a72613213c3290c93bd331758e
commit f981d599efdbc7a72613213c3290c93bd331758e
Merge: e554e6c 5377ac4
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 31 09:32:44 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri May 31 09:32:44 2013 -0400

Merge branch 'master' into next


---

Summary of changes:
 Source/CMakeVersion.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-2387-g1e3d974

[Brad King]

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  1e3d974e792b2afac1b2f3fb89f59e8631d33834 (commit)
   via  d06db7ebe80636876d9701064b16cec9d3e2e3cb (commit)
   via  b680824a5fdcc54c265c64ce8958f9d80acad70d (commit)
  from  f981d599efdbc7a72613213c3290c93bd331758e (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=1e3d974e792b2afac1b2f3fb89f59e8631d33834
commit 1e3d974e792b2afac1b2f3fb89f59e8631d33834
Merge: f981d59 d06db7e
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri May 31 12:55:39 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 31 12:55:39 2013 -0400

Merge topic 'refactor-try_compile-argument-processing' into next

d06db7e try_compile: Refactor argument processing
b680824 try_compile: Add test for bad call error cases


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d06db7ebe80636876d9701064b16cec9d3e2e3cb
commit d06db7ebe80636876d9701064b16cec9d3e2e3cb
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed May 15 15:30:34 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri May 31 10:01:50 2013 -0400

try_compile: Refactor argument processing

Process all arguments in a single loop using a simple state machine.
While at it, fix some error message typos.  Also allow LINK_LIBRARIES
with no actual libraries to disable use of the -DLINK_LIBRARIES=...
from the CMAKE_FLAGS.  This was already possible in the old logic if
LINK_LIBRARIES was immediately followed by another keyword argument
instead of the end of the argument list, so allow it in general.
Update the RunCMake.try_compile test cases accordingly.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 85e49a9..bf28428 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -23,150 +23,130 @@ int 
cmCoreTryCompile::TryCompileCode(std::vectorstd::string const argv)
   this-BinaryDirectory = argv[1].c_str();
   this-OutputFile = ;
   // which signature were we called with ?
-  this-SrcFileSignature = false;
-  unsigned int i;
+  this-SrcFileSignature = true;
 
   const char* sourceDirectory = argv[2].c_str();
   const char* projectName = 0;
   const char* targetName = 0;
-  char targetNameBuf[64];
-  int extraArgs = 0;
-
-  // look for CMAKE_FLAGS and store them
   std::vectorstd::string cmakeFlags;
-  for (i = 3; i  argv.size(); ++i)
-{
-if (argv[i] == CMAKE_FLAGS)
-  {
- // CMAKE_FLAGS is the first argument because we need an argv[0] that
- // is not used, so it matches regular command line parsing which has
- // the program name as arg 0
-  for (; i  argv.size()  argv[i] != COMPILE_DEFINITIONS 
- argv[i] != OUTPUT_VARIABLE 
- argv[i] != LINK_LIBRARIES;
-   ++i)
-{
-extraArgs++;
-cmakeFlags.push_back(argv[i]);
-}
-  break;
-  }
-}
-
-  // look for OUTPUT_VARIABLE and store them
+  std::vectorstd::string compileDefs;
   std::string outputVariable;
-  for (i = 3; i  argv.size(); ++i)
+  std::string copyFile;
+  std::vectorcmTarget* targets;
+  std::string libsToLink =  ;
+  bool useOldLinkLibs = true;
+  char targetNameBuf[64];
+  bool didOutputVariable = false;
+  bool didCopyFile = false;
+
+  enum Doing { DoingNone, DoingCMakeFlags, DoingCompileDefinitions,
+   DoingLinkLibraries, DoingOutputVariable, DoingCopyFile };
+  Doing doing = DoingNone;
+  for(size_t i=3; i  argv.size(); ++i)
 {
-if (argv[i] == OUTPUT_VARIABLE)
+if(argv[i] == CMAKE_FLAGS)
   {
-  if ( argv.size() = (i+1) )
-{
-this-Makefile-IssueMessage(cmake::FATAL_ERROR,
-  OUTPUT_VARIABLE specified but there is no variable);
-return -1;
-}
-  extraArgs += 2;
-  outputVariable = argv[i+1];
-  break;
+  doing = DoingCMakeFlags;
+  // CMAKE_FLAGS is the first argument because we need an argv[0] that
+  // is not used, so it matches regular command line parsing which has
+  // the program name as arg 0
+  cmakeFlags.push_back(argv[i]);
   }
-}
-
-  // look for COMPILE_DEFINITIONS and store them
-  std::vectorstd::string compileFlags;
-  for (i = 3; i  argv.size(); ++i)
-{
-if (argv[i] == COMPILE_DEFINITIONS)
+else if(argv[i] == COMPILE_DEFINITIONS)
   {
-  extraArgs++;
-  for (i = i + 1; i  argv.size()  argv[i] != CMAKE_FLAGS 
- argv[i] != OUTPUT_VARIABLE 
- argv[i] != LINK_LIBRARIES;
-   ++i)
-{
-extraArgs

[Cmake-commits] CMake branch, next, updated. v2.8.11-2411-gfd5ecdc

[Brad King]

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  fd5ecdcce5bf6077f23cfd6dfb2addb05272b28f (commit)
   via  3c7e09eb8e88b39fb3d785245ad8b168530909fe (commit)
  from  6efb5bd292096243ca6cd69be9db38fe6693862b (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=fd5ecdcce5bf6077f23cfd6dfb2addb05272b28f
commit fd5ecdcce5bf6077f23cfd6dfb2addb05272b28f
Merge: 6efb5bd 3c7e09e
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:13:04 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 09:13:04 2013 -0400

Merge branch 'master' into next


---

Summary of changes:
 Source/CMakeVersion.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-2413-gad9c60d

[Brad King]

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  ad9c60d132a9bfd390543282b9a31880635df690 (commit)
   via  b8af46cb878551cc5a1c9275f46792b282479ebb (commit)
  from  fd5ecdcce5bf6077f23cfd6dfb2addb05272b28f (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=ad9c60d132a9bfd390543282b9a31880635df690
commit ad9c60d132a9bfd390543282b9a31880635df690
Merge: fd5ecdc b8af46c
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:42:02 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 09:42:02 2013 -0400

Merge topic 'find-Qt4-granular-modules' into next

b8af46c FindQt4: Don't fail if certain Qt modules are unavailable.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8af46cb878551cc5a1c9275f46792b282479ebb
commit b8af46cb878551cc5a1c9275f46792b282479ebb
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu May 23 17:02:05 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 09:39:56 2013 -0400

FindQt4: Don't fail if certain Qt modules are unavailable.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 21e8e91..4c05cc0 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -881,16 +881,20 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   endforeach()
 
   if(Q_WS_WIN)
-set(QT_MODULES ${QT_MODULES} QAxContainer QAxServer)
-# Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
-find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
-  PATHS ${QT_HEADERS_DIR}/ActiveQt
-  NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
-  )
-find_path(QT_QAXSERVER_INCLUDE_DIR ActiveQt
-  PATHS ${QT_HEADERS_DIR}/ActiveQt
-  NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
-  )
+if (QT_QAXCONTAINER_FOUND)
+  set(QT_MODULES ${QT_MODULES} QAxContainer)
+  # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
+  find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
+PATHS ${QT_HEADERS_DIR}/ActiveQt
+NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+)
+endif()
+if (QT_QAXSERVER_FOUND)
+  find_path(QT_QAXSERVER_INCLUDE_DIR ActiveQt
+PATHS ${QT_HEADERS_DIR}/ActiveQt
+NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+)
+endif()
   endif()
 
   # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR
@@ -1051,14 +1055,18 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   if(Q_WS_WIN)
 _QT4_ADJUST_LIB_VARS(qtmain)
 
-_QT4_ADJUST_LIB_VARS(QAxServer)
-set_property(TARGET Qt4::QAxServer PROPERTY
-  INTERFACE_QT4_NO_LINK_QTMAIN ON
-)
-set_property(TARGET Qt4::QAxServer APPEND PROPERTY
-  COMPATIBLE_INTERFACE_BOOL QT4_NO_LINK_QTMAIN)
+if(QT_QAXSERVER_FOUND)
+  _QT4_ADJUST_LIB_VARS(QAxServer)
+  set_property(TARGET Qt4::QAxServer PROPERTY
+INTERFACE_QT4_NO_LINK_QTMAIN ON
+  )
+  set_property(TARGET Qt4::QAxServer APPEND PROPERTY
+COMPATIBLE_INTERFACE_BOOL QT4_NO_LINK_QTMAIN)
+endif()
 
-_QT4_ADJUST_LIB_VARS(QAxContainer)
+if(QT_QAXCONTAINER_FOUND)
+  _QT4_ADJUST_LIB_VARS(QAxContainer)
+endif()
   endif()
 
   # Only public dependencies are listed here.
@@ -1080,7 +1088,9 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   _qt4_add_target_depends(QtWebKit Gui Network)
 
   _qt4_add_target_private_depends(Qt3Support Xml)
-  _qt4_add_target_private_depends(QtSvg Xml)
+  if(QT_VERSION VERSION_GREATER 4.6)
+_qt4_add_target_private_depends(QtSvg Xml)
+  endif()
   _qt4_add_target_private_depends(QtDBus Xml)
   _qt4_add_target_private_depends(QtUiTools Xml Gui)
   _qt4_add_target_private_depends(QtHelp Sql Xml Network)
@@ -1090,8 +1100,12 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   _qt4_add_target_private_depends(QtDeclarative XmlPatterns Svg Sql Gui)
   _qt4_add_target_private_depends(QtMultimedia Gui)
   _qt4_add_target_private_depends(QtOpenGL Gui)
-  _qt4_add_target_private_depends(QAxServer Gui)
-  _qt4_add_target_private_depends(QAxContainer Gui)
+  if(QT_QAXSERVER_FOUND)
+_qt4_add_target_private_depends(QAxServer Gui)
+  endif()
+  if(QT_QAXCONTAINER_FOUND)
+_qt4_add_target_private_depends(QAxContainer Gui)
+  endif()
   _qt4_add_target_private_depends(phonon Gui)
   if(QT_QTDBUS_FOUND)
 _qt4_add_target_private_depends(phonon DBus)

---

Summary of changes:


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-2420-g543dffe

[Brad King]

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  543dffebf66bbefbd13fadd036323cfb1b6ef3b3 (commit)
   via  dc1d025197d48829f2c0389824c8273b9e257413 (commit)
   via  8576b3f978e65a9c94630226e1da3f03047691a7 (commit)
   via  00d71bdd193b645aec10b41866bddb164c0eb093 (commit)
   via  94e7fef2268ba9d31bd31834f05f6d0c2ffe5a18 (commit)
  from  c74d498b683fb1cd448775e96990e96ab2416a30 (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=543dffebf66bbefbd13fadd036323cfb1b6ef3b3
commit 543dffebf66bbefbd13fadd036323cfb1b6ef3b3
Merge: c74d498 dc1d025
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:44:58 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 09:44:58 2013 -0400

Merge topic 'rpath-on-mac' into next

dc1d025 OS X: Add test for rpaths on Mac.
8576b3f OS X: Add support for @rpath in export files.
00d71bd Xcode: Add rpath support in Xcode generator.
94e7fef OS X: Add RPATH support for Mac.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc1d025197d48829f2c0389824c8273b9e257413
commit dc1d025197d48829f2c0389824c8273b9e257413
Author: Clinton Stimpson clin...@elemtech.com
AuthorDate: Wed May 1 22:19:06 2013 -0600
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 09:42:06 2013 -0400

OS X: Add test for rpaths on Mac.

This also tests rpaths through export/import.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index e07bb69..904922f 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1219,6 +1219,16 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P 
${CMake_SOURCE_DIR}/Utilities/
 endif()
   endif()
 
+  if(APPLE AND ${DARWIN_MAJOR_VERSION} GREATER 9)
+add_test(MacRuntimePath ${CMAKE_CTEST_COMMAND}
+  --build-and-test
+  ${CMake_SOURCE_DIR}/Tests/MacRuntimePath
+  ${CMake_BINARY_DIR}/Tests/MacRuntimePath
+  ${build_generator_args}
+  --build-project MacRuntimePath
+  )
+  endif()
+
   add_test(linkorder1 ${CMAKE_CTEST_COMMAND}
 --build-and-test
 ${CMake_SOURCE_DIR}/Tests/LinkLineOrder
diff --git a/Tests/MacRuntimePath/A/CMakeLists.txt 
b/Tests/MacRuntimePath/A/CMakeLists.txt
new file mode 100644
index 000..6e6de42
--- /dev/null
+++ b/Tests/MacRuntimePath/A/CMakeLists.txt
@@ -0,0 +1,63 @@
+cmake_minimum_required(VERSION 2.8)
+project(MacRuntimePath_A)
+
+# a shared library
+add_library(shared SHARED shared.cpp shared.h)
+set_target_properties(shared PROPERTIES MACOSX_RPATH 1)
+
+# a shared library with custom set @rpath
+add_library(shared2 SHARED shared.cpp shared.h)
+set_target_properties(shared2 PROPERTIES
+  BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR @rpath)
+
+# a framework library
+add_library(framework SHARED framework.cpp framework.h)
+set_target_properties(framework PROPERTIES MACOSX_RPATH 1 FRAMEWORK 1)
+
+# executable to test a shared library dependency with install rpaths
+add_executable(test1 test1.cpp)
+target_link_libraries(test1 shared)
+set_target_properties(test1 PROPERTIES
+  BUILD_WITH_INSTALL_RPATH 1 INSTALL_RPATH @loader_path/../lib)
+
+# executable to test a framework library dependency with install rpaths
+add_executable(test2 test2.cpp)
+target_link_libraries(test2 framework)
+set_target_properties(test2 PROPERTIES
+  BUILD_WITH_INSTALL_RPATH 1 INSTALL_RPATH @loader_path/../lib)
+
+# executable to test a framework library dependency with build tree rpaths
+add_executable(test3 test3.cpp)
+target_link_libraries(test3 framework)
+
+# executable to test a framework library dependency with build tree rpaths
+add_executable(test4 test1.cpp)
+target_link_libraries(test4 shared2)
+
+set_target_properties(shared shared2 framework PROPERTIES
+  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
+set_target_properties(test1 test2 test3 test4 PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
+foreach(config ${CMAKE_CONFIGURATION_TYPES})
+  string(TOUPPER ${config} CONFIG)
+  set_target_properties(shared shared2 framework PROPERTIES
+LIBRARY_OUTPUT_DIRECTORY_${CONFIG}
+  ${CMAKE_CURRENT_BINARY_DIR}/${config}/lib)
+  set_target_properties(test1 test2 test3 test4 PROPERTIES
+RUNTIME_OUTPUT_DIRECTORY_${CONFIG}
+  ${CMAKE_CURRENT_BINARY_DIR}/${config}/bin)
+endforeach()
+
+foreach(test test1 test2 test3 test4)
+  add_custom_target(${test}_run  ALL
+COMMAND ${test}
+DEPENDS ${test}
+)
+endforeach()
+
+export(TARGETS shared shared2 framework FILE 
${CMAKE_CURRENT_BINARY_DIR}/exp.cmake)
+
+install(TARGETS shared EXPORT MyExport DESTINATION lib)
+install(TARGETS

[Cmake-commits] CMake branch, master, updated. v2.8.11-237-gb0759da

[Brad King]

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

The branch, master has been updated
   via  b0759da303ebf8a49cb840504591c92fd290f419 (commit)
   via  373faae5e1c936351b143b0561c61ef9884303e1 (commit)
  from  800e764e8047e194cb5532b6528104a16f83bd8f (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=b0759da303ebf8a49cb840504591c92fd290f419
commit b0759da303ebf8a49cb840504591c92fd290f419
Merge: 800e764 373faae
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:56:32 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 09:56:32 2013 -0400

Merge topic 'framework-refactor'

373faae Refactor how bundles and frameworks are supported.


---

Summary of changes:
 Source/cmExportBuildFileGenerator.cxx  |2 +-
 Source/cmExportInstallFileGenerator.cxx|8 +-
 Source/cmGlobalXCodeGenerator.cxx  |9 +-
 Source/cmInstallTargetGenerator.cxx|   14 +--
 Source/cmMakefileExecutableTargetGenerator.cxx |5 +-
 Source/cmMakefileLibraryTargetGenerator.cxx|   13 +-
 Source/cmMakefileTargetGenerator.cxx   |2 +-
 Source/cmMakefileTargetGenerator.h |1 -
 Source/cmMakefileUtilityTargetGenerator.cxx|3 -
 Source/cmNinjaNormalTargetGenerator.cxx|   19 ++-
 Source/cmNinjaTargetGenerator.cxx  |2 +-
 Source/cmOSXBundleGenerator.cxx|  102 ---
 Source/cmOSXBundleGenerator.h  |   22 ++--
 Source/cmTarget.cxx|  160 +++
 Source/cmTarget.h  |   33 +++--
 Tests/BundleUtilities/CMakeLists.txt   |3 +-
 16 files changed, 229 insertions(+), 169 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, master, updated. v2.8.11-233-gacf42ba

[Brad King]

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

The branch, master has been updated
   via  acf42ba325677e0fd86ef4861a72a8cf3e359e51 (commit)
   via  b8af46cb878551cc5a1c9275f46792b282479ebb (commit)
  from  3c7e09eb8e88b39fb3d785245ad8b168530909fe (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=acf42ba325677e0fd86ef4861a72a8cf3e359e51
commit acf42ba325677e0fd86ef4861a72a8cf3e359e51
Merge: 3c7e09e b8af46c
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:56:21 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 09:56:21 2013 -0400

Merge topic 'find-Qt4-granular-modules'

b8af46c FindQt4: Don't fail if certain Qt modules are unavailable.


---

Summary of changes:
 Modules/FindQt4.cmake |   54 ++--
 1 files changed, 34 insertions(+), 20 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, master, updated. v2.8.11-249-g406d270

[Brad King]

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

The branch, master has been updated
   via  406d270c7b8a759e60268a12f16aa2a4bac0cfdb (commit)
   via  a2099a8e8d2b97d2a2f91cbc06a4078f7c5b7139 (commit)
  from  6d4e79e2c361084ae26a8961ac9936052d68fde9 (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=406d270c7b8a759e60268a12f16aa2a4bac0cfdb
commit 406d270c7b8a759e60268a12f16aa2a4bac0cfdb
Merge: 6d4e79e a2099a8
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:57:08 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 09:57:08 2013 -0400

Merge topic 'SelectLibraryConfigurations-cached-library'

a2099a8 SelectLibraryConfigurations: Fix for cached base_LIBRARY


---

Summary of changes:
 Modules/SelectLibraryConfigurations.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, master, updated. v2.8.11-247-g6d4e79e

[Brad King]

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

The branch, master has been updated
   via  6d4e79e2c361084ae26a8961ac9936052d68fde9 (commit)
   via  fa55751f83dc5d5bd5f80d12c3076ec703262edb (commit)
   via  f77631672168b1e3b5fad93c2bb83db65cb67e7b (commit)
  from  3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d (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=6d4e79e2c361084ae26a8961ac9936052d68fde9
commit 6d4e79e2c361084ae26a8961ac9936052d68fde9
Merge: 3caf565 fa55751
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:57:01 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 09:57:01 2013 -0400

Merge topic 'qt4-qt5-CMAKE_AUTOMOC'

fa55751 QtAutomoc: Get the Qt version through the target link interface
f776316 Use the qt5::moc imported target instead of a variable.


---

Summary of changes:
 Modules/AutomocInfo.cmake.in|5 +--
 Source/cmQtAutomoc.cxx  |   40 +++
 Tests/CMakeLists.txt|   14 
 Tests/Qt4And5Automoc/CMakeLists.txt |   13 +++
 Tests/Qt4And5Automoc/main.cpp   |   18 +++
 Tests/Qt4And5Automoc/main_qt4.cpp   |4 +++
 Tests/Qt4And5Automoc/main_qt5.cpp   |4 +++
 7 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 Tests/Qt4And5Automoc/CMakeLists.txt
 create mode 100644 Tests/Qt4And5Automoc/main.cpp
 create mode 100644 Tests/Qt4And5Automoc/main_qt4.cpp
 create mode 100644 Tests/Qt4And5Automoc/main_qt5.cpp


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, master, updated. v2.8.11-253-gdb5f524

[Brad King]

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

The branch, master has been updated
   via  db5f5243b5079ebfeb06dea9c82e1cd1537a325b (commit)
   via  e162326128f70ae1fd1a2bee9449163f87af1d18 (commit)
  from  7be07970ff9e1c102a1cc6d862694a4f5bb1be07 (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=db5f5243b5079ebfeb06dea9c82e1cd1537a325b
commit db5f5243b5079ebfeb06dea9c82e1cd1537a325b
Merge: 7be0797 e162326
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:57:27 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 09:57:27 2013 -0400

Merge topic 'fix-style'

e162326 Fix indentation.


---

Summary of changes:
 Source/cmGlobalGenerator.cxx |2 +-
 Source/cmTarget.cxx  |4 ++--
 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, master, updated. v2.8.11-255-g90441b2

[Brad King]

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

The branch, master has been updated
   via  90441b289da6e7bd9f50a970d7adefc7b6be749f (commit)
   via  cca955a27cf3fc8344ee3dce213472b61e1edef7 (commit)
  from  db5f5243b5079ebfeb06dea9c82e1cd1537a325b (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=90441b289da6e7bd9f50a970d7adefc7b6be749f
commit 90441b289da6e7bd9f50a970d7adefc7b6be749f
Merge: db5f524 cca955a
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:57:32 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 09:57:32 2013 -0400

Merge topic 'vs-RootNamespace'

cca955a VS: Add VS_GLOBAL_ROOTNAMESPACE target property


---

Summary of changes:
 Source/cmTarget.cxx|5 +
 Source/cmVisualStudio10TargetGenerator.cxx |9 +
 2 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, master, updated. v2.8.11-239-gd444fea

[Brad King]

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

The branch, master has been updated
   via  d444fea16339e3d39bc38244d2f0ee36b31b6be1 (commit)
   via  cbe3f2072bdd181660bc4f9174a73febd3ed5230 (commit)
  from  b0759da303ebf8a49cb840504591c92fd290f419 (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=d444fea16339e3d39bc38244d2f0ee36b31b6be1
commit d444fea16339e3d39bc38244d2f0ee36b31b6be1
Merge: b0759da cbe3f20
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:56:37 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 09:56:37 2013 -0400

Merge topic 'xcode-shlib-versioning'

cbe3f20 Xcode: Add support for shared library versioning


---

Summary of changes:
 Modules/Platform/Darwin.cmake |8 +--
 Source/cmGlobalXCodeGenerator.cxx |   94 +++--
 2 files changed, 81 insertions(+), 21 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, master, updated. v2.8.11-244-g3caf565

[Brad King]

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

The branch, master has been updated
   via  3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d (commit)
   via  dc1d025197d48829f2c0389824c8273b9e257413 (commit)
   via  8576b3f978e65a9c94630226e1da3f03047691a7 (commit)
   via  00d71bdd193b645aec10b41866bddb164c0eb093 (commit)
   via  94e7fef2268ba9d31bd31834f05f6d0c2ffe5a18 (commit)
  from  d444fea16339e3d39bc38244d2f0ee36b31b6be1 (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=3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d
commit 3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d
Merge: d444fea dc1d025
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:56:44 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 09:56:44 2013 -0400

Merge topic 'rpath-on-mac'

dc1d025 OS X: Add test for rpaths on Mac.
8576b3f OS X: Add support for @rpath in export files.
00d71bd Xcode: Add rpath support in Xcode generator.
94e7fef OS X: Add RPATH support for Mac.


---

Summary of changes:
 Modules/Platform/Darwin.cmake  |5 +
 Source/cmComputeLinkInformation.cxx|   60 ++--
 Source/cmExportBuildFileGenerator.cxx  |   16 +++
 Source/cmExportBuildFileGenerator.h|2 +
 Source/cmExportFileGenerator.cxx   |6 +-
 Source/cmExportFileGenerator.h |3 +
 Source/cmExportInstallFileGenerator.cxx|   16 +++
 Source/cmExportInstallFileGenerator.h  |2 +
 Source/cmExportTryCompileFileGenerator.cxx |   15 +++
 Source/cmExportTryCompileFileGenerator.h   |2 +
 Source/cmGlobalXCodeGenerator.cxx  |   23 +
 Source/cmInstallTargetGenerator.cxx|   76 +++
 Source/cmOrderDirectories.cxx  |   45 -
 Source/cmSystemTools.cxx   |   21 
 Source/cmSystemTools.h |4 +
 Source/cmTarget.cxx|  105 +++-
 Source/cmTarget.h  |9 ++
 Tests/CMakeLists.txt   |   10 ++
 Tests/MacRuntimePath/A/CMakeLists.txt  |   63 
 .../A}/framework.cpp   |0
 .../A}/framework.h |0
 .../A}/shared.cpp  |0
 .../{BundleUtilities = MacRuntimePath/A}/shared.h |0
 Tests/MacRuntimePath/A/test1.cpp   |8 ++
 Tests/MacRuntimePath/A/test2.cpp   |8 ++
 Tests/MacRuntimePath/A/test3.cpp   |8 ++
 Tests/MacRuntimePath/B/CMakeLists.txt  |   17 +++
 Tests/MacRuntimePath/CMakeLists.txt|   72 +
 .../InitialCache.cmake.in  |4 +-
 29 files changed, 564 insertions(+), 36 deletions(-)
 create mode 100644 Tests/MacRuntimePath/A/CMakeLists.txt
 copy Tests/{BundleUtilities = MacRuntimePath/A}/framework.cpp (100%)
 copy Tests/{BundleUtilities = MacRuntimePath/A}/framework.h (100%)
 copy Tests/{BundleUtilities = MacRuntimePath/A}/shared.cpp (100%)
 copy Tests/{BundleUtilities = MacRuntimePath/A}/shared.h (100%)
 create mode 100644 Tests/MacRuntimePath/A/test1.cpp
 create mode 100644 Tests/MacRuntimePath/A/test2.cpp
 create mode 100644 Tests/MacRuntimePath/A/test3.cpp
 create mode 100644 Tests/MacRuntimePath/B/CMakeLists.txt
 create mode 100644 Tests/MacRuntimePath/CMakeLists.txt
 copy Tests/{ExportImport = MacRuntimePath}/InitialCache.cmake.in (81%)


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, master, updated. v2.8.11-266-ge57b6a2

[Brad King]

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

The branch, master has been updated
   via  e57b6a25211ea28b7b01aadfc3aaf1de79455bdb (commit)
   via  24466f22c0c0e3235f0a21bd2a298c39df50e2f3 (commit)
   via  80ca9c4b41ecdce069a6c3f4c1b558084a748876 (commit)
   via  7cb23084b2595d06aea46cead0e077b5f13aeddb (commit)
   via  47f80d9c43eaa31c32b33a977bdbeda319671dd6 (commit)
   via  1319a147bdc15f4a5a6a8dc56f0198600ff04c42 (commit)
   via  35496761a58956bd8c5ad65a3ed9ee78d09af56b (commit)
   via  f3ad863ae6f0487bbf80d95b0d3f622840187a6a (commit)
  from  bcc29c56a599baa3e2d8bd1d56e3727911a1c7d7 (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=e57b6a25211ea28b7b01aadfc3aaf1de79455bdb
commit e57b6a25211ea28b7b01aadfc3aaf1de79455bdb
Merge: bcc29c5 24466f2
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:57:44 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 09:57:44 2013 -0400

Merge topic 'target-COMPILE_OPTIONS'

24466f2 Add target_compile_options command.
80ca9c4 Add COMPILE_OPTIONS target property.
7cb2308 cmTarget: Rename LinkInterfaceIncludeDirectoriesEntries
47f80d9 cmTarget: Rename struct to be more re-usable.
1319a14 Add LANG_COMPILER_ID generator expressions.
3549676 Add cmLocalGenerator::GetCompileOptions.
f3ad863 VS6: Rename some variables to correspond to config values.


---

Summary of changes:
 Source/cmCommands.cxx  |2 +
 Source/cmDocumentGeneratorExpressions.h|8 +
 Source/cmExtraSublimeTextGenerator.cxx |8 +-
 Source/cmGeneratorExpressionDAGChecker.cxx |8 +
 Source/cmGeneratorExpressionDAGChecker.h   |1 +
 Source/cmGeneratorExpressionEvaluator.cxx  |  111 -
 Source/cmGlobalXCodeGenerator.cxx  |6 +-
 Source/cmLocalGenerator.cxx|   20 ++
 Source/cmLocalGenerator.h  |3 +
 Source/cmLocalVisualStudio6Generator.cxx   |   41 ++-
 Source/cmLocalVisualStudio7Generator.cxx   |4 +-
 Source/cmMakefileTargetGenerator.cxx   |   32 ++-
 Source/cmNinjaTargetGenerator.cxx  |   10 +-
 Source/cmTarget.cxx|  292 ++--
 Source/cmTarget.h  |6 +
 ...mmand.cxx = cmTargetCompileOptionsCommand.cxx} |   32 +--
 ...nsCommand.h = cmTargetCompileOptionsCommand.h} |   29 +-
 Source/cmVisualStudio10TargetGenerator.cxx |6 +-
 .../target_compile_options/CMakeLists.txt  |   35 +++
 .../target_compile_options/consumer.cpp|   18 ++
 .../CMakeCommands/target_compile_options/main.cpp  |   18 ++
 Tests/CMakeLists.txt   |2 +
 Tests/CompileOptions/CMakeLists.txt|   16 +
 Tests/CompileOptions/main.cpp  |   11 +
 Tests/CompileOptions/other.cpp |5 +
 25 files changed, 629 insertions(+), 95 deletions(-)
 copy Source/{cmTargetCompileDefinitionsCommand.cxx = 
cmTargetCompileOptionsCommand.cxx} (68%)
 copy Source/{cmTargetCompileDefinitionsCommand.h = 
cmTargetCompileOptionsCommand.h} (71%)
 create mode 100644 Tests/CMakeCommands/target_compile_options/CMakeLists.txt
 create mode 100644 Tests/CMakeCommands/target_compile_options/consumer.cpp
 create mode 100644 Tests/CMakeCommands/target_compile_options/main.cpp
 create mode 100644 Tests/CompileOptions/CMakeLists.txt
 create mode 100644 Tests/CompileOptions/main.cpp
 create mode 100644 Tests/CompileOptions/other.cpp


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, master, updated. v2.8.11-268-gd114fc3

[Brad King]

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

The branch, master has been updated
   via  d114fc373c1499689265c6c12e95b86f2930b227 (commit)
   via  cd4451d1e738a729a1a8d0ed34b544cada1de078 (commit)
  from  e57b6a25211ea28b7b01aadfc3aaf1de79455bdb (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=d114fc373c1499689265c6c12e95b86f2930b227
commit d114fc373c1499689265c6c12e95b86f2930b227
Merge: e57b6a2 cd4451d
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:57:53 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 09:57:53 2013 -0400

Merge topic 'useless-MATCHES'

cd4451d replace string(... MATCHES ^const$) with string(... STREQUAL 
const)


---

Summary of changes:
 Modules/CMakeBackwardCompatibilityC.cmake |2 +-
 Modules/CTest.cmake   |4 ++--
 Modules/ExternalData.cmake|2 +-
 Modules/FindThreads.cmake |2 +-
 Modules/FindXMLRPC.cmake  |4 ++--
 Tests/Complex/CMakeLists.txt  |   13 +
 Tests/ComplexOneConfig/CMakeLists.txt |   13 +
 Tests/SimpleInstall/CMakeLists.txt|2 +-
 Tests/SimpleInstallS2/CMakeLists.txt  |2 +-
 9 files changed, 19 insertions(+), 25 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-2434-gf0d8665

[Brad King]

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  f0d8665567f98192fd88fb4cb9bdb6e9d04e6cb2 (commit)
   via  d114fc373c1499689265c6c12e95b86f2930b227 (commit)
   via  e57b6a25211ea28b7b01aadfc3aaf1de79455bdb (commit)
   via  bcc29c56a599baa3e2d8bd1d56e3727911a1c7d7 (commit)
   via  90441b289da6e7bd9f50a970d7adefc7b6be749f (commit)
   via  db5f5243b5079ebfeb06dea9c82e1cd1537a325b (commit)
   via  7be07970ff9e1c102a1cc6d862694a4f5bb1be07 (commit)
   via  406d270c7b8a759e60268a12f16aa2a4bac0cfdb (commit)
   via  6d4e79e2c361084ae26a8961ac9936052d68fde9 (commit)
   via  3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d (commit)
   via  d444fea16339e3d39bc38244d2f0ee36b31b6be1 (commit)
   via  b0759da303ebf8a49cb840504591c92fd290f419 (commit)
   via  800e764e8047e194cb5532b6528104a16f83bd8f (commit)
   via  acf42ba325677e0fd86ef4861a72a8cf3e359e51 (commit)
  from  543dffebf66bbefbd13fadd036323cfb1b6ef3b3 (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=f0d8665567f98192fd88fb4cb9bdb6e9d04e6cb2
commit f0d8665567f98192fd88fb4cb9bdb6e9d04e6cb2
Merge: 543dffe d114fc3
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 09:56:27 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 09:56:27 2013 -0400

Merge branch 'master' into next


---

Summary of changes:


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-2441-g34f314d

[Brad King]

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  34f314d8ee0bb46b23783719c751053177aabe73 (commit)
   via  9d38db531d4bbba4eca48dc1ec4e724e98614201 (commit)
   via  884e3edeb13643826d82a78d283157843f95a2f3 (commit)
   via  d66f6f36baca6d314f1f17e11d90d52b5c9d7ec2 (commit)
  from  46c1e65f85509be189e945db11557829c966a962 (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=34f314d8ee0bb46b23783719c751053177aabe73
commit 34f314d8ee0bb46b23783719c751053177aabe73
Merge: 46c1e65 9d38db5
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 10:45:50 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 10:45:50 2013 -0400

Merge topic 'update-kwsys' into next

9d38db5 bootstrap: Compile KWSys SystemTools with UTIME(S|NSAT) values
884e3ed Merge branch 'upstream-kwsys' into update-kwsys
d66f6f3 KWSys 2013-05-31 (dccf7725)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d38db531d4bbba4eca48dc1ec4e724e98614201
commit 9d38db531d4bbba4eca48dc1ec4e724e98614201
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 10:34:35 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 10:36:00 2013 -0400

bootstrap: Compile KWSys SystemTools with UTIME(S|NSAT) values

The parent commit merged a change to KWSys that adds preprocessor
definitions for KWSYS_CXX_HAS_UTIMENSAT and KWSYS_CXX_HAS_UTIMES to the
command line for compiling SystemTools.  For bootstrapping we do not
need sub-1s timestamps so just define them to 0 for now.

diff --git a/bootstrap b/bootstrap
index 5c2addb..1e2d825 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1082,6 +1082,8 @@ KWSYS_STL_HAS_ALLOCATOR_OBJECTS=0
 KWSYS_CXX_HAS_SETENV=0
 KWSYS_CXX_HAS_UNSETENV=0
 KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H=0
+KWSYS_CXX_HAS_UTIMENSAT=0
+KWSYS_CXX_HAS_UTIMES=0
 KWSYS_CXX_HAS_CSTDDEF=0
 KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS=0
 KWSYS_CXX_HAS_MEMBER_TEMPLATES=0
@@ -1466,7 +1468,13 @@ if [ x${cmake_cxx_flags} != x ]; then
 fi
 
 cmake_c_flags_String=-DKWSYS_STRING_C
-cmake_cxx_flags_SystemTools=-DKWSYS_CXX_HAS_SETENV=${KWSYS_CXX_HAS_SETENV} 
-DKWSYS_CXX_HAS_UNSETENV=${KWSYS_CXX_HAS_UNSETENV} 
-DKWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H=${KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H}
+cmake_cxx_flags_SystemTools=
+  -DKWSYS_CXX_HAS_SETENV=${KWSYS_CXX_HAS_SETENV}
+  -DKWSYS_CXX_HAS_UNSETENV=${KWSYS_CXX_HAS_UNSETENV}
+  -DKWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H=${KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H}
+  -DKWSYS_CXX_HAS_UTIMENSAT=${KWSYS_CXX_HAS_UTIMENSAT}
+  -DKWSYS_CXX_HAS_UTIMES=${KWSYS_CXX_HAS_UTIMES}
+
 cmake_c_flags=${cmake_c_flags}-I`cmake_escape \${cmake_bootstrap_dir}\` 
-I`cmake_escape \${cmake_source_dir}/Source\` \
   -I`cmake_escape \${cmake_bootstrap_dir}\`
 cmake_cxx_flags=${cmake_cxx_flags} -I`cmake_escape 
\${cmake_bootstrap_dir}\` -I`cmake_escape \${cmake_source_dir}/Source\` \

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=884e3edeb13643826d82a78d283157843f95a2f3
commit 884e3edeb13643826d82a78d283157843f95a2f3
Merge: d114fc3 d66f6f3
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 10:23:31 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 10:23:31 2013 -0400

Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d66f6f36baca6d314f1f17e11d90d52b5c9d7ec2
commit d66f6f36baca6d314f1f17e11d90d52b5c9d7ec2
Author: KWSys Robot kwro...@kitware.com
AuthorDate: Fri May 31 16:34:02 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 10:23:16 2013 -0400

KWSys 2013-05-31 (dccf7725)

Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ dccf7725 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 725e541e..dccf7725
Brad King (2):
  e3370418 SystemTools: Use COMPILE_DEFINITIONS to pass platform tests
  dccf7725 SystemTools: Touch with better than 1s resolution if possible

Change-Id: Icdbcdf405e27b2d5dd30857c7c8679ed5096f252

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 124b8ac..6f0281d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -569,8 +569,17 @@ IF(KWSYS_USE_SystemTools)
 Checking whether CXX compiler has unsetenv DIRECT)
   KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H
 Checking whether CXX compiler has environ in stdlib.h DIRECT)
-  SET_SOURCE_FILES_PROPERTIES(SystemTools.cxx PROPERTIES
-COMPILE_FLAGS -DKWSYS_CXX_HAS_SETENV=${KWSYS_CXX_HAS_SETENV} 
-DKWSYS_CXX_HAS_UNSETENV=${KWSYS_CXX_HAS_UNSETENV

[Cmake-commits] CMake branch, next, updated. v2.8.11-2452-g2d118d7

[Brad King]

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  2d118d7c993b098e9e2ead4bf7f55f25e52cda83 (commit)
   via  647745b3eedd0036d9e745007acd1d9cc460ccab (commit)
   via  515f9af0d48be569adb51dfb43ff483cfc0d5156 (commit)
  from  f682040ce7b2f6e4fece048979f5e62f30cdb282 (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=2d118d7c993b098e9e2ead4bf7f55f25e52cda83
commit 2d118d7c993b098e9e2ead4bf7f55f25e52cda83
Merge: f682040 647745b
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 13:24:21 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 13:24:21 2013 -0400

Merge topic 'fix-variable_watch-cases' into next

647745b variable_watch: Print accesses as CMake Debug Log messages
515f9af variable_watch: Remove leftover debugging code (#14187)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=647745b3eedd0036d9e745007acd1d9cc460ccab
commit 647745b3eedd0036d9e745007acd1d9cc460ccab
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 13:19:15 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 13:19:59 2013 -0400

variable_watch: Print accesses as CMake Debug Log messages

Use makefile-IssueMessage() to print the unprocessed watch message in a
format consistent with other CMake messages and with a more complete
call stack for the access.

diff --git a/Source/cmVariableWatchCommand.cxx 
b/Source/cmVariableWatchCommand.cxx
index 8532930..297a92b 100644
--- a/Source/cmVariableWatchCommand.cxx
+++ b/Source/cmVariableWatchCommand.cxx
@@ -117,11 +117,9 @@ void cmVariableWatchCommand::VariableAccessed(const 
std::string variable,
   if ( !processed )
 {
 cmOStringStream msg;
-msg  * Variable \  variable.c_str()  \ was accessed using 
-   accessString   in:   currentListFile  std::endl;
-msgThe value of the variable: \  newValue  \  std::endl;
-msgThe list file stack:   stack.c_str();
-cmSystemTools::Message(msg.str().c_str());
+msg  Variable \  variable.c_str()  \ was accessed using 
+ accessString   with value \  newValue  \.;
+makefile-IssueMessage(cmake::LOG, msg.str());
 }
   this-InCallback = false;
 }
diff --git a/Tests/RunCMake/variable_watch/ModifiedAccess-stderr.txt 
b/Tests/RunCMake/variable_watch/ModifiedAccess-stderr.txt
index 3287626..3ff96fc 100644
--- a/Tests/RunCMake/variable_watch/ModifiedAccess-stderr.txt
+++ b/Tests/RunCMake/variable_watch/ModifiedAccess-stderr.txt
@@ -1,3 +1,4 @@
-\* Variable b was accessed using MODIFIED_ACCESS in: 
.*/Tests/RunCMake/variable_watch/ModifiedAccess.cmake
-  The value of the variable: b
-  The list file stack: 
.*/Tests/RunCMake/variable_watch/CMakeLists.txt;.*/Tests/RunCMake/variable_watch/ModifiedAccess.cmake
+CMake Debug Log at ModifiedAccess.cmake:3 \(set\):
+  Variable b was accessed using MODIFIED_ACCESS with value b.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/variable_watch/NoWatcher-stderr.txt 
b/Tests/RunCMake/variable_watch/NoWatcher-stderr.txt
index 95ff73b..d299429 100644
--- a/Tests/RunCMake/variable_watch/NoWatcher-stderr.txt
+++ b/Tests/RunCMake/variable_watch/NoWatcher-stderr.txt
@@ -1,4 +1,5 @@
 my_func
-\* Variable b was accessed using MODIFIED_ACCESS in: 
.*/Tests/RunCMake/variable_watch/NoWatcher.cmake
-  The value of the variable: 
-  The list file stack: 
.*/Tests/RunCMake/variable_watch/CMakeLists.txt;.*/Tests/RunCMake/variable_watch/NoWatcher.cmake$
+CMake Debug Log at NoWatcher.cmake:8 \(set\):
+  Variable b was accessed using MODIFIED_ACCESS with value .
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)$

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=515f9af0d48be569adb51dfb43ff483cfc0d5156
commit 515f9af0d48be569adb51dfb43ff483cfc0d5156
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 13:04:56 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 13:13:07 2013 -0400

variable_watch: Remove leftover debugging code (#14187)

When a watch does not specify a command to call then variable_watch
prints out a message to stderr.  Remove code after that which collects
all variable values to construct a message that is never printed.
Otherwise such code causes a READ_ACCESS watch to trigger on all
variables in the currents scope.

Reported-by: Yichao Yu yyc1...@gmail.com

diff --git a/Source/cmVariableWatchCommand.cxx 
b/Source/cmVariableWatchCommand.cxx
index a432943..8532930 100644
--- a/Source

[Cmake-commits] CMake branch, next, updated. v2.8.11-2455-g0744ca9

[Brad King]

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  0744ca9d0694dc7fa930059c4d83852094541e2f (commit)
   via  ecae92ddfb308b71743b402c991c8c03dfe5cae0 (commit)
   via  c9b75dcd734e2dd09eadbd9b16a6497bae95941c (commit)
  from  2d118d7c993b098e9e2ead4bf7f55f25e52cda83 (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=0744ca9d0694dc7fa930059c4d83852094541e2f
commit 0744ca9d0694dc7fa930059c4d83852094541e2f
Merge: 2d118d7 ecae92d
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 13:31:45 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 13:31:45 2013 -0400

Merge topic 'escape-regex-specials-in-path' into next

ecae92d Merge branch 'escape-regex-specials-in-path-2.8.11' into 
escape-regex-specials-in-path
c9b75dc Fix test failures caused by regexp-sensitive characters in the 
build paths


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecae92ddfb308b71743b402c991c8c03dfe5cae0
commit ecae92ddfb308b71743b402c991c8c03dfe5cae0
Merge: ec5b59a c9b75dc
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 13:28:38 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 13:28:38 2013 -0400

Merge branch 'escape-regex-specials-in-path-2.8.11' into 
escape-regex-specials-in-path


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9b75dcd734e2dd09eadbd9b16a6497bae95941c
commit c9b75dcd734e2dd09eadbd9b16a6497bae95941c
Author: Modestas Vainius mo...@debian.org
AuthorDate: Mon Jun 3 16:42:12 2013 +0200
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Mon Jun 3 16:51:21 2013 +0200

Fix test failures caused by regexp-sensitive characters in the build paths

Checkout [1] as an example of the test failures. In that particular cases, 
the
failures is caused by the plus sign in the path being pass unescaped
(buildd-cmake_2.8.9-1~bpo60+1-armel-3Lvkef) to the regexp.

In addition to failures in the log, the following new tests also fail in 
2.8.11:

  243 - CTestTestMemcheckUnknown (Failed)
  244 - CTestTestMemcheckUnknownQuoted (Failed)
  248 - CTestTestMemcheckDummyValgrindFailPre (Failed)
  249 - CTestTestMemcheckDummyValgrindFailPost (Failed)
  250 - CTestTestMemcheckDummyPurify (Failed)
  251 - CTestTestMemcheckDummyBC (Failed)
  253 - CMake.List (Failed)

[1] 
https://buildd.debian.org/status/fetch.php?pkg=cmakearch=armelver=2.8.9-1~bpo60%2B1stamp=1369243896

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index e07bb69..44e9450 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -15,10 +15,7 @@ macro(ADD_TEST_MACRO NAME COMMAND)
   list(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/${dir})
 endmacro()
 
-macro(REGEX_ESCAPE_STRING _OUT _IN)
-# Escape special regex metacharacters with a backslash
-string(REGEX REPLACE ([$^.[|*+?()]|]) \\1 ${_OUT} ${_IN})
-endmacro()
+include(${CMAKE_CURRENT_SOURCE_DIR}/RegexEscapeString.cmake)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/CheckFortran.cmake)
 
diff --git a/Tests/CMakeTests/GetPropertyTest.cmake.in 
b/Tests/CMakeTests/GetPropertyTest.cmake.in
index 306ab72..a858418 100644
--- a/Tests/CMakeTests/GetPropertyTest.cmake.in
+++ b/Tests/CMakeTests/GetPropertyTest.cmake.in
@@ -28,92 +28,95 @@ if(NOT result STREQUAL alpha)
   message(SEND_ERROR bad value of VARIABLE PROPERTY test_var: got '${result}' 
instead of 'alpha')
 endif()
 
+include(@CMAKE_CURRENT_SOURCE_DIR@/../RegexEscapeString.cmake)
+REGEX_ESCAPE_STRING(CTEST_ESCAPED_CMAKE_CURRENT_SOURCE_DIR 
@CMAKE_CURRENT_SOURCE_DIR@)
+
 set(Missing-Argument-RESULT 1)
-set(Missing-Argument-STDERR .*CMake Error at 
(@CMAKE_CURRENT_SOURCE_DIR@/)?GetProperty-Missing-Argument.cmake:1 
\\(get_property\\):.*get_property called with incorrect number of arguments.*)
+set(Missing-Argument-STDERR .*CMake Error at 
(${CTEST_ESCAPED_CMAKE_CURRENT_SOURCE_DIR}/)?GetProperty-Missing-Argument.cmake:1
 \\(get_property\\):.*get_property called with incorrect number of arguments.*)
 
 check_cmake_test(GetProperty
   Missing-Argument
 )
 
 set(Bad-Scope-RESULT 1)
-set(Bad-Scope-STDERR .*CMake Error at 
(@CMAKE_CURRENT_SOURCE_DIR@/)?GetProperty-Bad-Scope.cmake:1 
\\(get_property\\):.*get_property given invalid scope FOO\\..*)
+set(Bad-Scope-STDERR .*CMake Error at 
(${CTEST_ESCAPED_CMAKE_CURRENT_SOURCE_DIR}/)?GetProperty-Bad-Scope.cmake:1 
\\(get_property\\):.*get_property given invalid scope FOO\\..*)
 
 check_cmake_test(GetProperty
   Bad-Scope
 )
 
 set(Bad-Argument-RESULT 1)
-set(Bad-Argument-STDERR .*CMake Error

[Cmake-commits] CMake branch, next, updated. v2.8.11-2457-g49a3e20

[Brad King]

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  49a3e208e455d238d5b58082de467e2d330832af (commit)
   via  e4e09212c58995a6cfde7d101bc02fce0f7829be (commit)
  from  0744ca9d0694dc7fa930059c4d83852094541e2f (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=49a3e208e455d238d5b58082de467e2d330832af
commit 49a3e208e455d238d5b58082de467e2d330832af
Merge: 0744ca9 e4e0921
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 13:46:32 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 13:46:32 2013 -0400

Merge topic 'escape-regex-specials-in-path' into next

e4e0921 Merge branch 'master' into escape-regex-specials-in-path


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4e09212c58995a6cfde7d101bc02fce0f7829be
commit e4e09212c58995a6cfde7d101bc02fce0f7829be
Merge: c9b75dc a4d8c64
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Mon Jun 3 13:42:18 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 13:43:52 2013 -0400

Merge branch 'master' into escape-regex-specials-in-path

Resolve conflicts in Tests/CTestTestMemcheck/CMakeLists.txt by combining
changes from both sides.

diff --cc Tests/CTestTestMemcheck/CMakeLists.txt
index b5f758b,60df75c..ff02883
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@@ -1,12 -1,13 +1,15 @@@
 +REGEX_ESCAPE_STRING(CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR 
${CMAKE_CURRENT_BINARY_DIR})
 +
  foreach (_retval 0 1)
-   file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/ret${_retval}.c int main(){return 
${_retval};}\n)
+   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/memtester.cxx.in 
${CMAKE_CURRENT_BINARY_DIR}/ret${_retval}.cxx @ONLY)
  endforeach ()
  
+ include_directories(${CMake_SOURCE_DIR}/Source ${CMake_BINARY_DIR}/Source)
+ 
  # create binaries that we will use as a pseudo memory checker
- add_executable(pseudo_valgrind ${CMAKE_CURRENT_BINARY_DIR}/ret0.c)
+ add_executable(pseudo_valgrind ${CMAKE_CURRENT_BINARY_DIR}/ret0.cxx)
  set_target_properties(pseudo_valgrind PROPERTIES OUTPUT_NAME valgrind)
+ target_link_libraries(pseudo_valgrind CMakeLib)
  
  # Xcode 2.x forgets to create the output directory before linking
  # the individual architectures.
@@@ -42,17 -65,66 +67,66 @@@ function(gen_mc_test NAME CHECKER
  -D PSEUDO_VALGRIND=$TARGET_FILE:pseudo_valgrind
  -D ERROR_COMMAND=$TARGET_FILE:memcheck_fail
  )
- endforeach ()
+ endfunction(gen_mc_test)
+ 
+ function(gen_mcnl_test NAME CHECKER)
+ gen_mc_test_internal(${NAME} ${CHECKER}
+ -D PSEUDO_BC=$TARGET_FILE:pseudonl_BC
+ -D PSEUDO_PURIFY=$TARGET_FILE:pseudonl_purify
+ -D PSEUDO_VALGRIND=$TARGET_FILE:pseudonl_valgrind
+ )
+ set_tests_properties(CTestTestMemcheck${NAME}
+ PROPERTIES
 -PASS_REGULAR_EXPRESSION \nCannot find memory tester output file: 
${CMAKE_CURRENT_BINARY_DIR}/${NAME}/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error
 in read script: ${CMAKE_CURRENT_BINARY_DIR}/${NAME}/test.cmake\n)
++PASS_REGULAR_EXPRESSION \nCannot find memory tester output file: 
${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/${NAME}/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error
 in read script: 
${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/${NAME}/test.cmake\n)
+ endfunction(gen_mcnl_test)
+ 
+ unset(CTEST_EXTRA_CONFIG)
+ unset(CTEST_EXTRA_CODE)
+ unset(CMAKELISTS_EXTRA_CODE)
+ 
+ gen_mc_test(DummyPurify \${PSEUDO_PURIFY})
+ gen_mc_test(DummyValgrind \${PSEUDO_VALGRIND})
+ gen_mc_test(DummyBC \${PSEUDO_BC})
+ gen_mcnl_test(DummyPurifyNoLogfile \${PSEUDO_PURIFY})
+ gen_mcnl_test(DummyValgrindNoLogfile \${PSEUDO_VALGRIND})
+ gen_mcnl_test(DummyBCNoLogfile \${PSEUDO_BC})
+ 
+ set(CTEST_EXTRA_CODE set(CTEST_CUSTOM_PRE_MEMCHECK 
\\${CTEST_MEMORYCHECK_COMMAND}\)\nset(CTEST_CUSTOM_POST_MEMCHECK 
\\${CTEST_MEMORYCHECK_COMMAND}\))
+ gen_mc_test(DummyValgrindPrePost \${PSEUDO_VALGRIND})
+ 
+ set(CTEST_EXTRA_CODE set(CTEST_CUSTOM_POST_MEMCHECK \\${ERROR_COMMAND}\))
+ gen_mc_test(DummyValgrindFailPost \${PSEUDO_VALGRIND})
+ 
+ set(CTEST_EXTRA_CODE set(CTEST_CUSTOM_PRE_MEMCHECK \\${ERROR_COMMAND}\))
+ gen_mc_test(DummyValgrindFailPre \${PSEUDO_VALGRIND})
+ 
+ unset(CTEST_EXTRA_CODE)
+ set(CTEST_EXTRA_CONFIG set(CTEST_CUSTOM_MEMCHECK_IGNORE RunCMakeAgain)\n)
+ set(CMAKELISTS_EXTRA_CODE add_test(NAME RunCMakeAgain COMMAND 
\\${CMAKE_COMMAND}\ --version))
+ gen_mc_test(DummyValgrindIgnoreMemcheck \${PSEUDO_VALGRIND})
+ 
+ set(CTEST_EXTRA_CONFIG set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE 
\\${CMAKE_CURRENT_BINARY_DIR}/does-not-exist\))
+ unset

[Cmake-commits] CMake branch, next, updated. v2.8.11-2459-g8d76a6d

[Brad King]

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  8d76a6d5fdbc33ca5b44d5908161d59d17c8a55e (commit)
   via  64bf6e901778d7ce2fb4b2d09e22b34808d8ca06 (commit)
  from  49a3e208e455d238d5b58082de467e2d330832af (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=8d76a6d5fdbc33ca5b44d5908161d59d17c8a55e
commit 8d76a6d5fdbc33ca5b44d5908161d59d17c8a55e
Merge: 49a3e20 64bf6e9
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 13:49:26 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 13:49:26 2013 -0400

Merge topic 'revert-extra-space' into next

64bf6e9 Tests/VariableUsage: Finish cleanup from parent commit


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64bf6e901778d7ce2fb4b2d09e22b34808d8ca06
commit 64bf6e901778d7ce2fb4b2d09e22b34808d8ca06
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 13:47:26 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 13:47:26 2013 -0400

Tests/VariableUsage: Finish cleanup from parent commit

diff --git a/Tests/VariableUsage/CMakeLists.txt 
b/Tests/VariableUsage/CMakeLists.txt
index 978ba6a..4da1f56 100644
--- a/Tests/VariableUsage/CMakeLists.txt
+++ b/Tests/VariableUsage/CMakeLists.txt
@@ -1,2 +1 @@
-
 message(STATUS ${USED_VARIABLE})

---

Summary of changes:
 Tests/VariableUsage/CMakeLists.txt |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, master, updated. v2.8.11-271-gc9be17c

[Brad King]

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

The branch, master has been updated
   via  c9be17c8609c6f84c75710be917e23c59ecdb316 (commit)
   via  e4e09212c58995a6cfde7d101bc02fce0f7829be (commit)
   via  c9b75dcd734e2dd09eadbd9b16a6497bae95941c (commit)
  from  d114fc373c1499689265c6c12e95b86f2930b227 (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=c9be17c8609c6f84c75710be917e23c59ecdb316
commit c9be17c8609c6f84c75710be917e23c59ecdb316
Merge: d114fc3 e4e0921
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 13:51:31 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 3 13:51:31 2013 -0400

Merge topic 'escape-regex-specials-in-path'

e4e0921 Merge branch 'master' into escape-regex-specials-in-path
c9b75dc Fix test failures caused by regexp-sensitive characters in the 
build paths


---

Summary of changes:
 Tests/CMakeLists.txt  |5 +
 Tests/CMakeTests/GetPropertyTest.cmake.in |   29 -
 Tests/CMakeTests/IfTest.cmake.in  |5 -
 Tests/CMakeTests/ListTest.cmake.in|   21 -
 Tests/CMakeTests/WhileTest.cmake.in   |   14 +-
 Tests/CTestTestMemcheck/CMakeLists.txt|   12 +++-
 Tests/RegexEscapeString.cmake |4 
 7 files changed, 53 insertions(+), 37 deletions(-)
 create mode 100644 Tests/RegexEscapeString.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.11-2461-g6f7ea8f

[Brad King]

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  6f7ea8fd2663e96b768cdeb716eb523987075bf8 (commit)
   via  c9be17c8609c6f84c75710be917e23c59ecdb316 (commit)
  from  8d76a6d5fdbc33ca5b44d5908161d59d17c8a55e (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=6f7ea8fd2663e96b768cdeb716eb523987075bf8
commit 6f7ea8fd2663e96b768cdeb716eb523987075bf8
Merge: 8d76a6d c9be17c
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 13:50:13 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 3 13:50:13 2013 -0400

Merge branch 'master' into next


---

Summary of changes:


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, master, updated. v2.8.11-276-g05e47f2

[Brad King]

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

The branch, master has been updated
   via  05e47f21222f0c14735ce1431a74a5ad974cb1a2 (commit)
   via  483e208482ff46532e7ae48659e569580a88af9c (commit)
  from  b418327d1b85944d137913faf6c04537b5894e2f (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=05e47f21222f0c14735ce1431a74a5ad974cb1a2
commit 05e47f21222f0c14735ce1431a74a5ad974cb1a2
Merge: b418327 483e208
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 09:02:46 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 09:02:46 2013 -0400

Merge topic 'cfbundle-location'

483e208 OS X:  Fix getting of CFBundle LOCATION property.


---

Summary of changes:
 Source/cmExportInstallFileGenerator.cxx |   16 +---
 Source/cmGlobalXCodeGenerator.cxx   |8 +---
 Source/cmMakefileLibraryTargetGenerator.cxx |2 --
 Source/cmNinjaNormalTargetGenerator.cxx |2 --
 Source/cmOSXBundleGenerator.cxx |   23 +--
 Source/cmOSXBundleGenerator.h   |8 +++-
 Source/cmTarget.cxx |   19 +--
 Tests/CFBundleTest/CMakeLists.txt   |2 ++
 8 files changed, 29 insertions(+), 51 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, master, updated. v2.8.11-285-gd3971ee

[Brad King]

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

The branch, master has been updated
   via  d3971ee603d5de51e7a15c816be137324d860124 (commit)
   via  647745b3eedd0036d9e745007acd1d9cc460ccab (commit)
   via  515f9af0d48be569adb51dfb43ff483cfc0d5156 (commit)
   via  c63d30048bcf5bd6efa1e038b36c5efd29e34749 (commit)
   via  3d5bb381be16f67e4781c395bda2be12a5d00168 (commit)
  from  1e15db366218170bca663c06f0246782c2642bdb (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=d3971ee603d5de51e7a15c816be137324d860124
commit d3971ee603d5de51e7a15c816be137324d860124
Merge: 1e15db3 647745b
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 09:03:00 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 09:03:00 2013 -0400

Merge topic 'fix-variable_watch-cases'

647745b variable_watch: Print accesses as CMake Debug Log messages
515f9af variable_watch: Remove leftover debugging code (#14187)
c63d300 variable_watch: Add test for MODIFIED_ACCESS report
3d5bb38 variable_watch: Add missing string enumeration entry (#14188)


---

Summary of changes:
 Source/cmVariableWatch.cxx |1 +
 Source/cmVariableWatchCommand.cxx  |   21 ++-
 Tests/RunCMake/CMakeLists.txt  |1 +
 .../{CMP0004 = variable_watch}/CMakeLists.txt |0
 .../variable_watch/ModifiedAccess-stderr.txt   |4 +++
 Tests/RunCMake/variable_watch/ModifiedAccess.cmake |3 ++
 Tests/RunCMake/variable_watch/NoWatcher-stderr.txt |5 
 Tests/RunCMake/variable_watch/NoWatcher.cmake  |8 +++
 Tests/RunCMake/variable_watch/RunCMakeTest.cmake   |4 +++
 9 files changed, 29 insertions(+), 18 deletions(-)
 copy Tests/RunCMake/{CMP0004 = variable_watch}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/variable_watch/ModifiedAccess-stderr.txt
 create mode 100644 Tests/RunCMake/variable_watch/ModifiedAccess.cmake
 create mode 100644 Tests/RunCMake/variable_watch/NoWatcher-stderr.txt
 create mode 100644 Tests/RunCMake/variable_watch/NoWatcher.cmake
 create mode 100644 Tests/RunCMake/variable_watch/RunCMakeTest.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.11-2513-g3b4c9ef

[Brad King]

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  3b4c9efb6ef3ca351c2490d2cab224d6977b596d (commit)
   via  d3971ee603d5de51e7a15c816be137324d860124 (commit)
   via  1e15db366218170bca663c06f0246782c2642bdb (commit)
   via  05e47f21222f0c14735ce1431a74a5ad974cb1a2 (commit)
   via  b418327d1b85944d137913faf6c04537b5894e2f (commit)
  from  e5098c8bc8c50527c64c084154fbeff1e96c7a2f (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=3b4c9efb6ef3ca351c2490d2cab224d6977b596d
commit 3b4c9efb6ef3ca351c2490d2cab224d6977b596d
Merge: e5098c8 d3971ee
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 09:01:37 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 4 09:01:37 2013 -0400

Merge branch 'master' into next


---

Summary of changes:


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-2518-g5354df7

[Brad King]

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  5354df72e26ce7e8180d9b6a17b2374689c67790 (commit)
   via  d26800bc40a103d90366da176ad68ed92f21daab (commit)
  from  d8586e0c4f22c3c3a02a8761b171b76f82de0e59 (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=5354df72e26ce7e8180d9b6a17b2374689c67790
commit 5354df72e26ce7e8180d9b6a17b2374689c67790
Merge: d8586e0 d26800b
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 09:16:37 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 09:16:37 2013 -0400

Merge topic 'fix-path-root-dot-dot' into next

d26800b get_filename_component: Test ABSOLUTE of .. after root component


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d26800bc40a103d90366da176ad68ed92f21daab
commit d26800bc40a103d90366da176ad68ed92f21daab
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 3 11:17:20 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 4 09:09:22 2013 -0400

get_filename_component: Test ABSOLUTE of .. after root component

Teach the RunCMake.get_filename_component test to verify that .. does
not remove the root filename component.

diff --git a/Tests/RunCMake/get_filename_component/KnownComponents.cmake 
b/Tests/RunCMake/get_filename_component/KnownComponents.cmake
index a4ef8ff..9d7cf90 100644
--- a/Tests/RunCMake/get_filename_component/KnownComponents.cmake
+++ b/Tests/RunCMake/get_filename_component/KnownComponents.cmake
@@ -24,6 +24,11 @@ check(DIRECTORY in windows root ${test_winroot} c:/)
 get_filename_component(test_absolute /path/to/a/../filename.ext.in ABSOLUTE)
 check(ABSOLUTE ${test_absolute} /path/to/filename.ext.in)
 
+get_filename_component(test_absolute /../path/to/filename.ext.in ABSOLUTE)
+check(ABSOLUTE .. in root ${test_absolute} /path/to/filename.ext.in)
+get_filename_component(test_absolute c:/../path/to/filename.ext.in ABSOLUTE)
+check(ABSOLUTE .. in windows root ${test_absolute} 
c:/path/to/filename.ext.in)
+
 get_filename_component(test_cache /path/to/filename.ext.in DIRECTORY CACHE)
 check(CACHE 1 ${test_cache} /path/to)
 get_filename_component(test_cache /path/to/other/filename.ext.in DIRECTORY 
CACHE)

---

Summary of changes:
 .../get_filename_component/KnownComponents.cmake   |5 +
 1 files changed, 5 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-2516-gd8586e0

[Brad King]

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  d8586e0c4f22c3c3a02a8761b171b76f82de0e59 (commit)
   via  c91e88d0e15f38616284f12fc0f2152ac6c0562c (commit)
   via  6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b (commit)
  from  3b4c9efb6ef3ca351c2490d2cab224d6977b596d (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=d8586e0c4f22c3c3a02a8761b171b76f82de0e59
commit d8586e0c4f22c3c3a02a8761b171b76f82de0e59
Merge: 3b4c9ef c91e88d
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 09:16:28 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 09:16:28 2013 -0400

Merge topic 'update-kwsys' into next

c91e88d Merge branch 'upstream-kwsys' into update-kwsys
6dc3dd9 KWSys 2013-06-03 (d79a792e)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c91e88d0e15f38616284f12fc0f2152ac6c0562c
commit c91e88d0e15f38616284f12fc0f2152ac6c0562c
Merge: 9d38db5 6dc3dd9
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 09:08:58 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 4 09:08:58 2013 -0400

Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b
commit 6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b
Author: KWSys Robot kwro...@kitware.com
AuthorDate: Mon Jun 3 11:12:00 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 4 09:08:54 2013 -0400

KWSys 2013-06-03 (d79a792e)

Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ d79a792e | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' dccf7725..d79a792e
Brad King (1):
  d79a792e SystemTools: Fix CollapseFullPath to not erase root component

Change-Id: I25c6600a621a960738b5afc0ba73f63df0693303

diff --git a/SystemTools.cxx b/SystemTools.cxx
index 652649f..7891708 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -3085,7 +3085,7 @@ SystemToolsAppendComponents(
 {
 if(*i == ..)
   {
-  if(out_components.begin() != out_components.end())
+  if(out_components.size()  1)
 {
 out_components.erase(out_components.end()-1, out_components.end());
 }

---

Summary of changes:
 Source/kwsys/SystemTools.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.11-2520-g0a95eb9

[Brad King]

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  0a95eb978f02a39fff8efa9074b45146d81a57b7 (commit)
   via  21a0beacc1d8c452f13453b22f36c91fbbd0a182 (commit)
  from  5354df72e26ce7e8180d9b6a17b2374689c67790 (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=0a95eb978f02a39fff8efa9074b45146d81a57b7
commit 0a95eb978f02a39fff8efa9074b45146d81a57b7
Merge: 5354df7 21a0bea
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 10:57:37 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 10:57:37 2013 -0400

Merge topic 'xcode-framework-paths' into next

21a0bea Xcode: Fix framework search paths in STATIC library targets (#14191)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21a0beacc1d8c452f13453b22f36c91fbbd0a182
commit 21a0beacc1d8c452f13453b22f36c91fbbd0a182
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 09:49:40 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 4 09:49:40 2013 -0400

Xcode: Fix framework search paths in STATIC library targets (#14191)

In commit 2bc22bda (Xcode: Add frameworks search paths from link
dependeny closure, 2012-12-07) we made framework search paths from the
link closure conditional on target type, skipping it on STATIC and
OBJECT library targets that do not actually link.  However, the
framework search paths also influence the compile lines (-F options) so
we need them for all target types.  The Makefile generator already does
this, as did the Xcode generator prior to the above-mentioned commit.

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index b2d325c..0f59c02 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1997,20 +1997,16 @@ void 
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget target,
   dirs.Add(incpath.c_str());
   }
 }
-  if(target.GetType() != cmTarget::OBJECT_LIBRARY 
- target.GetType() != cmTarget::STATIC_LIBRARY)
+  // Add framework search paths needed for linking.
+  if(cmComputeLinkInformation* cli = target.GetLinkInformation(configName))
 {
-// Add framework search paths needed for linking.
-if(cmComputeLinkInformation* cli = target.GetLinkInformation(configName))
+std::vectorstd::string const fwDirs = cli-GetFrameworkPaths();
+for(std::vectorstd::string::const_iterator fdi = fwDirs.begin();
+fdi != fwDirs.end(); ++fdi)
   {
-  std::vectorstd::string const fwDirs = cli-GetFrameworkPaths();
-  for(std::vectorstd::string::const_iterator fdi = fwDirs.begin();
-  fdi != fwDirs.end(); ++fdi)
+  if(emitted.insert(*fdi).second)
 {
-if(emitted.insert(*fdi).second)
-  {
-  fdirs.Add(this-XCodeEscapePath(fdi-c_str()).c_str());
-  }
+fdirs.Add(this-XCodeEscapePath(fdi-c_str()).c_str());
 }
   }
 }

---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |   18 +++---
 1 files changed, 7 insertions(+), 11 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-2522-g6aa8810

[Brad King]

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  6aa8810ffdff230ad09b5cba61fe746dad090b4d (commit)
   via  9fa668ce0b3ffd29aaae9719b00c2220dd6bd8ab (commit)
  from  0a95eb978f02a39fff8efa9074b45146d81a57b7 (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=6aa8810ffdff230ad09b5cba61fe746dad090b4d
commit 6aa8810ffdff230ad09b5cba61fe746dad090b4d
Merge: 0a95eb9 9fa668c
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 14:55:15 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 4 14:55:15 2013 -0400

Merge topic 'ninja_phony_file_targets' into next

9fa668c Revert topic 'ninja_phony_file_targets'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fa668ce0b3ffd29aaae9719b00c2220dd6bd8ab
commit 9fa668ce0b3ffd29aaae9719b00c2220dd6bd8ab
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 4 14:52:35 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 4 14:52:35 2013 -0400

Revert topic 'ninja_phony_file_targets'

This will be replaced by a new implementation in another topic.

diff --git a/Source/cmGlobalNinjaGenerator.cxx 
b/Source/cmGlobalNinjaGenerator.cxx
index 29045a9..fa277b1 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -250,6 +250,7 @@ cmGlobalNinjaGenerator::WriteCustomCommandBuild(const 
std::string command,
   cmNinjaVars vars;
   vars[COMMAND] = cmd;
   vars[DESC] = EncodeLiteral(description);
+
   cmGlobalNinjaGenerator::WriteBuild(*this-BuildFileStream,
  comment,
  CUSTOM_COMMAND,
@@ -258,14 +259,6 @@ cmGlobalNinjaGenerator::WriteCustomCommandBuild(const 
std::string command,
  cmNinjaDeps(),
  orderOnlyDeps,
  vars);
-
-//we need to track every dependency that comes in, since we are trying
-//to find dependencies that are side effects of other custom commands
-//
-for(cmNinjaDeps::const_iterator i=deps.begin(); i != deps.end(); ++i)
-  {
-  this-UnknownCustomCommandFileDependencies.insert(*i);
-  }
 }
 
 void
@@ -485,7 +478,6 @@ void cmGlobalNinjaGenerator::Generate()
 
   this-WriteAssumedSourceDependencies();
   this-WriteTargetAliases(*this-BuildFileStream);
-  this-WriteUnknownCustomDependencies(*this-BuildFileStream);
   this-WriteBuiltinTargets(*this-BuildFileStream);
 
   if (cmSystemTools::GetErrorOccuredFlag()) {
@@ -893,7 +885,7 @@ void 
cmGlobalNinjaGenerator::WriteTargetAliases(std::ostream os)
   cmGlobalNinjaGenerator::WriteDivider(os);
   os  # Target aliases.\n\n;
 
-  for (TargetAliasMap::const_iterator i = TargetAliases.begin();
+  for (TargetAliasMap::iterator i = TargetAliases.begin();
i != TargetAliases.end(); ++i) {
 // Don't write ambiguous aliases.
 if (!i-second)
@@ -909,64 +901,6 @@ void 
cmGlobalNinjaGenerator::WriteTargetAliases(std::ostream os)
   }
 }
 
-void cmGlobalNinjaGenerator::WriteUnknownCustomDependencies(std::ostream os)
-{
-  //now write out the unknown dependencies. Don't write out any
-  //of these that are now have been added as a known output, file
-  //dependency or alias
-  cmGlobalNinjaGenerator::WriteDivider(os);
-  os  # Unknown Build Time Dependencies.
-  # Tell Ninja that they may appear as side effects of build rules
-  # otherwise ordered by order-only dependencies.\n\n;
-
-  std::string const rootBuildDirectory =
-  this-GetCMakeInstance()-GetHomeOutputDirectory();
-
-  //remove the following possible targets that we know
-  //are false positives
-  UnknownCustomCommandFileDependencies.erase(all);
-
-  //get the list of files that cmake itself has generated as a
-  //product of configuration.
-  std::setstd::string configuredFiles;
-  for (std::vectorcmLocalGenerator *::const_iterator i =
-   this-LocalGenerators.begin(); i != this-LocalGenerators.end(); ++i)
-{
-const std::vectorstd::string of = (*i)-GetMakefile()-GetOutputFiles();
-configuredFiles.insert(of.begin(), of.end());
-}
-
-  typedef std::setstd::string::const_iterator uccfd_iterator;
-  for (uccfd_iterator i = UnknownCustomCommandFileDependencies.begin();
-   i != UnknownCustomCommandFileDependencies.end(); ++i)
-{
-bool isUnknown = ( this-CustomCommandOutputs.find(*i) ==
-  this-CustomCommandOutputs.end() );
-isUnknown = isUnknown  configuredFiles.count(*i) == 0;
-isUnknown = isUnknown  this-TargetAliases.count(*i) == 0;
-
-if(!isUnknown)
-{
-  continue

[Cmake-commits] CMake branch, next, updated. v2.8.11-2524-g4bf23b5

[Brad King]

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  4bf23b574aa97ddd9723efbe3f72f8e1e0d81891 (commit)
   via  3a7898abe28f55f5da3febb3397e5aa3f30f0e62 (commit)
  from  6aa8810ffdff230ad09b5cba61fe746dad090b4d (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=4bf23b574aa97ddd9723efbe3f72f8e1e0d81891
commit 4bf23b574aa97ddd9723efbe3f72f8e1e0d81891
Merge: 6aa8810 3a7898a
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:05:45 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:05:45 2013 -0400

Merge topic 'test-genex-HEAD-target' into next

3a7898a Tests/IncludeDirectories: Export shared library symbol on Windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a7898abe28f55f5da3febb3397e5aa3f30f0e62
commit 3a7898abe28f55f5da3febb3397e5aa3f30f0e62
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 08:52:38 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 5 08:52:38 2013 -0400

Tests/IncludeDirectories: Export shared library symbol on Windows

The Watcom linker does not like to create shared libraries with no
exports.

diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp 
b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
index f388ef8..6673471 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp
@@ -1,4 +1,6 @@
-
-int main() {
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int other() {
   return 0;
 }

---

Summary of changes:
 .../TargetIncludeDirectories/other.cpp |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.11-2526-g7c3f18f

[Brad King]

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  7c3f18ff68824eab38cb6a2b47e76a9ae1b2e130 (commit)
   via  4d15c0b7c6f11c7486da7e760c59a1e7daabacab (commit)
  from  4bf23b574aa97ddd9723efbe3f72f8e1e0d81891 (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=7c3f18ff68824eab38cb6a2b47e76a9ae1b2e130
commit 7c3f18ff68824eab38cb6a2b47e76a9ae1b2e130
Merge: 4bf23b5 4d15c0b
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:08:57 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 5 09:08:57 2013 -0400

Merge branch 'master' into next


---

Summary of changes:
 Source/CMakeVersion.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-2528-gf7ef08e

[Brad King]

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  f7ef08ef7c24385595fd652bc83dac3b41e87683 (commit)
   via  5b222354de7060af409d0d80aa06180ed1b3ac64 (commit)
  from  7c3f18ff68824eab38cb6a2b47e76a9ae1b2e130 (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=f7ef08ef7c24385595fd652bc83dac3b41e87683
commit f7ef08ef7c24385595fd652bc83dac3b41e87683
Merge: 7c3f18f 5b22235
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:10:04 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 5 09:10:04 2013 -0400

Merge branch 'fix-genex-HEAD-target' into next

5b222354 Genex: Fix the HEAD target used for evaluated expressions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b222354de7060af409d0d80aa06180ed1b3ac64
commit 5b222354de7060af409d0d80aa06180ed1b3ac64
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Jun 3 23:53:29 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 5 09:05:00 2013 -0400

Genex: Fix the HEAD target used for evaluated expressions

If the expression $TARGET_PROPERTY:prop appears in the content
of a target property, the target that prop is read from is
the 'head target' of the expression. In contexts such as evaluating
the content of a target property during generation, such
as INCLUDE_DIRECTORIES, the 'head target' is the one on which the
initial request was made.

If evaluating a generator expression which is not a target property
content, the target must be explicitly specified. Such contexts
include add_custom_command and file(GENERATE). The content might
then look like

 $TARGET_PROPERTY:tgt,prop

However, as there is no HeadTarget set, any generator expressions
evaluated as part of reading prop from tgt which do not specify
the tgt directly report an error.

Modify the logic of the TARGET_PROPERTY generator expression so
that in such contexts, the 'head target' is set to the appropriate
target which was first encountered.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx 
b/Source/cmGeneratorExpressionEvaluator.cxx
index de6371a..a01a0f8 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -315,6 +315,7 @@ static const char* targetPropertyTransitiveWhitelist[] = {
 
 std::string getLinkedTargetsContent(const std::vectorstd::string libraries,
   cmTarget *target,
+  cmTarget *headTarget,
   cmGeneratorExpressionContext *context,
   cmGeneratorExpressionDAGChecker *dagChecker,
   const std::string interfacePropertyName)
@@ -345,7 +346,7 @@ std::string getLinkedTargetsContent(const 
std::vectorstd::string libraries,
   std::string linkedTargetsContent = cge-Evaluate(context-Makefile,
   context-Config,
   context-Quiet,
-  context-HeadTarget,
+  headTarget,
   target,
   dagChecker);
   if (cge-GetHadContextSensitiveCondition())
@@ -538,6 +539,8 @@ static const struct TargetPropertyNode : public 
cmGeneratorExpressionNode
   interfacePropertyName = INTERFACE_COMPILE_DEFINITIONS;
   }
 
+cmTarget *headTarget = context-HeadTarget ? context-HeadTarget : target;
+
 const char **transBegin = targetPropertyTransitiveWhitelist;
 const char **transEnd = targetPropertyTransitiveWhitelist
   + (sizeof(targetPropertyTransitiveWhitelist) /
@@ -547,11 +550,12 @@ static const struct TargetPropertyNode : public 
cmGeneratorExpressionNode
   {
   const cmTarget::LinkInterface *iface = target-GetLinkInterface(
 context-Config,
-context-HeadTarget);
+headTarget);
   if(iface)
 {
 linkedTargetsContent =
   getLinkedTargetsContent(iface-Libraries, target,
+  headTarget,
   context, dagChecker,
   interfacePropertyName);
 }
@@ -561,11 +565,12 @@ static const struct TargetPropertyNode : public 
cmGeneratorExpressionNode
   {
   const cmTarget::LinkImplementation *impl = target-GetLinkImplementation

[Cmake-commits] CMake branch, master, updated. v2.8.11-294-g2cd8a6a

[Brad King]

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

The branch, master has been updated
   via  2cd8a6a3c6d505674e113345c58edfb19bf8dc2e (commit)
   via  9efe35906af4447533d9e594df539e71293437dd (commit)
   via  db15713f057ad4896eab07f847870f5ab42f8be1 (commit)
  from  93317839b0aa7b47e37aad96ef3e0d4cfea236ba (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=2cd8a6a3c6d505674e113345c58edfb19bf8dc2e
commit 2cd8a6a3c6d505674e113345c58edfb19bf8dc2e
Merge: 9331783 9efe359
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:39:12 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:39:12 2013 -0400

Merge topic 'cleanups'

9efe359 Add some spaces to the INCLUDE_DIRECTORIES documentation.
db15713 Remove unused cmAddDefinitionsCommand::ParseDefinition method.


---

Summary of changes:
 Source/cmAddDefinitionsCommand.h |2 --
 Source/cmMakefile.cxx|   12 ++--
 2 files changed, 6 insertions(+), 8 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, master, updated. v2.8.11-291-g9331783

[Brad King]

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

The branch, master has been updated
   via  93317839b0aa7b47e37aad96ef3e0d4cfea236ba (commit)
   via  a984f3257e95f29a72da6566859d4c6a8a5d749b (commit)
  from  ff8917fdd2e8739a46c84ab03911258c23779744 (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=93317839b0aa7b47e37aad96ef3e0d4cfea236ba
commit 93317839b0aa7b47e37aad96ef3e0d4cfea236ba
Merge: ff8917f a984f32
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:39:05 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:39:05 2013 -0400

Merge topic 'add_compile_options-command'

a984f32 Introduce add_compile_options command.

diff --cc Source/cmTarget.cxx
index ab051d0,eb1e3b2..7d25b91
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -1640,11 -1611,15 +1640,19 @@@ void cmTarget::SetMakefile(cmMakefile* 
  {
  this-InsertInclude(*it);
  }
+   const std::vectorcmValueWithOrigin parentOptions =
+   this-Makefile-GetCompileOptionsEntries();
+ 
+   for (std::vectorcmValueWithOrigin::const_iterator it
+   = parentOptions.begin(); it != parentOptions.end(); ++it)
+ {
+ this-InsertCompileOption(*it);
+ }
  
 +  this-SetPropertyDefault(C_VISIBILITY_PRESET, 0);
 +  this-SetPropertyDefault(CXX_VISIBILITY_PRESET, 0);
 +  this-SetPropertyDefault(VISIBILITY_INLINES_HIDDEN, 0);
 +
if(this-TargetTypeValue == cmTarget::SHARED_LIBRARY
|| this-TargetTypeValue == cmTarget::MODULE_LIBRARY)
  {

---

Summary of changes:
 ...sCommand.cxx = cmAddCompileOptionsCommand.cxx} |   11 +--
 ...ptionCommand.h = cmAddCompileOptionsCommand.h} |   46 +++-
 Source/cmCommands.cxx  |2 +
 Source/cmMakefile.cxx  |   60 
 Source/cmMakefile.h|6 ++
 Source/cmTarget.cxx|   10 +++-
 .../add_compile_options/CMakeLists.txt |   14 +
 Tests/CMakeCommands/add_compile_options/main.cpp   |   11 
 8 files changed, 126 insertions(+), 34 deletions(-)
 copy Source/{cmAddDefinitionsCommand.cxx = cmAddCompileOptionsCommand.cxx} 
(75%)
 copy Source/{cmOptionCommand.h = cmAddCompileOptionsCommand.h} (52%)
 create mode 100644 Tests/CMakeCommands/add_compile_options/CMakeLists.txt
 create mode 100644 Tests/CMakeCommands/add_compile_options/main.cpp


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, master, updated. v2.8.11-298-gbf57982

[Brad King]

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

The branch, master has been updated
   via  bf57982f7b52b8ed7a3da4099442d6cda36280bb (commit)
   via  b62d440ea8cf16e1eab3d8fec5f36abdee0f4bab (commit)
  from  21b10265419800942ed0806f0e0f5cf6da260bad (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=bf57982f7b52b8ed7a3da4099442d6cda36280bb
commit bf57982f7b52b8ed7a3da4099442d6cda36280bb
Merge: 21b1026 b62d440
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:39:27 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:39:27 2013 -0400

Merge topic 'doc-CMAKE_PARENT_LIST_FILE'

b62d440 Docs: Clarify CMAKE_PARENT_LIST_FILE (#14194)


---

Summary of changes:
 Source/cmDocumentVariables.cxx |   11 ++-
 1 files changed, 6 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, master, updated. v2.8.11-303-gc02f01b

[Brad King]

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

The branch, master has been updated
   via  c02f01b0397dc39346d1d07dd03c4515590482b3 (commit)
   via  d26800bc40a103d90366da176ad68ed92f21daab (commit)
  from  31a02203977fdbb518bf796ceb1f9170046456dd (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=c02f01b0397dc39346d1d07dd03c4515590482b3
commit c02f01b0397dc39346d1d07dd03c4515590482b3
Merge: 31a0220 d26800b
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:39:48 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:39:48 2013 -0400

Merge topic 'fix-path-root-dot-dot'

d26800b get_filename_component: Test ABSOLUTE of .. after root component


---

Summary of changes:
 .../get_filename_component/KnownComponents.cmake   |5 +
 1 files changed, 5 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, master, updated. v2.8.11-301-g31a0220

[Brad King]

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

The branch, master has been updated
   via  31a02203977fdbb518bf796ceb1f9170046456dd (commit)
   via  c91e88d0e15f38616284f12fc0f2152ac6c0562c (commit)
   via  6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b (commit)
  from  bf57982f7b52b8ed7a3da4099442d6cda36280bb (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=31a02203977fdbb518bf796ceb1f9170046456dd
commit 31a02203977fdbb518bf796ceb1f9170046456dd
Merge: bf57982 c91e88d
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:39:41 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:39:41 2013 -0400

Merge topic 'update-kwsys'

c91e88d Merge branch 'upstream-kwsys' into update-kwsys
6dc3dd9 KWSys 2013-06-03 (d79a792e)


---

Summary of changes:
 Source/kwsys/SystemTools.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, master, updated. v2.8.11-296-g21b1026

[Brad King]

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

The branch, master has been updated
   via  21b10265419800942ed0806f0e0f5cf6da260bad (commit)
   via  273ecab96d47d6ddba129be6200bc93ba7910b8c (commit)
  from  2cd8a6a3c6d505674e113345c58edfb19bf8dc2e (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=21b10265419800942ed0806f0e0f5cf6da260bad
commit 21b10265419800942ed0806f0e0f5cf6da260bad
Merge: 2cd8a6a 273ecab
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:39:18 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:39:18 2013 -0400

Merge topic 'suppress-unused-cli-with-value-in-cache'

273ecab CLI: Suppress the unused warning if the key value pair is cached.


---

Summary of changes:
 Source/cmCacheManager.cxx  |4 +++
 Source/cmake.cxx   |   13 -
 Tests/CMakeLists.txt   |   28 
 Tests/WarnUnusedCliUnused/CMakeLists.txt   |9 ++
 .../empty.cpp  |0
 5 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 Tests/WarnUnusedCliUnused/CMakeLists.txt
 copy Tests/{IncludeDirectories/TargetIncludeDirectories = 
WarnUnusedCliUnused}/empty.cpp (100%)


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, master, updated. v2.8.11-289-gff8917f

[Brad King]

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

The branch, master has been updated
   via  ff8917fdd2e8739a46c84ab03911258c23779744 (commit)
   via  cd1fa537a03377974a4d0a27e592785f931a41e5 (commit)
   via  0e9f4bc00c6b26f254e74063e4026ac33b786513 (commit)
  from  4d15c0b7c6f11c7486da7e760c59a1e7daabacab (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=ff8917fdd2e8739a46c84ab03911258c23779744
commit ff8917fdd2e8739a46c84ab03911258c23779744
Merge: 4d15c0b cd1fa53
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:38:59 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:38:59 2013 -0400

Merge topic 'VISIBILITY_PRESET-property'

cd1fa53 Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target 
property.
0e9f4bc Introduce target property LANG_VISIBILITY_PRESET

diff --cc Source/cmNinjaTargetGenerator.cxx
index 6f912b8,778f86a..ae18a48
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@@ -150,10 -150,13 +150,13 @@@ cmNinjaTargetGenerator::ComputeFlagsFor
  language.c_str(),
  this-GetConfigName());
  
+   this-LocalGenerator-AddVisibilityPresetFlags(flags, this-Target,
+  language.c_str());
+ 
// Add include directory flags.
 +  const char *config = this-Makefile-GetDefinition(CMAKE_BUILD_TYPE);
{
std::vectorstd::string includes;
 -  const char *config = this-Makefile-GetDefinition(CMAKE_BUILD_TYPE);
this-LocalGenerator-GetIncludeDirectories(includes,
this-GeneratorTarget,
language.c_str(), config);

---

Summary of changes:
 Modules/Compiler/Clang-CXX.cmake   |2 +
 Modules/Compiler/Clang.cmake   |1 +
 Modules/Compiler/GNU-CXX.cmake |   10 +++
 Modules/Compiler/GNU.cmake |3 +
 Modules/Compiler/Intel-C.cmake |4 +
 Modules/Compiler/Intel-CXX.cmake   |4 +
 Source/cmGlobalXCodeGenerator.cxx  |3 +
 Source/cmLocalGenerator.cxx|   75 
 Source/cmLocalGenerator.h  |2 +
 Source/cmMakefileTargetGenerator.cxx   |3 +
 Source/cmNinjaTargetGenerator.cxx  |3 +
 Source/cmTarget.cxx|   33 +
 Tests/Module/GenerateExportHeader/CMakeLists.txt   |2 +
 .../visibility_preset/CMakeLists.txt   |   17 +
 .../visibility_preset/main.cpp |9 +++
 .../visibility_preset/visibility_preset.cpp|7 ++
 .../visibility_preset/visibility_preset.h  |   13 
 Tests/RunCMake/CMakeLists.txt  |   16 
 .../CMakeLists.txt |0
 .../PropertyTypo-result.txt}   |0
 .../VisibilityPreset/PropertyTypo-stderr.txt   |1 +
 Tests/RunCMake/VisibilityPreset/PropertyTypo.cmake |3 +
 Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake |3 +
 .../foo.c = RunCMake/VisibilityPreset/lib.cpp}|3 +-
 24 files changed, 216 insertions(+), 1 deletions(-)
 create mode 100644 
Tests/Module/GenerateExportHeader/visibility_preset/CMakeLists.txt
 create mode 100644 Tests/Module/GenerateExportHeader/visibility_preset/main.cpp
 create mode 100644 
Tests/Module/GenerateExportHeader/visibility_preset/visibility_preset.cpp
 create mode 100644 
Tests/Module/GenerateExportHeader/visibility_preset/visibility_preset.h
 copy Tests/RunCMake/{PositionIndependentCode = 
VisibilityPreset}/CMakeLists.txt (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt = 
VisibilityPreset/PropertyTypo-result.txt} (100%)
 create mode 100644 Tests/RunCMake/VisibilityPreset/PropertyTypo-stderr.txt
 create mode 100644 Tests/RunCMake/VisibilityPreset/PropertyTypo.cmake
 create mode 100644 Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake
 copy Tests/{SourceGroups/sub1/foo.c = RunCMake/VisibilityPreset/lib.cpp} (56%)


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-2537-g31b189d

[Brad King]

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  31b189d2a89992ba01e90043d6383e54e4156ba7 (commit)
   via  aa025cc60a56da31dfe8461faec0dc3aa517cc10 (commit)
   via  c02f01b0397dc39346d1d07dd03c4515590482b3 (commit)
   via  31a02203977fdbb518bf796ceb1f9170046456dd (commit)
   via  bf57982f7b52b8ed7a3da4099442d6cda36280bb (commit)
   via  21b10265419800942ed0806f0e0f5cf6da260bad (commit)
   via  2cd8a6a3c6d505674e113345c58edfb19bf8dc2e (commit)
   via  93317839b0aa7b47e37aad96ef3e0d4cfea236ba (commit)
   via  ff8917fdd2e8739a46c84ab03911258c23779744 (commit)
  from  f7ef08ef7c24385595fd652bc83dac3b41e87683 (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=31b189d2a89992ba01e90043d6383e54e4156ba7
commit 31b189d2a89992ba01e90043d6383e54e4156ba7
Merge: f7ef08e aa025cc
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:38:17 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 5 09:38:17 2013 -0400

Merge branch 'master' into next


---

Summary of changes:


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, master, updated. v2.8.11-307-gd3c8688

[Brad King]

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

The branch, master has been updated
   via  d3c8688ecdcdcea89373af2d6a30c4ba66315465 (commit)
   via  5b222354de7060af409d0d80aa06180ed1b3ac64 (commit)
  from  aa025cc60a56da31dfe8461faec0dc3aa517cc10 (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=d3c8688ecdcdcea89373af2d6a30c4ba66315465
commit d3c8688ecdcdcea89373af2d6a30c4ba66315465
Merge: aa025cc 5b22235
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:54:20 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:54:20 2013 -0400

Merge topic 'fix-genex-HEAD-target'

5b22235 Genex: Fix the HEAD target used for evaluated expressions

diff --cc Source/cmGeneratorExpressionEvaluator.cxx
index 5e7d00d,a01a0f8..28f749d
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@@ -723,12 -538,9 +724,14 @@@ static const struct TargetPropertyNode 
{
interfacePropertyName = INTERFACE_COMPILE_DEFINITIONS;
}
 +else if (propertyName == INTERFACE_COMPILE_OPTIONS
 +|| propertyName == COMPILE_OPTIONS)
 +  {
 +  interfacePropertyName = INTERFACE_COMPILE_OPTIONS;
 +  }
  
+ cmTarget *headTarget = context-HeadTarget ? context-HeadTarget : target;
+ 
  const char **transBegin = targetPropertyTransitiveWhitelist;
  const char **transEnd = targetPropertyTransitiveWhitelist
+ (sizeof(targetPropertyTransitiveWhitelist) /
diff --cc Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 088725b,bcfbe3c..6919261
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@@ -109,26 -109,12 +109,31 @@@ set_property(TARGET libbad APPEND PROPE
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/bad
  )
  
+ add_library(lib6 SHARED other.cpp)
+ add_library(lib7 SHARED other.cpp)
+ target_link_libraries(lib7 
$$STREQUAL:$TARGET_PROPERTY:TYPE,EXECUTABLE:lib6)
+ target_include_directories(lib7 PUBLIC 
$$STREQUAL:$TARGET_PROPERTY:TYPE,EXECUTABLE:/lib7/include)
+ add_custom_target(head_target_test some_bogus_custom_tool 
\$TARGET_PROPERTY:lib7,INCLUDE_DIRECTORIES$TARGET_PROPERTY:lib7,INTERFACE_INCLUDE_DIRECTORIES\)
  
 +add_library(includes_source_good empty.cpp)
 +target_include_directories(includes_source_good
 +  INTERFACE
 +${CMAKE_CURRENT_BINARY_DIR}/good
 +${CMAKE_CURRENT_BINARY_DIR}/othergood/
 +)
 +add_library(includes_source_bad empty.cpp)
 +target_include_directories(includes_source_bad
 +  INTERFACE
 +${CMAKE_CURRENT_BINARY_DIR}/bad
 +)
 +
 +add_library(includes_proxy SHARED empty.cpp)
 +target_link_libraries(includes_proxy includes_source_good)
 +target_link_libraries(includes_proxy LINK_INTERFACE_LIBRARIES 
includes_source_bad)
 +add_executable(copy_includes copy_includes.cpp)
 +target_include_directories(copy_includes PRIVATE 
$TARGET_PROPERTY:includes_proxy,INCLUDE_DIRECTORIES)
 +
 +
  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp #include \common.h\\n)
  add_library(lib5 ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp)
  

---

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx  |   13 +
 .../TargetIncludeDirectories/CMakeLists.txt|5 +
 .../{empty.cpp = other.cpp}   |3 +--
 3 files changed, 15 insertions(+), 6 deletions(-)
 copy Tests/IncludeDirectories/TargetIncludeDirectories/{empty.cpp = 
other.cpp} (76%)


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, master, updated. v2.8.11-305-gaa025cc

[Brad King]

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

The branch, master has been updated
   via  aa025cc60a56da31dfe8461faec0dc3aa517cc10 (commit)
   via  21a0beacc1d8c452f13453b22f36c91fbbd0a182 (commit)
  from  c02f01b0397dc39346d1d07dd03c4515590482b3 (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=aa025cc60a56da31dfe8461faec0dc3aa517cc10
commit aa025cc60a56da31dfe8461faec0dc3aa517cc10
Merge: c02f01b 21a0bea
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:39:52 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 5 09:39:52 2013 -0400

Merge topic 'xcode-framework-paths'

21a0bea Xcode: Fix framework search paths in STATIC library targets (#14191)


---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |   18 +++---
 1 files changed, 7 insertions(+), 11 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-2556-ga87bb90

[Brad King]

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  a87bb9050cef6332464efbf44fa7a24ffce80dbc (commit)
   via  1a882c7a26e26e91e7e9d3473c1ac2f5b12b1a1c (commit)
   via  c479a06d80bd4b4eecb0923fc7cafcd5a82b3dbc (commit)
   via  14779f87d2b09631988e31aa956feac3425d74f3 (commit)
   via  c628fbc40df01739df9b8134719ee7014897e84e (commit)
   via  4b9188825a0c61ce370855d2ce42da97dc7b9a7f (commit)
   via  e31caa69b9104d350ff89a9eecf6f9548c477b95 (commit)
   via  8e23c0bd6882d51b9a080fc0a4f194cf89f30fbe (commit)
   via  49cc8f44b35cee7ec6b68026da0d6b7dea60c135 (commit)
   via  498633bc109e061c1179c00448231a7a0953b5a7 (commit)
   via  293f53882ee103645dad14ecd2dfa47a6e448395 (commit)
   via  189cd28236ef8fd9eb0be3efe2f9e816df389479 (commit)
   via  1ba508865e3fdd034ca08a954e217aa2e04b2121 (commit)
   via  8f26ed43b1873021aeddf211357ac87f981248f5 (commit)
   via  aad04efe5eb483462d118cae8b76e64795a53810 (commit)
  from  feba0b9f7667f7307b8842fe50b50553ac4fce75 (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=a87bb9050cef6332464efbf44fa7a24ffce80dbc
commit a87bb9050cef6332464efbf44fa7a24ffce80dbc
Merge: feba0b9 1a882c7
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 6 09:54:31 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jun 6 09:54:31 2013 -0400

Merge topic 'test-release' into next

1a882c7 Merge branch 'release' into test-release
c479a06 CMake 2.8.11.1
14779f8 Merge branch 'fix-genex-HEAD-target' into release
c628fbc Merge branch 'xcode-framework-paths' into release
4b91888 Merge branch 'fix-include_directories-whitespace-handling' into 
release
e31caa6 Merge branch 'fix-qt4_use_modules-QtAx' into release
8e23c0b Merge branch 'find-Qt4-granular-modules' into release
49cc8f4 Merge branch 'escape-regex-specials-in-path' into release
498633b Merge branch 'FindBoost-normalize-slashes' into release
293f538 Merge branch 'ExternalData-no-re-stage' into release
189cd28 Merge branch 'test-INCLUDE_DIRECTORIES-genex-read' into release
1ba5088 Merge branch 'fix-INCLUDE_DIRECTORIES-genex-read' into release
8f26ed4 Merge branch 'fix-try_compile-library-spaces' into release
aad04ef Merge branch 'fix-FileIsDirectory-SEGV' into release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a882c7a26e26e91e7e9d3473c1ac2f5b12b1a1c
commit 1a882c7a26e26e91e7e9d3473c1ac2f5b12b1a1c
Merge: d3c8688 c479a06
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:53:34 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 5 09:53:34 2013 -0400

Merge branch 'release' into test-release


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c479a06d80bd4b4eecb0923fc7cafcd5a82b3dbc
commit c479a06d80bd4b4eecb0923fc7cafcd5a82b3dbc
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 5 09:47:09 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 5 09:47:09 2013 -0400

CMake 2.8.11.1

diff --git a/ChangeLog.manual b/ChangeLog.manual
index a0da0d5..ff3074d 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,3 +1,26 @@
+Changes in CMake 2.8.11.1 (since 2.8.11)
+
+Brad King (5):
+  ExternalData: Do not re-stage staged object files
+  try_compile: Fix quoting of libraries in generated CMakeLists.txt
+  KWSys: Fix SystemTools::FileIsDirectory with long paths (#14176)
+  FindBoost: Fix handling of \ in input paths (#14179)
+  Xcode: Fix framework search paths in STATIC library targets (#14191)
+
+Modestas Vainius (1):
+  Fix test failures caused by regexp-sensitive characters in the build 
paths
+
+Stephen Kelly (9):
+  include_directories: Fix handling of empty or space-only entries
+  try_compile: Trim whitespace from LINK_LIBRARIES entries
+  cmTarget: Remove some hardcoding of transitive property names.
+  GenexEval: Extract a getLinkedTargetsContent from TargetPropertyNode.
+  GenexEval: Fix evaluation of INCLUDE_DIRECTORIES target property.
+  GenexEval: Test evaluation of INCLUDE_DIRECTORIES target property.
+  FindQt4: Don't fail if certain Qt modules are unavailable.
+  Qt4Macros: Handle Qt ActiveX libraries in qt4_use_modules.
+  Genex: Fix the HEAD target used for evaluated expressions
+
 Changes in CMake 2.8.11 (since 2.8.11-rc4)
 
 None
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index f2792d6..34946af 100644
--- a/Source/CMakeVersion.cmake

[Cmake-commits] CMake branch, next, updated. v2.8.11-2577-gd34fa22

[Brad King]

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  d34fa228e33f37f20797c04d36f034d88c97e0f9 (commit)
   via  482f1122ad5db4c51b26a6e943b4bb5ef3d800cc (commit)
  from  49179c55de27ef3bd08b252b782f0a13971ee529 (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=d34fa228e33f37f20797c04d36f034d88c97e0f9
commit d34fa228e33f37f20797c04d36f034d88c97e0f9
Merge: 49179c5 482f112
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 6 14:39:50 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jun 6 14:39:50 2013 -0400

Merge topic 'add-try_compile-options' into next

482f112 try_compile: Add signature to allow multiple SOURCES


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=482f1122ad5db4c51b26a6e943b4bb5ef3d800cc
commit 482f1122ad5db4c51b26a6e943b4bb5ef3d800cc
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 6 13:54:44 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jun 6 14:35:20 2013 -0400

try_compile: Add signature to allow multiple SOURCES

Extend the signature

 try_compile(RESULT_VAR bindir srcfile ...)

to allow multiple sources as

 try_compile(RESULT_VAR bindir SOURCES srcfile... ...)

Process the sources to generate a CMakeLists.txt that enables all needed
languages.

Teach the TryCompile test to try cases with two sources of the same
language and of mixed languages.  Teach RunCMake.try_compile to cover
error cases for the signature.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index bf28428..b43a7a7 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -38,10 +38,13 @@ int 
cmCoreTryCompile::TryCompileCode(std::vectorstd::string const argv)
   char targetNameBuf[64];
   bool didOutputVariable = false;
   bool didCopyFile = false;
+  bool useSources = argv[2] == SOURCES;
+  std::vectorstd::string sources;
 
   enum Doing { DoingNone, DoingCMakeFlags, DoingCompileDefinitions,
-   DoingLinkLibraries, DoingOutputVariable, DoingCopyFile };
-  Doing doing = DoingNone;
+   DoingLinkLibraries, DoingOutputVariable, DoingCopyFile,
+   DoingSources };
+  Doing doing = useSources? DoingSources : DoingNone;
   for(size_t i=3; i  argv.size(); ++i)
 {
 if(argv[i] == CMAKE_FLAGS)
@@ -118,6 +121,10 @@ int 
cmCoreTryCompile::TryCompileCode(std::vectorstd::string const argv)
   copyFile = argv[i].c_str();
   doing = DoingNone;
   }
+else if(doing == DoingSources)
+  {
+  sources.push_back(argv[i]);
+  }
 else if(i == 3)
   {
   this-SrcFileSignature = false;
@@ -149,6 +156,13 @@ int 
cmCoreTryCompile::TryCompileCode(std::vectorstd::string const argv)
 return -1;
 }
 
+  if(useSources  sources.empty())
+{
+this-Makefile-IssueMessage(cmake::FATAL_ERROR,
+  SOURCES must be followed by at least one source file);
+return -1;
+}
+
   // compute the binary dir when TRY_COMPILE is called with a src file
   // signature
   if (this-SrcFileSignature)
@@ -193,6 +207,44 @@ int 
cmCoreTryCompile::TryCompileCode(std::vectorstd::string const argv)
 std::string ccFile = this-BinaryDirectory + /CMakeCache.txt;
 cmSystemTools::RemoveFile(ccFile.c_str());
 
+// Choose sources.
+if(!useSources)
+  {
+  sources.push_back(argv[2]);
+  }
+
+// Detect languages to enable.
+cmGlobalGenerator* gg =
+  this-Makefile-GetCMakeInstance()-GetGlobalGenerator();
+std::setstd::string testLangs;
+for(std::vectorstd::string::iterator si = sources.begin();
+si != sources.end(); ++si)
+  {
+  std::string ext = cmSystemTools::GetFilenameLastExtension(*si);
+  if(const char* lang = gg-GetLanguageFromExtension(ext.c_str()))
+{
+testLangs.insert(lang);
+}
+  else
+{
+cmOStringStream err;
+err  Unknown extension \  ext  \ for file\n
+ *si  \n
+ try_compile() works only for enabled languages.  
+ Currently these are:\n ;
+std::vectorstd::string langs;
+gg-GetEnabledLanguages(langs);
+for(std::vectorstd::string::iterator l = langs.begin();
+l != langs.end(); ++l)
+  {
+  err *l;
+  }
+err  \nSee project() command to enable other languages.;
+this-Makefile-IssueMessage(cmake::FATAL_ERROR, err.str());
+return -1;
+}
+  }
+
 // we need to create a directory and CMakeLists file etc...
 // first

[Cmake-commits] CMake annotated tag, v2.8.11.1, created. v2.8.11.1

[Brad King]

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 annotated tag, v2.8.11.1 has been created
at  fcca05ebcdeb8ff0fd657b7d0da6a5ba822ef578 (tag)
   tagging  c479a06d80bd4b4eecb0923fc7cafcd5a82b3dbc (commit)
  replaces  v2.8.11
 tagged by  Brad King
on  Fri Jun 7 14:57:44 2013 -0400

- Log -
CMake 2.8.11.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRsi0uAAoJEOyP7zp7+07a7HIP/33Jen3wNGLW4a99qJ1Zztro
0VJfLXd/r1bUxbGp7kpNsXCBIkBRmeqWQLFlc7zGhsqqGEw918CKTbmbSMiH4WzP
tLuJwZ5jiEftzVW4AARJ/SfwhHzpsc4gaJxD93OiwGeolrZrTXyLyaKiH8PPLaMY
m5Jav9iTfVYvBicua0ll38V7MVxGP1MfqPY3vjL//uVMbAp8kUmLiNkCQtIUdt0h
B78858TpJbiO8kqFg3JTGikRfgxwi0wy1VXy1QtnZaqAWOx2QM32SSoMJuyr65UH
zplZtVHim3bB5ojxdEkBazlWNjSsVi0fbwgM998QJJseHXzznGjDu0OncOdJ0KYM
idUpD2FdejusleyEicBlDyG8dlbnnjVRepztQfGASrJxRqHlaVhz/yu4wyh61zcP
RfLKxhzaC9804BSs5wnk/su+caVE23HAhg9RVcK8L3JUyDJnTkeutkHRyi8Zdum8
obS3lPOZ/GNpMKBjvJh1EhVXUgBVz8f6JUbo5Fr+dqq67T7CBwWbxqX8hD8uTa6U
E0y0qVsQRxGXqcmP5kiU9Oh3/aYNskXbRJbDhRKovJ7UhfRz+Lx15XWQOFwWG4lb
Ov+w6eF5FvLqQlAKRLmYFARRqENAzF4tDc4dWQxTxTecvxXPQ+d1cFf2f46zAZLg
R/5WZ3RL7tyCEDji7myN
=Q4ae
-END PGP SIGNATURE-

Brad King (18):
  ExternalData: Do not re-stage staged object files
  try_compile: Fix quoting of libraries in generated CMakeLists.txt
  KWSys: Fix SystemTools::FileIsDirectory with long paths (#14176)
  FindBoost: Fix handling of \ in input paths (#14179)
  Merge branch 'fix-FileIsDirectory-SEGV' into release
  Merge branch 'fix-try_compile-library-spaces' into release
  Merge branch 'fix-INCLUDE_DIRECTORIES-genex-read' into release
  Merge branch 'test-INCLUDE_DIRECTORIES-genex-read' into release
  Merge branch 'ExternalData-no-re-stage' into release
  Merge branch 'FindBoost-normalize-slashes' into release
  Merge branch 'escape-regex-specials-in-path' into release
  Merge branch 'find-Qt4-granular-modules' into release
  Merge branch 'fix-qt4_use_modules-QtAx' into release
  Xcode: Fix framework search paths in STATIC library targets (#14191)
  Merge branch 'fix-include_directories-whitespace-handling' into release
  Merge branch 'xcode-framework-paths' into release
  Merge branch 'fix-genex-HEAD-target' into release
  CMake 2.8.11.1

Modestas Vainius (1):
  Fix test failures caused by regexp-sensitive characters in the build paths

Stephen Kelly (9):
  include_directories: Fix handling of empty or space-only entries
  try_compile: Trim whitespace from LINK_LIBRARIES entries
  cmTarget: Remove some hardcoding of transitive property names.
  GenexEval: Extract a getLinkedTargetsContent from TargetPropertyNode.
  GenexEval: Fix evaluation of INCLUDE_DIRECTORIES target property.
  GenexEval: Test evaluation of INCLUDE_DIRECTORIES target property.
  FindQt4: Don't fail if certain Qt modules are unavailable.
  Qt4Macros: Handle Qt ActiveX libraries in qt4_use_modules.
  Genex: Fix the HEAD target used for evaluated expressions

---


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, master, updated. v2.8.11.1-298-g30fd0b2

[Brad King]

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

The branch, master has been updated
   via  30fd0b2d38102af3d09c11d997467530d6df530b (commit)
   via  c479a06d80bd4b4eecb0923fc7cafcd5a82b3dbc (commit)
   via  14779f87d2b09631988e31aa956feac3425d74f3 (commit)
   via  c628fbc40df01739df9b8134719ee7014897e84e (commit)
   via  4b9188825a0c61ce370855d2ce42da97dc7b9a7f (commit)
   via  e31caa69b9104d350ff89a9eecf6f9548c477b95 (commit)
   via  8e23c0bd6882d51b9a080fc0a4f194cf89f30fbe (commit)
   via  49cc8f44b35cee7ec6b68026da0d6b7dea60c135 (commit)
   via  498633bc109e061c1179c00448231a7a0953b5a7 (commit)
   via  293f53882ee103645dad14ecd2dfa47a6e448395 (commit)
   via  189cd28236ef8fd9eb0be3efe2f9e816df389479 (commit)
   via  1ba508865e3fdd034ca08a954e217aa2e04b2121 (commit)
   via  8f26ed43b1873021aeddf211357ac87f981248f5 (commit)
   via  aad04efe5eb483462d118cae8b76e64795a53810 (commit)
  from  9ac601618ef93ac4c5c6805fe3bb7d19a56bf5a6 (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=30fd0b2d38102af3d09c11d997467530d6df530b
commit 30fd0b2d38102af3d09c11d997467530d6df530b
Merge: 9ac6016 c479a06
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 10 11:23:36 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 10 11:23:36 2013 -0400

Merge branch 'release'


---

Summary of changes:
 ChangeLog.manual |   23 +++
 1 files changed, 23 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, maint, updated. v2.8.11.1

[Brad King]

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, maint has been updated
   via  c479a06d80bd4b4eecb0923fc7cafcd5a82b3dbc (commit)
   via  14779f87d2b09631988e31aa956feac3425d74f3 (commit)
   via  c628fbc40df01739df9b8134719ee7014897e84e (commit)
   via  4b9188825a0c61ce370855d2ce42da97dc7b9a7f (commit)
   via  5b222354de7060af409d0d80aa06180ed1b3ac64 (commit)
   via  21a0beacc1d8c452f13453b22f36c91fbbd0a182 (commit)
   via  e31caa69b9104d350ff89a9eecf6f9548c477b95 (commit)
   via  8e23c0bd6882d51b9a080fc0a4f194cf89f30fbe (commit)
   via  49cc8f44b35cee7ec6b68026da0d6b7dea60c135 (commit)
   via  c9b75dcd734e2dd09eadbd9b16a6497bae95941c (commit)
   via  ce0c4802c02c98fffd66fe42944d255a0e7da026 (commit)
   via  b8af46cb878551cc5a1c9275f46792b282479ebb (commit)
   via  498633bc109e061c1179c00448231a7a0953b5a7 (commit)
   via  293f53882ee103645dad14ecd2dfa47a6e448395 (commit)
   via  189cd28236ef8fd9eb0be3efe2f9e816df389479 (commit)
   via  1ba508865e3fdd034ca08a954e217aa2e04b2121 (commit)
   via  8f26ed43b1873021aeddf211357ac87f981248f5 (commit)
   via  aad04efe5eb483462d118cae8b76e64795a53810 (commit)
   via  363825cd55595b7de62fcf610836f6156a9f1a31 (commit)
   via  07f9e157b61a419c04e31589c82eb284654a2b4e (commit)
   via  3aa9ce441f010362e404e6f9126ecd3028de76b9 (commit)
   via  0b39fefeac550c8277ebde308fcb9198e43e46a7 (commit)
   via  53164ac997f6ce2a4fd1245956a815bfdb893c27 (commit)
   via  e5375442ff20fde45e70de318c5aa2f1e4bb190a (commit)
   via  045d6ae0b042d4e6e3c4540c32559c58cb4153b0 (commit)
   via  b8cc6f4eba0b7349de81a48aea18a43f99e78ca5 (commit)
   via  e65ef08bf2719ffd1cc4226f9594ff7127ad8b5e (commit)
   via  c35961b010da87492a60afb6e5dd7436ea36ed8b (commit)
  from  0ad0c37206fce114c4e4c31f5270b53e181ab3c2 (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 -
---

Summary of changes:
 ChangeLog.manual   |   23 
 Modules/ExternalData.cmake |5 +-
 Modules/FindBoost.cmake|   12 ++-
 Modules/FindQt4.cmake  |   54 ++---
 Modules/Qt4Macros.cmake|   24 +++--
 Source/CMakeVersion.cmake  |2 +-
 Source/cmCoreTryCompile.cxx|2 +-
 Source/cmGeneratorExpressionEvaluator.cxx  |  123 +--
 Source/cmGlobalXCodeGenerator.cxx  |   18 +--
 Source/cmIncludeDirectoryCommand.cxx   |   15 ++-
 Source/kwsys/SystemTools.cxx   |   17 ++-
 Tests/CMakeLists.txt   |5 +-
 Tests/CMakeTests/GetPropertyTest.cmake.in  |   29 +++--
 Tests/CMakeTests/IfTest.cmake.in   |5 +-
 Tests/CMakeTests/ListTest.cmake.in |   21 ++--
 Tests/CMakeTests/WhileTest.cmake.in|   14 ++-
 Tests/CTestTestMemcheck/CMakeLists.txt |   10 +-
 Tests/IncludeDirectories/CMakeLists.txt|   11 ++
 .../TargetIncludeDirectories/CMakeLists.txt|   24 
 .../TargetIncludeDirectories/copy_includes.cpp}|5 +-
 .../TargetIncludeDirectories/empty.cpp}|4 +-
 .../TargetIncludeDirectories/other.cpp}|5 +-
 .../bar.c = IncludeDirectories/empty.cpp} |5 +-
 Tests/RegexEscapeString.cmake  |4 +
 .../ExternalData/LinkDirectory1-stdout.txt |5 +
 Tests/RunCMake/ExternalData/LinkDirectory1.cmake   |   37 ++
 Tests/RunCMake/ExternalData/RunCMakeTest.cmake |1 +
 27 files changed, 344 insertions(+), 136 deletions(-)
 copy Tests/{Framework/bar.cxx = 
IncludeDirectories/TargetIncludeDirectories/copy_includes.cpp} (55%)
 copy Tests/{LibName/bar.c = 
IncludeDirectories/TargetIncludeDirectories/empty.cpp} (62%)
 copy Tests/{LibName/bar.c = 
IncludeDirectories/TargetIncludeDirectories/other.cpp} (63%)
 copy Tests/{LibName/bar.c = IncludeDirectories/empty.cpp} (62%)
 create mode 100644 Tests/RegexEscapeString.cmake
 create mode 100644 Tests/RunCMake/ExternalData/LinkDirectory1-stdout.txt
 create mode 100644 Tests/RunCMake/ExternalData/LinkDirectory1.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.11.1-2577-ge073444

[Brad King]

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  e073444545114bea24a0beded235b0a019ef1b84 (commit)
   via  30fd0b2d38102af3d09c11d997467530d6df530b (commit)
  from  ef0bfdb43ded98e7a2dbb9fa35e2f1a7a257123a (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=e073444545114bea24a0beded235b0a019ef1b84
commit e073444545114bea24a0beded235b0a019ef1b84
Merge: ef0bfdb 30fd0b2
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 10 11:26:43 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 10 11:26:43 2013 -0400

Merge branch 'master' into next


---

Summary of changes:


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-2614-ga0ba362

[Brad King]

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  a0ba36288a4ed0b0e3ebeb339bc8303d778b4225 (commit)
   via  b3b57e7a31446bf7b0e47c7508d34f34cb322a6a (commit)
  from  f9402d8b1596493374372ebf04a6c07620ae277f (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=a0ba36288a4ed0b0e3ebeb339bc8303d778b4225
commit a0ba36288a4ed0b0e3ebeb339bc8303d778b4225
Merge: f9402d8 b3b57e7
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 13 08:39:29 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jun 13 08:39:29 2013 -0400

Merge topic 'doc-enable_language-scope' into next

b3b57e7 enable_language: Clarify documentation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3b57e7a31446bf7b0e47c7508d34f34cb322a6a
commit b3b57e7a31446bf7b0e47c7508d34f34cb322a6a
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 12 10:25:43 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 12 10:58:32 2013 -0400

enable_language: Clarify documentation

Describe explicitly the scope in which enable_language must be
invoked to handle all direct and indirect uses of a language.

While at it, re-word documentation of the OPTIONAL keyword to
avoid confusion over its partial implementation.

diff --git a/Source/cmEnableLanguageCommand.h b/Source/cmEnableLanguageCommand.h
index ee963f9..747448b 100644
--- a/Source/cmEnableLanguageCommand.h
+++ b/Source/cmEnableLanguageCommand.h
@@ -59,18 +59,21 @@ public:
   virtual const char* GetFullDocumentation() const
 {
 return
-enable_language(languageName [OPTIONAL] )\n
+enable_language(lang [OPTIONAL] )\n
   This command enables support for the named language in CMake. 
   This is the same as the project command but does not create 
   any of the extra variables that are created by the project command. 
   Example languages are CXX, C, Fortran. 
-  If OPTIONAL is used, use the CMAKE_languageName_COMPILER_WORKS 
-  variable to check whether the language has been enabled successfully.
   \n
-  This command must be called on file scope (not inside a function) and 
-  the language enabled can only be used in the calling project or its 
-  subdirectories added by add_subdirectory(). Also note that at present, 
-  the OPTIONAL argument does not work.;
+  This command must be called in file scope, not in a function call.  
+  Furthermore, it must be called in the highest directory common to 
+  all targets using the named language directly for compiling sources 
+  or indirectly through link dependencies.  
+  It is simplest to enable all needed languages in the top-level 
+  directory of a project.
+  \n
+  The OPTIONAL keyword is a placeholder for future implementation 
+  and does not currently work.;
 }
 
   cmTypeMacro(cmEnableLanguageCommand, cmCommand);

---

Summary of changes:
 Source/cmEnableLanguageCommand.h |   17 ++---
 1 files changed, 10 insertions(+), 7 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-2616-g349ce84

[Brad King]

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  349ce8462282c2036b427aa3d790ff97955c861f (commit)
   via  75994d953e261b388aa31e4d8ecd8af9fe53142b (commit)
  from  a0ba36288a4ed0b0e3ebeb339bc8303d778b4225 (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=349ce8462282c2036b427aa3d790ff97955c861f
commit 349ce8462282c2036b427aa3d790ff97955c861f
Merge: a0ba362 75994d9
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 13 08:46:12 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jun 13 08:46:12 2013 -0400

Merge topic 'sha2-alignment' into next

75994d9 cmCryptoHash: Increase alignment of HashFile buffer


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75994d953e261b388aa31e4d8ecd8af9fe53142b
commit 75994d953e261b388aa31e4d8ecd8af9fe53142b
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 10 16:52:16 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jun 13 08:40:10 2013 -0400

cmCryptoHash: Increase alignment of HashFile buffer

The SHA512_Update implementation accesses input data via 64-bit
integers.  This requires alignment of the input buffer on some
architectures.  Align our stack-allocated buffer for file content to
satisfy this requirement.

diff --git a/Source/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx
index a1505bd..a4f6ac4 100644
--- a/Source/cmCryptoHash.cxx
+++ b/Source/cmCryptoHash.cxx
@@ -54,8 +54,8 @@ std::string cmCryptoHash::HashFile(const char* file)
   this-Initialize();
 
   // Should be efficient enough on most system:
-  const int bufferSize = 4096;
-  char buffer[bufferSize];
+  cm_sha2_uint64_t buffer[512];
+  char* buffer_c = reinterpret_castchar*(buffer);
   unsigned char const* buffer_uc =
 reinterpret_castunsigned char const*(buffer);
   // This copy loop is very sensitive on certain platforms with
@@ -65,7 +65,7 @@ std::string cmCryptoHash::HashFile(const char* file)
   // error occurred.  Therefore, the loop should be safe everywhere.
   while(fin)
 {
-fin.read(buffer, bufferSize);
+fin.read(buffer_c, sizeof(buffer));
 if(int gcount = static_castint(fin.gcount()))
   {
   this-Append(buffer_uc, gcount);

---

Summary of changes:
 Source/cmCryptoHash.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-2619-gc043669

[Brad King]

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  c0436698786f2c196ed2849a6904d269b51db5f9 (commit)
   via  cfe6300a41392b79d95774c2778d33a55deaed48 (commit)
   via  82771f186220b45a9aaf10ed416f1df135e56c36 (commit)
  from  349ce8462282c2036b427aa3d790ff97955c861f (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=c0436698786f2c196ed2849a6904d269b51db5f9
commit c0436698786f2c196ed2849a6904d269b51db5f9
Merge: 349ce84 cfe6300
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 08:15:55 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 08:15:55 2013 -0400

Merge topic 'vs-TargetFrameworkVersion' into next

cfe6300 VS: Add support for .NET target framework version
82771f1 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfe6300a41392b79d95774c2778d33a55deaed48
commit cfe6300a41392b79d95774c2778d33a55deaed48
Author: Christian Maaser christian.maa...@thalesgroup.com
AuthorDate: Fri Jun 14 07:28:00 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jun 14 08:09:00 2013 -0400

VS: Add support for .NET target framework version

Teach CMake to generate the TargetFrameworkVersion XML node as
documented at

 http://msdn.microsoft.com/en-us/library/vstudio/ff770576.aspx

from target property VS_DOTNET_TARGET_FRAMEWORK_VERSION.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7d25b91..b14db43 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1403,6 +1403,11 @@ void cmTarget::DefineProperties(cmake *cm)
  Sets the \RootNamespace\ attribute for a generated Visual Studio 
  project.  The attribute will be generated only if this is set.);
   cm-DefineProperty
+(VS_DOTNET_TARGET_FRAMEWORK_VERSION, cmProperty::TARGET,
+ Specify the .NET target framework version.,
+ Used to specify the .NET target framework version for C++/CLI. 
+ For example, \v4.5\.);
+  cm-DefineProperty
 (VS_DOTNET_REFERENCES, cmProperty::TARGET,
  Visual Studio managed project .NET references,
  Adds one or more semicolon-delimited .NET references to a 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx 
b/Source/cmVisualStudio10TargetGenerator.cxx
index f8de3a8..2c9ec8e 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -280,6 +280,13 @@ void cmVisualStudio10TargetGenerator::Generate()
 }
   this-WriteString(ProjectName, 2);
   (*this-BuildFileStream)  projLabel  /ProjectName\n;
+  if(const char* targetFrameworkVersion = this-Target-GetProperty(
+   VS_DOTNET_TARGET_FRAMEWORK_VERSION))
+{
+this-WriteString(TargetFrameworkVersion, 2);
+(*this-BuildFileStream)  targetFrameworkVersion
+  /TargetFrameworkVersion\n;
+}
   this-WriteString(/PropertyGroup\n, 1);
   this-WriteString(Import Project=
 \$(VCTargetsPath)\\Microsoft.Cpp.Default.props\ /\n,

---

Summary of changes:
 Source/CMakeVersion.cmake  |2 +-
 Source/cmTarget.cxx|5 +
 Source/cmVisualStudio10TargetGenerator.cxx |7 +++
 3 files changed, 13 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-2621-g9022081

[Brad King]

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  902208172455e347099199f0382fb230bbdb593a (commit)
   via  dc03499595086ec190d55c59c8589c112362dbb6 (commit)
  from  c0436698786f2c196ed2849a6904d269b51db5f9 (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=902208172455e347099199f0382fb230bbdb593a
commit 902208172455e347099199f0382fb230bbdb593a
Merge: c043669 dc03499
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 08:52:50 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 08:52:50 2013 -0400

Merge topic 'remove_extra_matches' into next

dc03499 Do not set CMAKE_MATCH_ variables when not neeeded


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc03499595086ec190d55c59c8589c112362dbb6
commit dc03499595086ec190d55c59c8589c112362dbb6
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Thu Jun 6 12:50:20 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jun 14 08:46:14 2013 -0400

Do not set CMAKE_MATCH_ variables when not neeeded

Each call to AddDefinition has overhead for variable watches and such.
Avoid extra calls when not needed.

This decreases the configure time for ParaView by 10 seconds on my
machine.  Without the change about 1,000,000 set-to-empty calls were
being made.  After the change it drops to about 100,000.

diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 1fbde01..68ba13f 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -534,8 +534,12 @@ void cmStringCommand::ClearMatches(cmMakefile* mf)
 {
 char name[128];
 sprintf(name, CMAKE_MATCH_%d, i);
-mf-AddDefinition(name, );
-mf-MarkVariableAsUsed(name);
+const char* s = mf-GetDefinition(name);
+if(s  *s != 0)
+  {
+  mf-AddDefinition(name, );
+  mf-MarkVariableAsUsed(name);
+  }
 }
 }
 
@@ -544,10 +548,14 @@ void cmStringCommand::StoreMatches(cmMakefile* 
mf,cmsys::RegularExpression re)
 {
   for (unsigned int i=0; i10; i++)
 {
-char name[128];
-sprintf(name, CMAKE_MATCH_%d, i);
-mf-AddDefinition(name, re.match(i).c_str());
-mf-MarkVariableAsUsed(name);
+std::string m = re.match(i);
+if(m.size()  0)
+  {
+  char name[128];
+  sprintf(name, CMAKE_MATCH_%d, i);
+  mf-AddDefinition(name, re.match(i).c_str());
+  mf-MarkVariableAsUsed(name);
+  }
 }
 }
 

---

Summary of changes:


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-2623-g03e39be

[Brad King]

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  03e39be5319c5104c839e13389341315210f31f1 (commit)
   via  bc460ea2fc9223092da2fd65daefaf8eecc16cfb (commit)
  from  902208172455e347099199f0382fb230bbdb593a (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=03e39be5319c5104c839e13389341315210f31f1
commit 03e39be5319c5104c839e13389341315210f31f1
Merge: 9022081 bc460ea
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 08:57:08 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 08:57:08 2013 -0400

Merge topic 'FixAsmSupport' into next

bc460ea asm support: adapt to changes in CMakeDetectCompiler in 2.8.10


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc460ea2fc9223092da2fd65daefaf8eecc16cfb
commit bc460ea2fc9223092da2fd65daefaf8eecc16cfb
Author: Alex Neundorf neund...@kde.org
AuthorDate: Tue Jun 11 21:06:35 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jun 14 08:54:34 2013 -0400

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 ATT 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 f62..99b04e3 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:


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, master, updated. v2.8.11.1-304-gbc3a7b6

[Brad King]

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

The branch, master has been updated
   via  bc3a7b61e261c9299b81d572d3fa3c78f87ec075 (commit)
   via  ff01f8b60025cca88ebcba9b83ab9492b1521c2c (commit)
  from  3aaf04365c014a7a71ce5edbdb2d739349f120d1 (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=bc3a7b61e261c9299b81d572d3fa3c78f87ec075
commit bc3a7b61e261c9299b81d572d3fa3c78f87ec075
Merge: 3aaf043 ff01f8b
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 08:59:54 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 08:59:54 2013 -0400

Merge topic 'rpath-on-mac'

ff01f8b OS X: Improvements for getting install name of dylib.


---

Summary of changes:
 Source/cmSystemTools.cxx |5 -
 1 files changed, 4 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, master, updated. v2.8.11.1-306-gf247474

[Brad King]

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

The branch, master has been updated
   via  f247474eb68cc0c96eb20164d0e52e14e3efb7d7 (commit)
   via  dc03499595086ec190d55c59c8589c112362dbb6 (commit)
  from  bc3a7b61e261c9299b81d572d3fa3c78f87ec075 (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=f247474eb68cc0c96eb20164d0e52e14e3efb7d7
commit f247474eb68cc0c96eb20164d0e52e14e3efb7d7
Merge: bc3a7b6 dc03499
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 09:00:11 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 09:00:11 2013 -0400

Merge topic 'remove_extra_matches'

dc03499 Do not set CMAKE_MATCH_ variables when not neeeded


---

Summary of changes:
 Source/cmStringCommand.cxx |   20 ++--
 1 files changed, 14 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, master, updated. v2.8.11.1-310-gbbaae3e

[Brad King]

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

The branch, master has been updated
   via  bbaae3e42150db41c3386c80a631e1134ac085d5 (commit)
   via  e3b7eac5933a7ca913ce4b0adaf8e5370b04c997 (commit)
   via  ad304a2f7d2861b8127502f056ae4d8d07774c07 (commit)
   via  08319e071e4b876a8f9c35edf8d73f3c145dff35 (commit)
  from  f247474eb68cc0c96eb20164d0e52e14e3efb7d7 (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=bbaae3e42150db41c3386c80a631e1134ac085d5
commit bbaae3e42150db41c3386c80a631e1134ac085d5
Merge: f247474 e3b7eac
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 09:00:26 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 09:00:26 2013 -0400

Merge topic 'minor-cleanup'

e3b7eac Style: Don't put an else after a return.
ad304a2 cmSystemTools: Fix typo in comment.
08319e0 Genex: Fix indentation in docs.


---

Summary of changes:
 Source/cmDocumentGeneratorExpressions.h   |4 ++--
 Source/cmGeneratorExpressionEvaluator.cxx |3 ---
 Source/cmSystemTools.h|2 +-
 3 files changed, 3 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, master, updated. v2.8.11.1-312-ged2f59e

[Brad King]

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

The branch, master has been updated
   via  ed2f59e6149ab763c20653365fb881a9b9e315fd (commit)
   via  6a6cda5b4a0fe561cc5f5b7d6ec12775d17a4457 (commit)
  from  bbaae3e42150db41c3386c80a631e1134ac085d5 (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=ed2f59e6149ab763c20653365fb881a9b9e315fd
commit ed2f59e6149ab763c20653365fb881a9b9e315fd
Merge: bbaae3e 6a6cda5
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 09:00:39 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 09:00:39 2013 -0400

Merge topic 'suppress-unused-cli-with-value-in-cache'

6a6cda5 Don't run the WarnUnusedCliUnused test on Windows.


---

Summary of changes:
 Tests/CMakeLists.txt |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, master, updated. v2.8.11.1-318-gd556631

[Brad King]

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

The branch, master has been updated
   via  d556631079c8c54eb1a569b5b702412170ceee94 (commit)
   via  75994d953e261b388aa31e4d8ecd8af9fe53142b (commit)
  from  1f8733a0c25442a90397f0f7dd0fcb583b15ae8e (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=d556631079c8c54eb1a569b5b702412170ceee94
commit d556631079c8c54eb1a569b5b702412170ceee94
Merge: 1f8733a 75994d9
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 09:01:22 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 09:01:22 2013 -0400

Merge topic 'sha2-alignment'

75994d9 cmCryptoHash: Increase alignment of HashFile buffer


---

Summary of changes:
 Source/cmCryptoHash.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, master, updated. v2.8.11.1-320-gdea8271

[Brad King]

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

The branch, master has been updated
   via  dea8271840b69bef078d7af324a72636ff195c94 (commit)
   via  b3b57e7a31446bf7b0e47c7508d34f34cb322a6a (commit)
  from  d556631079c8c54eb1a569b5b702412170ceee94 (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=dea8271840b69bef078d7af324a72636ff195c94
commit dea8271840b69bef078d7af324a72636ff195c94
Merge: d556631 b3b57e7
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 09:01:39 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 09:01:39 2013 -0400

Merge topic 'doc-enable_language-scope'

b3b57e7 enable_language: Clarify documentation


---

Summary of changes:
 Source/cmEnableLanguageCommand.h |   17 ++---
 1 files changed, 10 insertions(+), 7 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, master, updated. v2.8.11.1-316-g1f8733a

[Brad King]

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

The branch, master has been updated
   via  1f8733a0c25442a90397f0f7dd0fcb583b15ae8e (commit)
   via  22f7934a6e9c3dd350ec3ed6db91821783cd98a2 (commit)
  from  2acbd419e2db4901c45f9ffe4d85752004371d5e (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=1f8733a0c25442a90397f0f7dd0fcb583b15ae8e
commit 1f8733a0c25442a90397f0f7dd0fcb583b15ae8e
Merge: 2acbd41 22f7934
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 09:01:17 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 09:01:17 2013 -0400

Merge topic 'FixEclipseCorruptProjects'

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


---

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-2633-g81e19c3

[Brad King]

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  81e19c34912fba1829af3dc4dd60a5f369a0e02f (commit)
   via  dea8271840b69bef078d7af324a72636ff195c94 (commit)
   via  d556631079c8c54eb1a569b5b702412170ceee94 (commit)
   via  1f8733a0c25442a90397f0f7dd0fcb583b15ae8e (commit)
   via  2acbd419e2db4901c45f9ffe4d85752004371d5e (commit)
   via  ed2f59e6149ab763c20653365fb881a9b9e315fd (commit)
   via  bbaae3e42150db41c3386c80a631e1134ac085d5 (commit)
   via  f247474eb68cc0c96eb20164d0e52e14e3efb7d7 (commit)
   via  bc3a7b61e261c9299b81d572d3fa3c78f87ec075 (commit)
   via  3aaf04365c014a7a71ce5edbdb2d739349f120d1 (commit)
  from  03e39be5319c5104c839e13389341315210f31f1 (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=81e19c34912fba1829af3dc4dd60a5f369a0e02f
commit 81e19c34912fba1829af3dc4dd60a5f369a0e02f
Merge: 03e39be dea8271
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 08:59:53 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jun 14 08:59:53 2013 -0400

Merge branch 'master' into next


---

Summary of changes:
 Source/CMakeVersion.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.1-2635-g94d0c90

[Brad King]

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  94d0c909d3d979fa7b9baeef84010169944138c6 (commit)
   via  b9f4383f698ae9207bb2701f1b82753e239e3248 (commit)
  from  81e19c34912fba1829af3dc4dd60a5f369a0e02f (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=94d0c909d3d979fa7b9baeef84010169944138c6
commit 94d0c909d3d979fa7b9baeef84010169944138c6
Merge: 81e19c3 b9f4383
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 09:02:33 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 09:02:33 2013 -0400

Merge topic 'split-command-sources' into next

b9f4383 Split cmBootstrapCommands.cxx into two sources


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9f4383f698ae9207bb2701f1b82753e239e3248
commit b9f4383f698ae9207bb2701f1b82753e239e3248
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 08:35:52 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jun 14 08:35:52 2013 -0400

Split cmBootstrapCommands.cxx into two sources

The single translation unit has grown too large for some compilers.
Split it into cmBootstrapCommands1.cxx and cmBootstrapCommands2.cxx.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 1893167..a243702 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -113,7 +113,8 @@ endif()
 set(SRCS
   cmStandardIncludes.cxx
   cmArchiveWrite.cxx
-  cmBootstrapCommands.cxx
+  cmBootstrapCommands1.cxx
+  cmBootstrapCommands2.cxx
   cmCacheManager.cxx
   cmCacheManager.h
   cmCommands.cxx
diff --git a/Source/cmBootstrapCommands.cxx b/Source/cmBootstrapCommands.cxx
deleted file mode 100644
index 1b7a751..000
--- a/Source/cmBootstrapCommands.cxx
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-  CMake - Cross Platform Makefile Generator
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-
-  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.
-*/
-// This file is used to compile all the commands
-// that CMake knows about at compile time.
-// This is sort of a boot strapping approach since you would
-// like to have CMake to build CMake.
-#include cmCommands.h
-#include cmAddCustomCommandCommand.cxx
-#include cmAddCustomTargetCommand.cxx
-#include cmAddDefinitionsCommand.cxx
-#include cmAddDependenciesCommand.cxx
-#include cmAddExecutableCommand.cxx
-#include cmAddLibraryCommand.cxx
-#include cmAddSubDirectoryCommand.cxx
-#include cmAddTestCommand.cxx
-#include cmBreakCommand.cxx
-#include cmBuildCommand.cxx
-#include cmCMakeMinimumRequired.cxx
-#include cmCMakePolicyCommand.cxx
-#include cmCommandArgumentsHelper.cxx
-#include cmConfigureFileCommand.cxx
-#include cmCoreTryCompile.cxx
-#include cmCreateTestSourceList.cxx
-#include cmDefinePropertyCommand.cxx
-#include cmElseCommand.cxx
-#include cmEnableLanguageCommand.cxx
-#include cmEnableTestingCommand.cxx
-#include cmEndForEachCommand.cxx
-#include cmEndFunctionCommand.cxx
-#include cmEndIfCommand.cxx
-#include cmEndMacroCommand.cxx
-#include cmEndWhileCommand.cxx
-#include cmExecProgramCommand.cxx
-#include cmExecuteProcessCommand.cxx
-#include cmExternalMakefileProjectGenerator.cxx
-#include cmFindBase.cxx
-#include cmFindCommon.cxx
-#include cmFileCommand.cxx
-#include cmFindFileCommand.cxx
-#include cmFindLibraryCommand.cxx
-#include cmFindPackageCommand.cxx
-#include cmFindPathCommand.cxx
-#include cmFindProgramCommand.cxx
-#include cmForEachCommand.cxx
-#include cmFunctionCommand.cxx
-#include cmGeneratorExpressionEvaluationFile.cxx
-#include cmGetCMakePropertyCommand.cxx
-#include cmGetDirectoryPropertyCommand.cxx
-#include cmGetFilenameComponentCommand.cxx
-#include cmGetPropertyCommand.cxx
-#include cmGetSourceFilePropertyCommand.cxx
-#include cmGetTargetPropertyCommand.cxx
-#include cmHexFileConverter.cxx
-#include cmIfCommand.cxx
-#include cmIncludeCommand.cxx
-#include cmIncludeDirectoryCommand.cxx
-#include cmIncludeRegularExpressionCommand.cxx
-#include cmInstallFilesCommand.cxx
-#include cmInstallCommandArguments.cxx
-#include cmInstallCommand.cxx
-#include cmInstallTargetsCommand.cxx
-#include cmLinkDirectoriesCommand.cxx
-#include cmListCommand.cxx
-#include cmMacroCommand.cxx
-#include

[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2637-gdbb49b6

[Brad King]

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  dbb49b62853ca86614abc5844c516ce1d962 (commit)
   via  a0b37d7e3bdf72db2d1c9f8fc11b6d6054a6d04f (commit)
  from  94d0c909d3d979fa7b9baeef84010169944138c6 (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=dbb49b62853ca86614abc5844c516ce1d962
commit dbb49b62853ca86614abc5844c516ce1d962
Merge: 94d0c90 a0b37d7
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 17 08:45:19 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 17 08:45:19 2013 -0400

Merge topic 'doc-search-install-prefix' into next

a0b37d7 Document CMAKE_INSTALL_PREFIX in CMAKE_SYSTEM_PREFIX_PATH


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0b37d7e3bdf72db2d1c9f8fc11b6d6054a6d04f
commit a0b37d7e3bdf72db2d1c9f8fc11b6d6054a6d04f
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 17 08:40:44 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 17 08:40:44 2013 -0400

Document CMAKE_INSTALL_PREFIX in CMAKE_SYSTEM_PREFIX_PATH

Add documentation to both variables to indicate that the install prefix
is also searched.

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 689508f..ceaa302 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -648,6 +648,10 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
  WARNING: DESTDIR may not be used on Windows because installation
   prefix usually contains a drive letter like in \C:/Program Files\
   which cannot be prepended with some other prefix.
+ \n
+ The installation prefix is also added to CMAKE_SYSTEM_PREFIX_PATH 
+ so that find_package, find_program, find_library, find_path, and 
+ find_file will search the prefix for other software.
  ,false,
  Variables That Change Behavior);
 
@@ -725,7 +729,8 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
  adds /bin to each of the directories in the path, FIND_LIBRARY() 
  appends /lib to each of the directories, and FIND_PATH() and 
  FIND_FILE() append /include . By default this contains the standard 
- directories for the current system. It is NOT intended 
+ directories for the current system and the CMAKE_INSTALL_PREFIX.  
+ It is NOT intended 
  to be modified by the project, use CMAKE_PREFIX_PATH for this. See also 
  CMAKE_SYSTEM_INCLUDE_PATH, CMAKE_SYSTEM_LIBRARY_PATH, 
  CMAKE_SYSTEM_PROGRAM_PATH, and CMAKE_SYSTEM_IGNORE_PATH., false,

---

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.11.1-2639-g6b29034

[Brad King]

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  6b290348ef13fd82f8c2a6c448819eefd1dea957 (commit)
   via  7a9f393703b3844dc5b29de13b76ad9079080f61 (commit)
  from  dbb49b62853ca86614abc5844c516ce1d962 (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=6b290348ef13fd82f8c2a6c448819eefd1dea957
commit 6b290348ef13fd82f8c2a6c448819eefd1dea957
Merge: dbb49b6 7a9f393
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 17 08:54:41 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 17 08:54:41 2013 -0400

Merge topic 'add-cmake_host_system_information-command' into next

7a9f393 Add cmake_host_system_information command


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a9f393703b3844dc5b29de13b76ad9079080f61
commit 7a9f393703b3844dc5b29de13b76ad9079080f61
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Sat Jun 15 07:38:23 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 17 08:50:26 2013 -0400

Add cmake_host_system_information command

Expose the internal system information API to the CMake language.  For
example, it is useful to see how much memory the system has available to
estimate an upper limit of tests that can run in parallel.

diff --git a/Source/cmCMakeHostSystemInformationCommand.cxx 
b/Source/cmCMakeHostSystemInformationCommand.cxx
new file mode 100644
index 000..8c29871
--- /dev/null
+++ b/Source/cmCMakeHostSystemInformationCommand.cxx
@@ -0,0 +1,126 @@
+/*
+  CMake - Cross Platform Makefile Generator
+  Copyright 2013 Kitware, Inc., Insight Software Consortium
+
+  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.
+*/
+#include cmCMakeHostSystemInformationCommand.h
+
+#include cmsys/ios/sstream
+
+// cmCMakeHostSystemInformation
+bool cmCMakeHostSystemInformationCommand
+::InitialPass(std::vectorstd::string const args, cmExecutionStatus )
+{
+  size_t current_index = 0;
+
+  if(args.size()  (current_index + 2) || args[current_index] != RESULT)
+{
+this-SetError(missing RESULT specification.);
+return false;
+}
+
+  std::string variable = args[current_index + 1];
+  current_index += 2;
+
+  if(args.size()  (current_index + 2) || args[current_index] != QUERY)
+{
+this-SetError(missing QUERY specification);
+return false;
+}
+
+  cmsys::SystemInformation info;
+  info.RunCPUCheck();
+  info.RunOSCheck();
+  info.RunMemoryCheck();
+
+  std::string result_list;
+  for(std::size_t i = current_index + 1; i  args.size(); ++i)
+{
+std::string key = args[i];
+if(i != current_index + 1)
+  {
+  result_list += ;;
+  }
+std::string value;
+if(!this-GetValue(info, key, value)) return false;
+
+result_list += value;
+}
+
+  this-Makefile-AddDefinition(variable.c_str(), result_list.c_str());
+
+  return true;
+}
+
+bool cmCMakeHostSystemInformationCommand
+::GetValue(cmsys::SystemInformation info,
+   std::string const key, std::string value)
+{
+  if(key == NUMBER_OF_LOGICAL_CORES)
+{
+value = this-ValueToString(info.GetNumberOfLogicalCPU());
+}
+  else if(key == NUMBER_OF_PHYSICAL_CORES)
+{
+value = this-ValueToString(info.GetNumberOfPhysicalCPU());
+}
+  else if(key == HOSTNAME)
+{
+value = this-ValueToString(info.GetHostname());
+}
+  else if(key == FQDN)
+{
+value = this-ValueToString(info.GetFullyQualifiedDomainName());
+}
+  else if(key == TOTAL_VIRTUAL_MEMORY)
+{
+value = this-ValueToString(info.GetTotalVirtualMemory());
+}
+  else if(key == AVAILABLE_VIRTUAL_MEMORY)
+{
+value = this-ValueToString(info.GetAvailableVirtualMemory());
+}
+  else if(key == TOTAL_PHYSICAL_MEMORY)
+{
+value = this-ValueToString(info.GetTotalPhysicalMemory());
+}
+  else if(key == AVAILABLE_PHYSICAL_MEMORY)
+{
+value = this-ValueToString(info.GetAvailablePhysicalMemory());
+}
+  else
+{
+std::string e = does not recognize key  + key;
+this-SetError(e.c_str());
+return false;
+}
+
+  return true;
+}
+
+std::string cmCMakeHostSystemInformationCommand
+::ValueToString(std::size_t value) const
+{
+  cmsys_ios::stringstream

[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2648-g5716ce2

[Brad King]

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  5716ce2ab6bbcb594082be0c0a31f100c00384c5 (commit)
   via  bcb09ef4abee1696b092c93cc95d583fcac1dec7 (commit)
   via  dc43f7755da1bee7d5c73e75db4bb467bab89073 (commit)
   via  30d029ddd1013bb8d1120d76f5cdfb2b0e09fc81 (commit)
   via  19df4595e27e85187742e100aa202385ad0c330b (commit)
  from  6a0bf5e755dfa6e7572c0a84dd23056fa51e7220 (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=5716ce2ab6bbcb594082be0c0a31f100c00384c5
commit 5716ce2ab6bbcb594082be0c0a31f100c00384c5
Merge: 6a0bf5e bcb09ef
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 17 13:54:44 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jun 17 13:54:44 2013 -0400

Merge topic 'add-FindLua52' into next

bcb09ef Add FindLua52 module (#14224)
dc43f77 CMake Nightly Date Stamp
30d029d CMake Nightly Date Stamp
19df459 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcb09ef4abee1696b092c93cc95d583fcac1dec7
commit bcb09ef4abee1696b092c93cc95d583fcac1dec7
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Jun 17 13:43:45 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Jun 17 13:47:45 2013 -0400

Add FindLua52 module (#14224)

Copy the FindLua51 module to FindLua52 and replease 51 with 52 and 5.1
with 5.2.  In the future we should refactor all the FindLua*.cmake
modules to share common infrastructure.

diff --git a/Modules/FindLua52.cmake b/Modules/FindLua52.cmake
new file mode 100644
index 000..6b6f9d2
--- /dev/null
+++ b/Modules/FindLua52.cmake
@@ -0,0 +1,80 @@
+# Locate Lua library
+# This module defines
+#  LUA52_FOUND, if false, do not try to link to Lua
+#  LUA_LIBRARIES
+#  LUA_INCLUDE_DIR, where to find lua.h
+#  LUA_VERSION_STRING, the version of Lua found
+#
+# Note that the expected include convention is
+#  #include lua.h
+# and not
+#  #include lua/lua.h
+# This is because, the lua location is not standardized and may exist
+# in locations other than lua/
+
+#=
+# Copyright 2007-2009 Kitware, Inc.
+#
+# 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.)
+
+find_path(LUA_INCLUDE_DIR lua.h
+  HINTS
+ENV LUA_DIR
+  PATH_SUFFIXES include/lua52 include/lua5.2 include/lua-5.2 include/lua 
include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+
+find_library(LUA_LIBRARY
+  NAMES lua52 lua5.2 lua-5.2 lua
+  HINTS
+ENV LUA_DIR
+  PATH_SUFFIXES lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+if(LUA_LIBRARY)
+  # include the math library for Unix
+  if(UNIX AND NOT APPLE AND NOT BEOS)
+find_library(LUA_MATH_LIBRARY m)
+set( LUA_LIBRARIES ${LUA_LIBRARY};${LUA_MATH_LIBRARY} CACHE STRING Lua 
Libraries)
+  # For Windows and Mac, don't need to explicitly include the math library
+  else()
+set( LUA_LIBRARIES ${LUA_LIBRARY} CACHE STRING Lua Libraries)
+  endif()
+endif()
+
+if(LUA_INCLUDE_DIR AND EXISTS ${LUA_INCLUDE_DIR}/lua.h)
+  file(STRINGS ${LUA_INCLUDE_DIR}/lua.h lua_version_str REGEX ^#define[ 
\t]+LUA_RELEASE[ \t]+\Lua .+\)
+
+  string(REGEX REPLACE ^#define[ \t]+LUA_RELEASE[ \t]+\Lua ([^\]+)\.* 
\\1 LUA_VERSION_STRING ${lua_version_str})
+  unset(lua_version_str)
+endif()
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua52
+  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
+  VERSION_VAR LUA_VERSION_STRING)
+
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)

---

Summary of changes:
 Modules/{FindLua51.cmake = FindLua52.cmake} |   11 +--
 Source/CMakeVersion.cmake|2 +-
 2 files changed, 6 insertions(+), 7 deletions

[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2650-gf5fd061

[Brad King]

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  f5fd0617df8646b063b4909e183801c47e25df16 (commit)
   via  09ec083f93ec999401bbe8a204027bdc28d0eccf (commit)
  from  5716ce2ab6bbcb594082be0c0a31f100c00384c5 (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=f5fd0617df8646b063b4909e183801c47e25df16
commit f5fd0617df8646b063b4909e183801c47e25df16
Merge: 5716ce2 09ec083
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 18 08:13:46 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 18 08:13:46 2013 -0400

Merge topic 'add-cmake_host_system_information-command' into next

09ec083 Use size_t instead of std::size_t


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09ec083f93ec999401bbe8a204027bdc28d0eccf
commit 09ec083f93ec999401bbe8a204027bdc28d0eccf
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 18 08:00:58 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 18 08:00:58 2013 -0400

Use size_t instead of std::size_t

The latter does not exist on older compilers.

diff --git a/Source/cmCMakeHostSystemInformationCommand.cxx 
b/Source/cmCMakeHostSystemInformationCommand.cxx
index 8c29871..62f2383 100644
--- a/Source/cmCMakeHostSystemInformationCommand.cxx
+++ b/Source/cmCMakeHostSystemInformationCommand.cxx
@@ -40,7 +40,7 @@ bool cmCMakeHostSystemInformationCommand
   info.RunMemoryCheck();
 
   std::string result_list;
-  for(std::size_t i = current_index + 1; i  args.size(); ++i)
+  for(size_t i = current_index + 1; i  args.size(); ++i)
 {
 std::string key = args[i];
 if(i != current_index + 1)
@@ -105,7 +105,7 @@ bool cmCMakeHostSystemInformationCommand
 }
 
 std::string cmCMakeHostSystemInformationCommand
-::ValueToString(std::size_t value) const
+::ValueToString(size_t value) const
 {
   cmsys_ios::stringstream tmp;
   tmp  value;
diff --git a/Source/cmCMakeHostSystemInformationCommand.h 
b/Source/cmCMakeHostSystemInformationCommand.h
index da0dc45..d1b8700 100644
--- a/Source/cmCMakeHostSystemInformationCommand.h
+++ b/Source/cmCMakeHostSystemInformationCommand.h
@@ -94,7 +94,7 @@ private:
   bool GetValue(cmsys::SystemInformation info,
 std::string const key, std::string value);
 
-  std::string ValueToString(std::size_t value) const;
+  std::string ValueToString(size_t value) const;
   std::string ValueToString(const char *value) const;
   std::string ValueToString(std::string const value) const;
 };

---

Summary of changes:
 Source/cmCMakeHostSystemInformationCommand.cxx |4 ++--
 Source/cmCMakeHostSystemInformationCommand.h   |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.11.1-2652-gf8492d0

[Brad King]

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  f8492d0255f4bc2ca4b5da472d5c87c0e04cb367 (commit)
   via  30f9f6629451213c176cbcd5bc2150c4e8710501 (commit)
  from  f5fd0617df8646b063b4909e183801c47e25df16 (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=f8492d0255f4bc2ca4b5da472d5c87c0e04cb367
commit f8492d0255f4bc2ca4b5da472d5c87c0e04cb367
Merge: f5fd061 30f9f66
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 18 08:14:53 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jun 18 08:14:53 2013 -0400

Merge topic 'add-FindLua52' into next

30f9f66 Revert Add FindLua52 module (#14224)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30f9f6629451213c176cbcd5bc2150c4e8710501
commit 30f9f6629451213c176cbcd5bc2150c4e8710501
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Jun 18 08:11:48 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Jun 18 08:11:48 2013 -0400

Revert Add FindLua52 module (#14224)

This reverts commit bcb09ef4abee1696b092c93cc95d583fcac1dec7.

diff --git a/Modules/FindLua52.cmake b/Modules/FindLua52.cmake
deleted file mode 100644
index 6b6f9d2..000
--- a/Modules/FindLua52.cmake
+++ /dev/null
@@ -1,80 +0,0 @@
-# Locate Lua library
-# This module defines
-#  LUA52_FOUND, if false, do not try to link to Lua
-#  LUA_LIBRARIES
-#  LUA_INCLUDE_DIR, where to find lua.h
-#  LUA_VERSION_STRING, the version of Lua found
-#
-# Note that the expected include convention is
-#  #include lua.h
-# and not
-#  #include lua/lua.h
-# This is because, the lua location is not standardized and may exist
-# in locations other than lua/
-
-#=
-# Copyright 2007-2009 Kitware, Inc.
-#
-# 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.)
-
-find_path(LUA_INCLUDE_DIR lua.h
-  HINTS
-ENV LUA_DIR
-  PATH_SUFFIXES include/lua52 include/lua5.2 include/lua-5.2 include/lua 
include
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt
-)
-
-find_library(LUA_LIBRARY
-  NAMES lua52 lua5.2 lua-5.2 lua
-  HINTS
-ENV LUA_DIR
-  PATH_SUFFIXES lib
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-
-if(LUA_LIBRARY)
-  # include the math library for Unix
-  if(UNIX AND NOT APPLE AND NOT BEOS)
-find_library(LUA_MATH_LIBRARY m)
-set( LUA_LIBRARIES ${LUA_LIBRARY};${LUA_MATH_LIBRARY} CACHE STRING Lua 
Libraries)
-  # For Windows and Mac, don't need to explicitly include the math library
-  else()
-set( LUA_LIBRARIES ${LUA_LIBRARY} CACHE STRING Lua Libraries)
-  endif()
-endif()
-
-if(LUA_INCLUDE_DIR AND EXISTS ${LUA_INCLUDE_DIR}/lua.h)
-  file(STRINGS ${LUA_INCLUDE_DIR}/lua.h lua_version_str REGEX ^#define[ 
\t]+LUA_RELEASE[ \t]+\Lua .+\)
-
-  string(REGEX REPLACE ^#define[ \t]+LUA_RELEASE[ \t]+\Lua ([^\]+)\.* 
\\1 LUA_VERSION_STRING ${lua_version_str})
-  unset(lua_version_str)
-endif()
-
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua52
-  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
-  VERSION_VAR LUA_VERSION_STRING)
-
-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)

---

Summary of changes:
 Modules/FindLua52.cmake |   80 ---
 1 files changed, 0 insertions(+), 80 deletions(-)
 delete mode 100644 Modules/FindLua52.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.11.1-2663-gd76b841

[Brad King]

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  d76b841d95b996208d2dc6472eaf62cc2eed0b47 (commit)
   via  bb71a3a0dfaba317c7a98b92301310e15f602c38 (commit)
  from  7bdddaf768f3c32322b7b7600ab7ff65943e27b8 (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=d76b841d95b996208d2dc6472eaf62cc2eed0b47
commit d76b841d95b996208d2dc6472eaf62cc2eed0b47
Merge: 7bdddaf bb71a3a
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 19 08:49:34 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 19 08:49:34 2013 -0400

Merge topic 'add-cmake_host_system_information-command' into next

bb71a3a Add cmake_host_system_information command


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb71a3a0dfaba317c7a98b92301310e15f602c38
commit bb71a3a0dfaba317c7a98b92301310e15f602c38
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Sat Jun 15 07:38:23 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 19 08:46:37 2013 -0400

Add cmake_host_system_information command

Expose the internal system information API to the CMake language.  For
example, it is useful to see how much memory the system has available to
estimate an upper limit of tests that can run in parallel.

diff --git a/Source/cmCMakeHostSystemInformationCommand.cxx 
b/Source/cmCMakeHostSystemInformationCommand.cxx
new file mode 100644
index 000..62f2383
--- /dev/null
+++ b/Source/cmCMakeHostSystemInformationCommand.cxx
@@ -0,0 +1,126 @@
+/*
+  CMake - Cross Platform Makefile Generator
+  Copyright 2013 Kitware, Inc., Insight Software Consortium
+
+  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.
+*/
+#include cmCMakeHostSystemInformationCommand.h
+
+#include cmsys/ios/sstream
+
+// cmCMakeHostSystemInformation
+bool cmCMakeHostSystemInformationCommand
+::InitialPass(std::vectorstd::string const args, cmExecutionStatus )
+{
+  size_t current_index = 0;
+
+  if(args.size()  (current_index + 2) || args[current_index] != RESULT)
+{
+this-SetError(missing RESULT specification.);
+return false;
+}
+
+  std::string variable = args[current_index + 1];
+  current_index += 2;
+
+  if(args.size()  (current_index + 2) || args[current_index] != QUERY)
+{
+this-SetError(missing QUERY specification);
+return false;
+}
+
+  cmsys::SystemInformation info;
+  info.RunCPUCheck();
+  info.RunOSCheck();
+  info.RunMemoryCheck();
+
+  std::string result_list;
+  for(size_t i = current_index + 1; i  args.size(); ++i)
+{
+std::string key = args[i];
+if(i != current_index + 1)
+  {
+  result_list += ;;
+  }
+std::string value;
+if(!this-GetValue(info, key, value)) return false;
+
+result_list += value;
+}
+
+  this-Makefile-AddDefinition(variable.c_str(), result_list.c_str());
+
+  return true;
+}
+
+bool cmCMakeHostSystemInformationCommand
+::GetValue(cmsys::SystemInformation info,
+   std::string const key, std::string value)
+{
+  if(key == NUMBER_OF_LOGICAL_CORES)
+{
+value = this-ValueToString(info.GetNumberOfLogicalCPU());
+}
+  else if(key == NUMBER_OF_PHYSICAL_CORES)
+{
+value = this-ValueToString(info.GetNumberOfPhysicalCPU());
+}
+  else if(key == HOSTNAME)
+{
+value = this-ValueToString(info.GetHostname());
+}
+  else if(key == FQDN)
+{
+value = this-ValueToString(info.GetFullyQualifiedDomainName());
+}
+  else if(key == TOTAL_VIRTUAL_MEMORY)
+{
+value = this-ValueToString(info.GetTotalVirtualMemory());
+}
+  else if(key == AVAILABLE_VIRTUAL_MEMORY)
+{
+value = this-ValueToString(info.GetAvailableVirtualMemory());
+}
+  else if(key == TOTAL_PHYSICAL_MEMORY)
+{
+value = this-ValueToString(info.GetTotalPhysicalMemory());
+}
+  else if(key == AVAILABLE_PHYSICAL_MEMORY)
+{
+value = this-ValueToString(info.GetAvailablePhysicalMemory());
+}
+  else
+{
+std::string e = does not recognize key  + key;
+this-SetError(e.c_str());
+return false;
+}
+
+  return true;
+}
+
+std::string cmCMakeHostSystemInformationCommand
+::ValueToString(size_t value) const
+{
+  cmsys_ios::stringstream tmp

[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2667-g71a6b62

[Brad King]

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  71a6b621712e1486ab37b2d7a0b0b745411ac5ef (commit)
   via  ae06f80716ff52b398dc9729ae73fe84baae049d (commit)
   via  ee59089803c9d61710f24cbe70a2a819c6b9f771 (commit)
   via  381c76da0723d22001d88ad7c1e9b8bce44a1ff7 (commit)
  from  d76b841d95b996208d2dc6472eaf62cc2eed0b47 (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=71a6b621712e1486ab37b2d7a0b0b745411ac5ef
commit 71a6b621712e1486ab37b2d7a0b0b745411ac5ef
Merge: d76b841 ae06f80
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 19 10:14:57 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 19 10:14:57 2013 -0400

Merge topic 'doc-E-tar-zip' into next

ae06f80 cmake: Document -E tar support for .zip (#14225)
ee59089 CMake Nightly Date Stamp
381c76d CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae06f80716ff52b398dc9729ae73fe84baae049d
commit ae06f80716ff52b398dc9729ae73fe84baae049d
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 19 10:03:40 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jun 19 10:05:44 2013 -0400

cmake: Document -E tar support for .zip (#14225)

Through use of libarchive internally we support .zip files as well as
.tar format.  The ExternalProject module makes use of this feature.
Document support officially.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index e757f3a..853e09c 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1168,9 +1168,8 @@ void CMakeCommandUsage(const char* program)
remove_directory dir  - remove a directory and its contents\n
rename oldname newname- rename a file or directory 
(on one volume)\n
-   tar [cxt][vfz][cvfj] file.tar 
-file/dir1 file/dir2 ... - create a tar 
-archive\n
+   tar [cxt][vfz][cvfj] file.tar [file/dir1 file/dir2 ...]\n
+ - create or extract a tar or zip archive\n
time command [args] ...   - run command and return elapsed time\n
touch file- touch a file.\n
touch_nocreate file   - touch a file but do not create it.\n

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 Source/cmake.cxx  |5 ++---
 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.11.1-2669-gfcdc24b

[Brad King]

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  fcdc24b725e8faf3a64b06ae9b1cda7597469627 (commit)
   via  b41771dfeb0eef25e35da7d3dca13de658a2f8fb (commit)
  from  71a6b621712e1486ab37b2d7a0b0b745411ac5ef (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=fcdc24b725e8faf3a64b06ae9b1cda7597469627
commit fcdc24b725e8faf3a64b06ae9b1cda7597469627
Merge: 71a6b62 b41771d
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jun 19 10:20:57 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jun 19 10:20:57 2013 -0400

Merge topic 'document-add_jar-compat-shims' into next

b41771d UseJava.cmake: document add_jar compat shim


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b41771dfeb0eef25e35da7d3dca13de658a2f8fb
commit b41771dfeb0eef25e35da7d3dca13de658a2f8fb
Author: Matthew Woehlke matthew.woeh...@kitware.com
AuthorDate: Mon Jun 17 12:26:24 2013 -0400
Commit: Matthew Woehlke matthew.woeh...@kitware.com
CommitDate: Mon Jun 17 12:26:24 2013 -0400

UseJava.cmake: document add_jar compat shim

Document the logic that parses for backward compatibility the old
variables that were used to control add_jar prior to named argument
support. In particular, document that the reason this logic exists is
for backward compatibility, and that new features do not need to add to
it.

diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 9c23127..0242b24 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -221,6 +221,13 @@ set(_JAVA_SYMLINK_SCRIPT 
${CMAKE_CURRENT_LIST_DIR}/UseJavaSymlinks.cmake)
 
 function(add_jar _TARGET_NAME)
 
+# In CMake  2.8.12, add_jar used variables which were set prior to calling
+# add_jar for customizing the behavior of add_jar. In order to be backwards
+# compatible, check if any of those variables are set, and use them to
+# initialize values of the named arguments. (Giving the corresponding named
+# argument will override the value set here.)
+#
+# New features should use named arguments only.
 if(DEFINED CMAKE_JAVA_TARGET_VERSION)
 set(_add_jar_VERSION ${CMAKE_JAVA_TARGET_VERSION})
 endif()

---

Summary of changes:
 Modules/UseJava.cmake |7 +++
 1 files changed, 7 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.1-2671-g6ae9c41

[Brad King]

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  6ae9c417a348009a46f143f7f7ff5d2752e52ffb (commit)
   via  488d9682cc0974713315cae60a8dae793caefc6a (commit)
  from  fcdc24b725e8faf3a64b06ae9b1cda7597469627 (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=6ae9c417a348009a46f143f7f7ff5d2752e52ffb
commit 6ae9c417a348009a46f143f7f7ff5d2752e52ffb
Merge: fcdc24b 488d968
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 20 08:50:08 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jun 20 08:50:08 2013 -0400

Merge topic 'FindX11-OSX-10.8' into next

488d968 FindX11: Search in /opt/X11 for OS X 10.8 (#14232)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=488d9682cc0974713315cae60a8dae793caefc6a
commit 488d9682cc0974713315cae60a8dae793caefc6a
Author: Marius Schamschula mschamsch...@gmail.com
AuthorDate: Wed Jun 19 14:43:00 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jun 20 08:47:12 2013 -0400

FindX11: Search in /opt/X11 for OS X 10.8 (#14232)

As of Mac OS X 10.8, X11 is no longer installed under /usr/X11, but
under /opt/X11.

diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
index 3cd3cef..131d979 100644
--- a/Modules/FindX11.cmake
+++ b/Modules/FindX11.cmake
@@ -68,6 +68,7 @@ if (UNIX)
 /usr/openwin/include
 /usr/openwin/share/include
 /opt/graphics/OpenGL/include
+/opt/X11/include
   )
 
   set(X11_LIB_SEARCH_PATH
@@ -75,6 +76,7 @@ if (UNIX)
 /usr/X11R6/lib
 /usr/X11R7/lib
 /usr/openwin/lib
+/opt/X11/lib
   )
 
   find_path(X11_X11_INCLUDE_PATH X11/X.h 
${X11_INC_SEARCH_PATH})

---

Summary of changes:
 Modules/FindX11.cmake |2 ++
 1 files changed, 2 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.1-2674-g0f736f0

[Brad King]

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  0f736f09a391fca1eeebce3d5d0257e28d2ab187 (commit)
   via  508e8ca024e47baea342da85c7bbd014c7fd6c30 (commit)
   via  8dca8cee8afcaa448e8a83e193017d3514e80da5 (commit)
  from  6ae9c417a348009a46f143f7f7ff5d2752e52ffb (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=0f736f09a391fca1eeebce3d5d0257e28d2ab187
commit 0f736f09a391fca1eeebce3d5d0257e28d2ab187
Merge: 6ae9c41 508e8ca
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 20 08:53:25 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jun 20 08:53:25 2013 -0400

Merge topic 'FindGTK2-tweaks' into next

508e8ca FindGTK2: Detect gthread library
8dca8ce FindGTK2: Move check for pangocairo in gtk module


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=508e8ca024e47baea342da85c7bbd014c7fd6c30
commit 508e8ca024e47baea342da85c7bbd014c7fd6c30
Author: Daniele E. Domenichelli ddomeniche...@kde.org
AuthorDate: Mon Jun 17 17:31:10 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Jun 19 23:58:47 2013 +0200

FindGTK2: Detect gthread library

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 9d0f17f..f398c79 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -164,6 +164,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
 cairo
 cairomm-1.0
 gdk-pixbuf-2.0
+gthread-2.0
 gdkmm-2.4
 giomm-2.4
 gtk-2.0
@@ -465,6 +466,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
 _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR 
gdk-pixbuf/gdk-pixbuf.h)
 _GTK2_FIND_LIBRARY(GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true)
 
+_GTK2_FIND_LIBRARY(GTK2_GTHREAD_LIBRARY gthread false true)
+
 _GTK2_FIND_LIBRARY(GTK2_GIO_LIBRARY gio false true)
 
 _GTK2_FIND_INCLUDE_DIR(GTK2_ATK_INCLUDE_DIR atk/atk.h)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dca8cee8afcaa448e8a83e193017d3514e80da5
commit 8dca8cee8afcaa448e8a83e193017d3514e80da5
Author: Daniele E. Domenichelli ddomeniche...@kde.org
AuthorDate: Sat Jun 15 00:53:56 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Jun 19 23:58:47 2013 +0200

FindGTK2: Move check for pangocairo in gtk module

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 06cf962..9d0f17f 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -460,6 +460,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
 _GTK2_FIND_INCLUDE_DIR(GTK2_PANGO_INCLUDE_DIR pango/pango.h)
 _GTK2_FIND_LIBRARY(GTK2_PANGO_LIBRARY pango false true)
 
+_GTK2_FIND_LIBRARY(GTK2_PANGOCAIRO_LIBRARY pangocairo false true)
+
 _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR 
gdk-pixbuf/gdk-pixbuf.h)
 _GTK2_FIND_LIBRARY(GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true)
 
@@ -489,8 +491,6 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
 _GTK2_FIND_INCLUDE_DIR(GTK2_PANGOMMCONFIG_INCLUDE_DIR pangommconfig.h)
 _GTK2_FIND_LIBRARY(GTK2_PANGOMM_LIBRARY pangomm true true)
 
-_GTK2_FIND_LIBRARY(GTK2_PANGOCAIRO_LIBRARY pangocairo true true)
-
 _GTK2_FIND_INCLUDE_DIR(GTK2_CAIROMM_INCLUDE_DIR cairomm/cairomm.h)
 _GTK2_FIND_INCLUDE_DIR(GTK2_CAIROMMCONFIG_INCLUDE_DIR cairommconfig.h)
 _GTK2_FIND_LIBRARY(GTK2_CAIROMM_LIBRARY cairomm true true)

---

Summary of changes:
 Modules/FindGTK2.cmake |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.11.1-2677-g03604c1

[Brad King]

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  03604c1d9729ca23191e38c22c9c4ddea43da7f8 (commit)
   via  86cbd7312a766485eb26219c197b78ae079d44a3 (commit)
   via  7c61c73fbc1c508a6622b444e06c7fc9a0c280f1 (commit)
  from  0f736f09a391fca1eeebce3d5d0257e28d2ab187 (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=03604c1d9729ca23191e38c22c9c4ddea43da7f8
commit 03604c1d9729ca23191e38c22c9c4ddea43da7f8
Merge: 0f736f0 86cbd73
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 20 17:15:53 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jun 20 17:15:53 2013 -0400

Merge topic 'FindBoost-error-reason-static' into next

86cbd73 FindBoost: Clarify failure on missing 'static' libs (#14235)
7c61c73 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86cbd7312a766485eb26219c197b78ae079d44a3
commit 86cbd7312a766485eb26219c197b78ae079d44a3
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jun 20 17:05:00 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Jun 20 17:10:13 2013 -0400

FindBoost: Clarify failure on missing 'static' libs (#14235)

When Boost_USE_STATIC_LIBS is ON we may complain that Boost libraries
cannot be found even when shared libraries are present.  Update the
error message to tell the user explicitly that we want static libraries.

Suggested-by: Laurence R. McGlashan laurence.mcglas...@gmail.com

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index d1ce2f4..4cc32be 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1020,7 +1020,12 @@ if(Boost_FOUND)
 # We were unable to find some libraries, so generate a sensible
 # error message that lists the libraries we were unable to find.
 set(Boost_ERROR_REASON
-  ${Boost_ERROR_REASON}\nThe following Boost libraries could not be 
found:\n)
+  ${Boost_ERROR_REASON}\nCould not find the following)
+if(Boost_USE_STATIC_LIBS)
+  set(Boost_ERROR_REASON ${Boost_ERROR_REASON} static)
+endif()
+set(Boost_ERROR_REASON
+  ${Boost_ERROR_REASON} Boost libraries:\n)
 foreach(COMPONENT ${_Boost_MISSING_COMPONENTS})
   set(Boost_ERROR_REASON
 ${Boost_ERROR_REASON}boost_${COMPONENT}\n)

---

Summary of changes:
 Modules/FindBoost.cmake   |7 ++-
 Source/CMakeVersion.cmake |2 +-
 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.11.1-2682-gd684188

[Brad King]

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  d6841889d49e0f305409dfffa7cc938949e05556 (commit)
   via  480e924daedee520d18c8a9c0b9823fef205b57a (commit)
   via  9f160c5b0a7e0f821ca4737638edbebf0ed398be (commit)
  from  4ab0bfa94699e27114412708501833a6e40eed21 (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=d6841889d49e0f305409dfffa7cc938949e05556
commit d6841889d49e0f305409dfffa7cc938949e05556
Merge: 4ab0bfa 480e924
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 21 08:30:52 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 21 08:30:52 2013 -0400

Merge topic 'openbsd-elf-parsing' into next

480e924 OpenBSD: Enable ELF parsing and editing (#14241)
9f160c5 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=480e924daedee520d18c8a9c0b9823fef205b57a
commit 480e924daedee520d18c8a9c0b9823fef205b57a
Author: David Coppa dco...@openbsd.org
AuthorDate: Fri Jun 21 11:13:35 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jun 21 08:27:40 2013 -0400

OpenBSD: Enable ELF parsing and editing (#14241)

OpenBSD provides ELF ABI declarations in

 #include stdint.h
 #include elf_abi.h

Teach the platform check and cmELF implementation to use these.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 1893167..67a6333 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -11,7 +11,11 @@
 #=
 include(CheckIncludeFile)
 # Check if we can build support for ELF parsing.
-CHECK_INCLUDE_FILE(elf.h HAVE_ELF_H)
+if(CMAKE_CXX_PLATFORM_ID MATCHES OpenBSD)
+  CHECK_INCLUDE_FILES(stdint.h;elf_abi.h HAVE_ELF_H)
+else()
+  CHECK_INCLUDE_FILE(elf.h HAVE_ELF_H)
+endif()
 if(HAVE_ELF_H)
   set(CMAKE_USE_ELF_PARSER 1)
 else()
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index 1158fc0..30de9a8 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -19,7 +19,12 @@
 #include cmsys/CPU.h
 
 // Include the ELF format information system header.
-#include elf.h
+#if defined(__OpenBSD__)
+# include stdint.h
+# include elf_abi.h
+#else
+# include elf.h
+#endif
 #if defined(__sun)
 # include sys/link.h // For dynamic section information
 #endif

---

Summary of changes:
 Source/CMakeLists.txt |6 +-
 Source/CMakeVersion.cmake |2 +-
 Source/cmELF.cxx  |7 ++-
 3 files changed, 12 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