[Cmake-commits] CMake branch, next, updated. v3.6.0-964-ge4b2afd

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

The branch, next has been updated
   via  e4b2afdb3f87ee54d3d1b16724ccbc1efbcb22c7 (commit)
   via  ea6475334aff57633ad7bb80c013c8953328a909 (commit)
  from  d5be5b5f444f165229cfd699eed28fe25bff4342 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4b2afdb3f87ee54d3d1b16724ccbc1efbcb22c7
commit e4b2afdb3f87ee54d3d1b16724ccbc1efbcb22c7
Merge: d5be5b5 ea64753
Author: Gregor Jasny 
AuthorDate: Fri Jul 22 00:44:13 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 22 00:44:13 2016 -0400

Merge topic 'aliased-target-properties' into next

ea647533 Do not report ALIASED_TARGET as always set (#15783)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea6475334aff57633ad7bb80c013c8953328a909
commit ea6475334aff57633ad7bb80c013c8953328a909
Author: Gregor Jasny 
AuthorDate: Sat Jun 25 22:51:51 2016 +0200
Commit: Gregor Jasny 
CommitDate: Sat Jul 16 11:09:18 2016 -0700

Do not report ALIASED_TARGET as always set (#15783)

The cmGetPropertyCommand::StoreResult expects NULL for unset
properties. Make ALIASED_TARGET align with that expectation.

Additional corrections to the unit tests are necessary because
get_property removes variables for unset properties (in contrast
to get_target_property which stores a -NOTFOUND value).

diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx
index 854fdb8..2307e08 100644
--- a/Source/cmGetPropertyCommand.cxx
+++ b/Source/cmGetPropertyCommand.cxx
@@ -253,7 +253,7 @@ bool cmGetPropertyCommand::HandleTargetMode()
   if (this->Makefile->IsAlias(this->Name)) {
 return this->StoreResult(target->GetName().c_str());
   } else {
-return this->StoreResult((this->Variable + "-NOTFOUND").c_str());
+return this->StoreResult(NULL);
   }
 }
 return this->StoreResult(
diff --git a/Tests/AliasTarget/CMakeLists.txt b/Tests/AliasTarget/CMakeLists.txt
index 47ccbdc..552c83c 100644
--- a/Tests/AliasTarget/CMakeLists.txt
+++ b/Tests/AliasTarget/CMakeLists.txt
@@ -66,6 +66,11 @@ endif()
 add_library(iface INTERFACE)
 add_library(Alias::Iface ALIAS iface)
 
+get_property(_aliased_target_set TARGET foo PROPERTY ALIASED_TARGET SET)
+if(_aliased_target_set)
+  message(SEND_ERROR "ALIASED_TARGET is set for target foo")
+endif()
+
 get_target_property(_notAlias1 foo ALIASED_TARGET)
 if (NOT DEFINED _notAlias1)
   message(SEND_ERROR "_notAlias1 is not defined")
@@ -78,12 +83,6 @@ if (NOT _notAlias1 STREQUAL _notAlias1-NOTFOUND)
 endif()
 
 get_property(_notAlias2 TARGET foo PROPERTY ALIASED_TARGET)
-if (NOT DEFINED _notAlias2)
-  message(SEND_ERROR "_notAlias2 is not defined")
-endif()
 if (_notAlias2)
-  message(SEND_ERROR "_notAlias2 is defined, but foo is not an ALIAS")
-endif()
-if (NOT _notAlias2 STREQUAL _notAlias2-NOTFOUND)
-  message(SEND_ERROR "_notAlias2 not defined to a -NOTFOUND variant")
+  message(SEND_ERROR "_notAlias2 evaluates to true, but foo is not an ALIAS")
 endif()

---

Summary of changes:
 Source/cmGetPropertyCommand.cxx  |2 +-
 Tests/AliasTarget/CMakeLists.txt |   13 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)


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

[Cmake-commits] CMake branch, master, updated. v3.6.0-466-g7bfbcc7

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

The branch, master has been updated
   via  7bfbcc75a3158677897b2a80b02500425620e714 (commit)
  from  dbc0ec1648b493b237efd704bec38c757b6da5a5 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bfbcc75a3158677897b2a80b02500425620e714
commit 7bfbcc75a3158677897b2a80b02500425620e714
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Fri Jul 22 00:01:03 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Jul 22 00:01:03 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 2e503f9..504ef27 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 6)
-set(CMake_VERSION_PATCH 20160721)
+set(CMake_VERSION_PATCH 20160722)
 #set(CMake_VERSION_RC 1)

---

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


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-962-gd5be5b5

2016-07-21 Thread 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  d5be5b5f444f165229cfd699eed28fe25bff4342 (commit)
   via  d6a6024e9eb993d94d24bb0d98f966c50079a525 (commit)
  from  7b67f599ae400030ec5f833a7c681bdfab4b71a8 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5be5b5f444f165229cfd699eed28fe25bff4342
commit d5be5b5f444f165229cfd699eed28fe25bff4342
Merge: 7b67f59 d6a6024
Author: Brad King 
AuthorDate: Thu Jul 21 15:40:26 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 15:40:26 2016 -0400

Merge topic 'tests-hide-ldd-check-errors' into next

d6a6024e Tests: Hide errors from `ldd --help` output check


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6a6024e9eb993d94d24bb0d98f966c50079a525
commit d6a6024e9eb993d94d24bb0d98f966c50079a525
Author: Brad King 
AuthorDate: Thu Jul 21 15:38:47 2016 -0400
Commit: Brad King 
CommitDate: Thu Jul 21 15:39:05 2016 -0400

Tests: Hide errors from `ldd --help` output check

If `--help` is not a valid option then it may print content to stderr,
so we need to capture that.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index b6d1c38..dbd5530 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -309,7 +309,8 @@ endif()
 if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   if(UNIX AND NOT CYGWIN)
 execute_process(COMMAND ldd --help
-  OUTPUT_VARIABLE LDD_HELP)
+  OUTPUT_VARIABLE LDD_HELP
+  ERROR_VARIABLE LDD_ERR)
 if("${LDD_HELP}" MATCHES
 "(-r, --function-relocs.*process data and function relocations.*-u, 
--unused.*print unused direct dependencies)")
   add_RunCMake_test(LinkWhatYouUse)

---

Summary of changes:
 Tests/RunCMake/CMakeLists.txt |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


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

[Cmake-commits] CMake branch, master, updated. v3.6.0-465-gdbc0ec1

2016-07-21 Thread 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  dbc0ec1648b493b237efd704bec38c757b6da5a5 (commit)
   via  c7a7c655f0433c7ca4ea6ec5ce78b7f17cbf5140 (commit)
   via  34ba5c53481e7f2101dafa735504cb98f94ec6db (commit)
  from  850764fc701ce9e1190d5bb20af97ec511763f0b (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbc0ec1648b493b237efd704bec38c757b6da5a5
commit dbc0ec1648b493b237efd704bec38c757b6da5a5
Merge: 850764f c7a7c65
Author: Brad King 
AuthorDate: Thu Jul 21 11:27:31 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 11:27:31 2016 -0400

Merge topic 'makefile-response-files'

c7a7c655 Makefile: Avoid link line object list lengths nearing system limits
34ba5c53 Makefile: Factor out response file checks into common helper


---

Summary of changes:
 Source/cmMakefileExecutableTargetGenerator.cxx |   25 ++---
 Source/cmMakefileLibraryTargetGenerator.cxx|   25 ++---
 Source/cmMakefileTargetGenerator.cxx   |   71 
 Source/cmMakefileTargetGenerator.h |3 +
 4 files changed, 82 insertions(+), 42 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-960-g7b67f59

2016-07-21 Thread 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  7b67f599ae400030ec5f833a7c681bdfab4b71a8 (commit)
   via  dbc0ec1648b493b237efd704bec38c757b6da5a5 (commit)
  from  f70568b0bec005bae9ebef98214b6b508c98f03c (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b67f599ae400030ec5f833a7c681bdfab4b71a8
commit 7b67f599ae400030ec5f833a7c681bdfab4b71a8
Merge: f70568b dbc0ec1
Author: Brad King 
AuthorDate: Thu Jul 21 11:27:39 2016 -0400
Commit: Brad King 
CommitDate: Thu Jul 21 11:27:39 2016 -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/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.0-958-gf70568b

2016-07-21 Thread 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  f70568b0bec005bae9ebef98214b6b508c98f03c (commit)
   via  059c230d89b2f5c82423fc6458302620f4b09599 (commit)
  from  db57986bf5722035dd62103dd8124aa7f67acb9e (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f70568b0bec005bae9ebef98214b6b508c98f03c
commit f70568b0bec005bae9ebef98214b6b508c98f03c
Merge: db57986 059c230
Author: Brad King 
AuthorDate: Thu Jul 21 11:22:25 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 11:22:25 2016 -0400

Merge topic 'vs-default-v100' into next

059c230d VS: Explicitly default to v100 toolset in Visual Studio 2010


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=059c230d89b2f5c82423fc6458302620f4b09599
commit 059c230d89b2f5c82423fc6458302620f4b09599
Author: Benjamin Ballet 
AuthorDate: Thu Jul 21 10:43:36 2016 +0200
Commit: Brad King 
CommitDate: Thu Jul 21 11:13:16 2016 -0400

VS: Explicitly default to v100 toolset in Visual Studio 2010

Otherwise `CMAKE_VS_PLATFORM_TOOLSET` is not set even though the `v100`
toolset is chosen.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx 
b/Source/cmGlobalVisualStudio10Generator.cxx
index c13c622..df831e5 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -101,6 +101,7 @@ 
cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator(
   this->SystemIsWindowsPhone = false;
   this->SystemIsWindowsStore = false;
   this->MSBuildCommandInitialized = false;
+  this->DefaultPlatformToolset = "v100";
   this->Version = VS10;
 }
 

---

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |1 +
 1 file changed, 1 insertion(+)


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-956-gdb57986

2016-07-21 Thread 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  db57986bf5722035dd62103dd8124aa7f67acb9e (commit)
   via  500f67e5468878d5738dc633a0bb7165def825e1 (commit)
  from  e5ec5abd9bc13ee4b6a780e36e14887bb582d542 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db57986bf5722035dd62103dd8124aa7f67acb9e
commit db57986bf5722035dd62103dd8124aa7f67acb9e
Merge: e5ec5ab 500f67e
Author: Brad King 
AuthorDate: Thu Jul 21 11:21:25 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 11:21:25 2016 -0400

Merge topic 'vim-cmake-syntax' into next

500f67e5 Aux: update vim-syntax-highlighting


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=500f67e5468878d5738dc633a0bb7165def825e1
commit 500f67e5468878d5738dc633a0bb7165def825e1
Author: Patrick Boettcher 
AuthorDate: Thu Jul 21 16:48:55 2016 +0200
Commit: Patrick Boettcher 
CommitDate: Thu Jul 21 16:48:55 2016 +0200

Aux: update vim-syntax-highlighting

This commit updates the vim-syntax-file. It is still not complete, but 
contains much more keywords,
built-in variables. Generator expressions are highlighted as well.

This file is generated from a script which parses the --help
output of cmake 3.5.

Imported from here: https://github.com/pboettch/vim-cmake-syntax

Signed-off-by: Patrick Boettcher 

diff --git a/Auxiliary/cmake-syntax.vim b/Auxiliary/cmake-syntax.vim
index 624a8c4..973252d 100644
--- a/Auxiliary/cmake-syntax.vim
+++ b/Auxiliary/cmake-syntax.vim
@@ -1,16 +1,7 @@
-" =
-"
-"   Program:   CMake - Cross-Platform Makefile Generator
-"   Module:$RCSfile$
-"   Language:  VIM
-"   Date:  $Date$
-"   Version:   $Revision$
-"
-" =
-
+" vim: set nowrap:
 " Vim syntax file
 " Language: CMake
-" Author:   Andy Cedilnik 
+" Author:   Andy Cedilnik , Nicholas Hutchinson 
, Patrick Boettcher 
 " Maintainer:   Karthik Krishnan 
 " Last Change:  $Date$
 " Version:  $Revision$
@@ -19,71 +10,538 @@
 "   https://cmake.org/licensing
 "   This implies that distribution with Vim is allowed
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
-syn case ignore
 syn match cmakeEscaped /\(\|\\"\|\\n\|\\t\)/ contained
 syn region cmakeComment start="#" end="$" contains=cmakeTodo
+syn region cmakeGeneratorExpression start=/$/
+\ contained oneline 
contains=CONTAINED,cmakeTodo,cmakeVariable,cmakeProperty,cmakeGeneratorExpressions
 syn region cmakeRegistry start=/\[/ end=/]/
 \ contained oneline contains=CONTAINED,cmakeTodo,cmakeEscaped
 syn region cmakeVariableValue start=/\${/ end=/}/
-\ contained oneline contains=CONTAINED,cmakeTodo
+\ contained oneline contains=CONTAINED,cmakeTodo,cmakeVariable
 syn region cmakeEnvironment start=/\$ENV{/ end=/}/
 \ contained oneline contains=CONTAINED,cmakeTodo
 syn region cmakeString start=/"/ end=/"/
-\ contains=CONTAINED,cmakeTodo,cmakeOperators
+\ contains=CONTAINED,cmakeTodo
 syn region cmakeArguments start=/(/ end=/)/
 \ contains=ALLBUT,cmakeArguments,cmakeTodo
-syn keyword cmakeSystemVariables
-\ WIN32 UNIX APPLE CYGWIN BORLAND MINGW MSVC MSVC_IDE MSVC60 
MSVC70 MSVC71 MSVC80 MSVC90
-syn keyword cmakeOperators
-\ ABSOLUTE AND BOOL CACHE COMMAND DEFINED DOC EQUAL EXISTS EXT 
FALSE GREATER INTERNAL LESS MATCHES NAME NAMES NAME_WE NOT OFF ON OR PATH PATHS 
PROGRAM STREQUAL STRGREATER STRING STRLESS TRUE
+
+syn case match
+syn keyword cmakeProperty
+\ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET 
ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API 
ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI 
ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR 
ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES 
ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH 
ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP

[Cmake-commits] CMake branch, next, updated. v3.6.0-954-ge5ec5ab

2016-07-21 Thread 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  e5ec5abd9bc13ee4b6a780e36e14887bb582d542 (commit)
   via  13a6ff31becea16d567b23abc68bfa8aa75365ce (commit)
  from  88ffcdd31eb075e4ae6f21a2af33e73a5520c570 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5ec5abd9bc13ee4b6a780e36e14887bb582d542
commit e5ec5abd9bc13ee4b6a780e36e14887bb582d542
Merge: 88ffcdd 13a6ff3
Author: Brad King 
AuthorDate: Thu Jul 21 11:05:28 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 11:05:28 2016 -0400

Merge topic 'windows-export-all-fix-objlib' into next

13a6ff31 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for object libraries


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13a6ff31becea16d567b23abc68bfa8aa75365ce
commit 13a6ff31becea16d567b23abc68bfa8aa75365ce
Author: Brad King 
AuthorDate: Wed Jul 20 11:26:55 2016 -0400
Commit: Brad King 
CommitDate: Thu Jul 21 11:05:22 2016 -0400

VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for object libraries

Teach Visual Studio generators to include object files from object
libraries in the list of objects whose symbols are to be exported.
The Makefile and Ninja generators already did this.  Update the
test to cover this case.

Reported-by: Bertrand Bellenot 

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx 
b/Source/cmGlobalVisualStudioGenerator.cxx
index 1bec581..7bdd74d 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -827,6 +827,7 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand(
 cmSystemTools::Error("could not open ", objs_file.c_str());
 return;
   }
+  std::vector objs;
   for (std::vector::const_iterator it =
  objectSources.begin();
it != objectSources.end(); ++it) {
@@ -836,6 +837,12 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand(
 // It must exist because we populated the mapping just above.
 assert(!map_it->second.empty());
 std::string objFile = obj_dir + map_it->second;
+objs.push_back(objFile);
+  }
+  gt->UseObjectLibraries(objs, configName);
+  for (std::vector::iterator it = objs.begin(); it != objs.end();
+   ++it) {
+std::string objFile = *it;
 // replace $(ConfigurationName) in the object names
 cmSystemTools::ReplaceString(objFile, this->GetCMakeCFGIntDir(),
  configName.c_str());
diff --git a/Tests/RunCMake/AutoExportDll/AutoExport.cmake 
b/Tests/RunCMake/AutoExportDll/AutoExport.cmake
index bdddb38..d37e896 100644
--- a/Tests/RunCMake/AutoExportDll/AutoExport.cmake
+++ b/Tests/RunCMake/AutoExportDll/AutoExport.cmake
@@ -2,7 +2,9 @@ project(autoexport)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${autoexport_BINARY_DIR}/bin)
 add_subdirectory(sub)
-add_library(autoexport SHARED hello.cxx world.cxx foo.c)
+add_library(objlib OBJECT objlib.c)
+set_property(TARGET objlib PROPERTY POSITION_INDEPENDENT_CODE 1)
+add_library(autoexport SHARED hello.cxx world.cxx foo.c 
$)
 
 add_executable(say say.cxx)
 if(MSVC)
diff --git a/Tests/RunCMake/AutoExportDll/objlib.c 
b/Tests/RunCMake/AutoExportDll/objlib.c
new file mode 100644
index 000..54a9658
--- /dev/null
+++ b/Tests/RunCMake/AutoExportDll/objlib.c
@@ -0,0 +1,4 @@
+int objlib()
+{
+  return 7;
+}
diff --git a/Tests/RunCMake/AutoExportDll/say.cxx 
b/Tests/RunCMake/AutoExportDll/say.cxx
index 9ca8d31..e966b1f 100644
--- a/Tests/RunCMake/AutoExportDll/say.cxx
+++ b/Tests/RunCMake/AutoExportDll/say.cxx
@@ -11,6 +11,7 @@ extern "C" {
 int WINAPI foo();
 // test regular C
 int bar();
+int objlib();
 }
 
 // test c++ functions
@@ -39,6 +40,7 @@ int main()
   foo();
   printf("\n");
   bar();
+  objlib();
   printf("\n");
   return 0;
 }

---

Summary of changes:


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-952-g88ffcdd

2016-07-21 Thread 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  88ffcdd31eb075e4ae6f21a2af33e73a5520c570 (commit)
   via  cfb5d446180c6f1772f177d2b81f5b39f171e0bf (commit)
  from  1443db369652a44978546d74b70392c4ccde940b (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88ffcdd31eb075e4ae6f21a2af33e73a5520c570
commit 88ffcdd31eb075e4ae6f21a2af33e73a5520c570
Merge: 1443db3 cfb5d44
Author: Brad King 
AuthorDate: Thu Jul 21 11:05:17 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 11:05:17 2016 -0400

Merge topic 'windows-export-all-fix-objlib' into next

cfb5d446 fixup! VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for object libraries


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfb5d446180c6f1772f177d2b81f5b39f171e0bf
commit cfb5d446180c6f1772f177d2b81f5b39f171e0bf
Author: Brad King 
AuthorDate: Thu Jul 21 11:05:08 2016 -0400
Commit: Brad King 
CommitDate: Thu Jul 21 11:05:08 2016 -0400

fixup! VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for object libraries

diff --git a/Tests/RunCMake/AutoExportDll/AutoExport.cmake 
b/Tests/RunCMake/AutoExportDll/AutoExport.cmake
index dd74a4d..d37e896 100644
--- a/Tests/RunCMake/AutoExportDll/AutoExport.cmake
+++ b/Tests/RunCMake/AutoExportDll/AutoExport.cmake
@@ -3,6 +3,7 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${autoexport_BINARY_DIR}/bin)
 add_subdirectory(sub)
 add_library(objlib OBJECT objlib.c)
+set_property(TARGET objlib PROPERTY POSITION_INDEPENDENT_CODE 1)
 add_library(autoexport SHARED hello.cxx world.cxx foo.c 
$)
 
 add_executable(say say.cxx)

---

Summary of changes:
 Tests/RunCMake/AutoExportDll/AutoExport.cmake |1 +
 1 file changed, 1 insertion(+)


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-950-g1443db3

2016-07-21 Thread 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  1443db369652a44978546d74b70392c4ccde940b (commit)
   via  850764fc701ce9e1190d5bb20af97ec511763f0b (commit)
   via  e297e0455eb50243197bfe2f4f0594971ba9aab0 (commit)
   via  f639fd8c5f78950638ee0142685faacff58b57d4 (commit)
   via  a4498cc9aedcbd9833e23e3c52d0a39f6de19b86 (commit)
  from  065fed946d82bf349df37ddc069e54f6297cc17e (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1443db369652a44978546d74b70392c4ccde940b
commit 1443db369652a44978546d74b70392c4ccde940b
Merge: 065fed9 850764f
Author: Brad King 
AuthorDate: Thu Jul 21 10:41:07 2016 -0400
Commit: Brad King 
CommitDate: Thu Jul 21 10:41:07 2016 -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/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.0-945-g065fed9

2016-07-21 Thread Nils Gladitz 
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  065fed946d82bf349df37ddc069e54f6297cc17e (commit)
   via  4c52c4c24d9cd809546c309f7f41e3b43cf55169 (commit)
   via  811bcf543ceb04f72d0127ac42b7b198be4791dc (commit)
  from  c4b65e3e67d9e3a23060a0b7352a1845846ea1ae (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=065fed946d82bf349df37ddc069e54f6297cc17e
commit 065fed946d82bf349df37ddc069e54f6297cc17e
Merge: c4b65e3 4c52c4c
Author: Nils Gladitz 
AuthorDate: Thu Jul 21 10:40:04 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 10:40:04 2016 -0400

Merge topic 'wix-disabled-components' into next

4c52c4c2 CPackWIX: Support CPACK_COMPONENT__DISABLED
811bcf54 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c52c4c24d9cd809546c309f7f41e3b43cf55169
commit 4c52c4c24d9cd809546c309f7f41e3b43cf55169
Author: Michael Stürmer 
AuthorDate: Thu Jul 21 16:34:35 2016 +0200
Commit: Nils Gladitz 
CommitDate: Thu Jul 21 16:38:24 2016 +0200

CPackWIX: Support CPACK_COMPONENT__DISABLED

Reviewed-by: Nils Gladitz 

diff --git a/Help/release/dev/wix-disabled-components.rst 
b/Help/release/dev/wix-disabled-components.rst
new file mode 100644
index 000..ac37bc7
--- /dev/null
+++ b/Help/release/dev/wix-disabled-components.rst
@@ -0,0 +1,5 @@
+wix-disabled-components
+---
+
+* The CPack WIX generator now supports CPACK_COMPONENT__DISABLED.
+  This can be used to deselect a component from being installed by default.
diff --git a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx 
b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx
index 16dd0ab..1747b62 100644
--- a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx
@@ -86,6 +86,10 @@ void cmWIXFeaturesSourceWriter::EmitFeatureForComponent(
 AddAttribute("Display", "hidden");
   }
 
+  if (component.IsDisabledByDefault) {
+AddAttribute("Level", "2");
+  }
+
   EndElement("Feature");
 }
 

---

Summary of changes:
 Help/release/dev/wix-disabled-components.rst   |5 +
 Source/CMakeVersion.cmake  |2 +-
 Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx |4 
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/wix-disabled-components.rst


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

[Cmake-commits] CMake branch, master, updated. v3.6.0-458-gf639fd8

2016-07-21 Thread 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  f639fd8c5f78950638ee0142685faacff58b57d4 (commit)
   via  7ec32a00d74bca7ff1a4873c8133b4811edc7bba (commit)
  from  a4498cc9aedcbd9833e23e3c52d0a39f6de19b86 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f639fd8c5f78950638ee0142685faacff58b57d4
commit f639fd8c5f78950638ee0142685faacff58b57d4
Merge: a4498cc 7ec32a0
Author: Brad King 
AuthorDate: Thu Jul 21 10:39:04 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 10:39:04 2016 -0400

Merge topic 'bootstrap-msys2'

7ec32a00 bootstrap: Add support for MSYS2


---

Summary of changes:
 bootstrap |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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

[Cmake-commits] CMake branch, master, updated. v3.6.0-456-ga4498cc

2016-07-21 Thread 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  a4498cc9aedcbd9833e23e3c52d0a39f6de19b86 (commit)
   via  e9849d35aa612bc49667a9db7dadc30f87653783 (commit)
   via  51d9e8ae3ecd1f188fe236a25b810597edf30af7 (commit)
   via  9ef2b2b164a92081bf3466af9ac0d0c28acae79d (commit)
  from  811bcf543ceb04f72d0127ac42b7b198be4791dc (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4498cc9aedcbd9833e23e3c52d0a39f6de19b86
commit a4498cc9aedcbd9833e23e3c52d0a39f6de19b86
Merge: 811bcf5 e9849d3
Author: Brad King 
AuthorDate: Thu Jul 21 10:39:01 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 10:39:01 2016 -0400

Merge topic 'update-kwsys'

e9849d35 bootstrap: Add check for ext/stdio_filebuf.h needed by KWSys
51d9e8ae Merge branch 'upstream-KWSys' into update-kwsys
9ef2b2b1 KWSys 2016-07-19 (9d1dbd95)


---

Summary of changes:
 Source/kwsys/CMakeLists.txt|5 +
 Source/kwsys/Configure.hxx.in  |7 +-
 Source/kwsys/FStream.hxx.in|  234 ++--
 Source/kwsys/kwsysPlatformTestsCXX.cxx |5 +
 bootstrap  |   11 ++
 5 files changed, 190 insertions(+), 72 deletions(-)


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

[Cmake-commits] CMake branch, master, updated. v3.6.0-462-g850764f

2016-07-21 Thread 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  850764fc701ce9e1190d5bb20af97ec511763f0b (commit)
   via  8aa97fba9eb5d54d7141895c1db1ed8afe820d75 (commit)
  from  e297e0455eb50243197bfe2f4f0594971ba9aab0 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=850764fc701ce9e1190d5bb20af97ec511763f0b
commit 850764fc701ce9e1190d5bb20af97ec511763f0b
Merge: e297e04 8aa97fb
Author: Brad King 
AuthorDate: Thu Jul 21 10:39:10 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 10:39:10 2016 -0400

Merge topic 'vs-alternate-RootNamespace'

8aa97fba VS: Handle VS_GLOBAL_RootNamespace special case


---

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


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

[Cmake-commits] CMake branch, master, updated. v3.6.0-460-ge297e04

2016-07-21 Thread 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  e297e0455eb50243197bfe2f4f0594971ba9aab0 (commit)
   via  1296a0eadae05acb03f1313242f937b785a9bcc3 (commit)
  from  f639fd8c5f78950638ee0142685faacff58b57d4 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e297e0455eb50243197bfe2f4f0594971ba9aab0
commit e297e0455eb50243197bfe2f4f0594971ba9aab0
Merge: f639fd8 1296a0e
Author: Brad King 
AuthorDate: Thu Jul 21 10:39:07 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 10:39:07 2016 -0400

Merge topic 'ninja-target-deps'

1296a0ea Ninja: Fix inter-target order-only dependencies of custom commands


---

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx  |   38 
 Source/cmGlobalNinjaGenerator.h|   11 ++
 Source/cmLocalNinjaGenerator.cxx   |5 +--
 .../RunCMake/add_custom_target/RunCMakeTest.cmake  |   14 
 Tests/RunCMake/add_custom_target/TargetOrder.cmake |   31 
 5 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 Tests/RunCMake/add_custom_target/TargetOrder.cmake


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-942-gc4b65e3

2016-07-21 Thread 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  c4b65e3e67d9e3a23060a0b7352a1845846ea1ae (commit)
   via  11768733d321df55b0efcb70b278c71b8e216cf7 (commit)
  from  f2049beeb1459e131f10cd94ac09abbd0529094e (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4b65e3e67d9e3a23060a0b7352a1845846ea1ae
commit c4b65e3e67d9e3a23060a0b7352a1845846ea1ae
Merge: f2049be 1176873
Author: Brad King 
AuthorDate: Thu Jul 21 10:08:21 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 10:08:21 2016 -0400

Merge topic 'nsis-protect-uninst-exec' into next

11768733 NSIS: Quote uninstaller path when executing it in a shell


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11768733d321df55b0efcb70b278c71b8e216cf7
commit 11768733d321df55b0efcb70b278c71b8e216cf7
Author: Justin Clift 
AuthorDate: Fri Jul 15 14:18:37 2016 +0100
Commit: Brad King 
CommitDate: Thu Jul 21 10:05:46 2016 -0400

NSIS: Quote uninstaller path when executing it in a shell

Protect our `$0` reference in the shell as `"$0"`.  Otherwise it works
with a space in the path only due to an insecure Windows feature.

Prior to this fix, any installer using the option added by commit
v2.8.9~234^2 (Added CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL,
2011-06-11) exposes a local privilege escalation vulnerability.

Reported-by: Amir Szekely 
Reported-by: Ug_0 Security

diff --git a/Help/release/3.6.rst b/Help/release/3.6.rst
index 771c9dd..144537d 100644
--- a/Help/release/3.6.rst
+++ b/Help/release/3.6.rst
@@ -308,3 +308,9 @@ Other Changes
   preferred future use is upper cased component names in variables.
   New variables that will be added to CPackRPM in later versions
   will only support upper cased component variable format.
+
+* The CPack NSIS generator's configuration file template was fixed to
+  quote the path to the uninstaller tool used by the
+  :variable:`CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL` option.
+  This avoids depending on an insecure Windows feature to run an
+  uninstaller tool with a space in the path.
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 1ef3d28..92a3142 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -920,7 +920,7 @@ uninst:
   ClearErrors
   StrLen $2 "\Uninstall.exe"
   StrCpy $3 $0 -$2 # remove "\Uninstall.exe" from UninstallString to get path
-  ExecWait '$0 _?=$3' ;Do not copy the uninstaller to a temp file
+  ExecWait '"$0" _?=$3' ;Do not copy the uninstaller to a temp file
 
   IfErrors uninst_failed inst
 uninst_failed:

---

Summary of changes:


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-940-gf2049be

2016-07-21 Thread 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  f2049beeb1459e131f10cd94ac09abbd0529094e (commit)
   via  86353043c7772dce08e170ad6f21be1a2b56c0eb (commit)
  from  02acec06c0766f3922619e2bcc5c88f4cf512a73 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2049beeb1459e131f10cd94ac09abbd0529094e
commit f2049beeb1459e131f10cd94ac09abbd0529094e
Merge: 02acec0 8635304
Author: Brad King 
AuthorDate: Thu Jul 21 09:54:36 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 09:54:36 2016 -0400

Merge topic 'nsis-protect-uninst-exec' into next

86353043 NSIS: Quote uninstaller path when executing it in a shell


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86353043c7772dce08e170ad6f21be1a2b56c0eb
commit 86353043c7772dce08e170ad6f21be1a2b56c0eb
Author: Justin Clift 
AuthorDate: Fri Jul 15 14:18:37 2016 +0100
Commit: Brad King 
CommitDate: Thu Jul 21 09:53:52 2016 -0400

NSIS: Quote uninstaller path when executing it in a shell

Protect our `$0` reference in the shell as `"$0"`.  Otherwise it works
with a space in the path only due to an insecure Windows feature.

Reported-by: Amir Szekely 
Reported-by: Ug_0 Security

diff --git a/Help/release/3.6.rst b/Help/release/3.6.rst
index 771c9dd..144537d 100644
--- a/Help/release/3.6.rst
+++ b/Help/release/3.6.rst
@@ -308,3 +308,9 @@ Other Changes
   preferred future use is upper cased component names in variables.
   New variables that will be added to CPackRPM in later versions
   will only support upper cased component variable format.
+
+* The CPack NSIS generator's configuration file template was fixed to
+  quote the path to the uninstaller tool used by the
+  :variable:`CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL` option.
+  This avoids depending on an insecure Windows feature to run an
+  uninstaller tool with a space in the path.
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 1ef3d28..92a3142 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -920,7 +920,7 @@ uninst:
   ClearErrors
   StrLen $2 "\Uninstall.exe"
   StrCpy $3 $0 -$2 # remove "\Uninstall.exe" from UninstallString to get path
-  ExecWait '$0 _?=$3' ;Do not copy the uninstaller to a temp file
+  ExecWait '"$0" _?=$3' ;Do not copy the uninstaller to a temp file
 
   IfErrors uninst_failed inst
 uninst_failed:

---

Summary of changes:
 Help/release/3.6.rst |6 ++
 1 file changed, 6 insertions(+)


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

[Cmake-commits] CMake branch, next, updated. v3.6.0-938-g02acec0

2016-07-21 Thread 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  02acec06c0766f3922619e2bcc5c88f4cf512a73 (commit)
   via  5e55d87bdc4d14507fec2bae7a41f3fb9498db1a (commit)
  from  41da93010df18cb1ecec68c9334305d1bdfb77f6 (commit)

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

- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02acec06c0766f3922619e2bcc5c88f4cf512a73
commit 02acec06c0766f3922619e2bcc5c88f4cf512a73
Merge: 41da930 5e55d87
Author: Brad King 
AuthorDate: Thu Jul 21 09:42:13 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Thu Jul 21 09:42:13 2016 -0400

Merge topic 'revert-autogen-subdirs' into next

5e55d87b Autogen: Revert changes to generate moc/rcc in subdirectories


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e55d87bdc4d14507fec2bae7a41f3fb9498db1a
commit 5e55d87bdc4d14507fec2bae7a41f3fb9498db1a
Author: Brad King 
AuthorDate: Thu Jul 21 09:08:43 2016 -0400
Commit: Brad King 
CommitDate: Thu Jul 21 09:27:19 2016 -0400

Autogen: Revert changes to generate moc/rcc in subdirectories

Revert these commits:

* v3.6.0-rc1~134^2
  Tests: QtAutogen: Same source name in different directories test, 
2016-04-13
* v3.6.0-rc1~134^2~1
  Autogen: Generate qrc_NAME.cpp files in subdirectories, 2016-04-19
* v3.6.0-rc1~134^2~2
  Autogen: Generate not included moc files in subdirectories, 2016-04-19

They regress existing builds that depend on the paths/symbols generated
previously.  Another approach will be needed to solve the name collision
problem they were intended to solve.  Leave the error diagnostics for
the colliding cases that were added in the same topic as the above
commits because they provide a useful early failure in relevant cases.

Fixes #16209.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx 
b/Source/cmQtAutoGeneratorInitializer.cxx
index dd19760..70c8a65 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -25,79 +25,6 @@
 #include "cmGlobalVisualStudioGenerator.h"
 #endif
 
-static std::string GetAutogenTargetName(cmGeneratorTarget const* target)
-{
-  std::string autogenTargetName = target->GetName();
-  autogenTargetName += "_automoc";
-  return autogenTargetName;
-}
-
-static std::string GetAutogenTargetDir(cmGeneratorTarget const* target)
-{
-  cmMakefile* makefile = target->Target->GetMakefile();
-  std::string targetDir = makefile->GetCurrentBinaryDirectory();
-  targetDir += makefile->GetCMakeInstance()->GetCMakeFilesDirectory();
-  targetDir += "/";
-  targetDir += GetAutogenTargetName(target);
-  targetDir += ".dir/";
-  return targetDir;
-}
-
-static std::string GetAutogenTargetBuildDir(cmGeneratorTarget const* target)
-{
-  cmMakefile* makefile = target->Target->GetMakefile();
-  std::string targetDir = makefile->GetCurrentBinaryDirectory();
-  targetDir += "/";
-  targetDir += GetAutogenTargetName(target);
-  targetDir += ".dir/";
-  return targetDir;
-}
-
-static std::string GetSourceRelativePath(cmGeneratorTarget const* target,
- const std::string& fileName)
-{
-  std::string pathRel;
-  // Test if the file is child to any of the known directories
-  {
-const std::string fileNameReal = cmsys::SystemTools::GetRealPath(fileName);
-std::string parentDirectory;
-bool match(false);
-{
-  std::string testDirs[4];
-  {
-cmMakefile* makefile = target->Target->GetMakefile();
-testDirs[0] = makefile->GetCurrentSourceDirectory();
-testDirs[1] = makefile->GetCurrentBinaryDirectory();
-testDirs[2] = makefile->GetHomeDirectory();
-testDirs[3] = makefile->GetHomeOutputDirectory();
-  }
-  for (int ii = 0; ii != sizeof(testDirs) / sizeof(std::string); ++ii) {
-const ::std::string testDir =
-  cmsys::SystemTools::GetRealPath(testDirs[ii]);
-if (!testDir.empty() &&
-cmsys::SystemTools::IsSubDirectory(fileNameReal, testDir)) {
-  parentDirectory = testDir;
-  match = true;
-  break;
-}
-  }
-}
-// Use root as fallback parent directory
-if (!match) {
-  cmsys::SystemTools::SplitPathRootComponent(fileNameReal,
- );
-}
-pathRel = cmsys::SystemTools::RelativePath(
-  parentDirectory, cmsys::SystemTools::GetParentDirectory(fileNameReal));
-  }
-  // Sanitize relative path
-  if (!pathRel.empty()) {
-pathRel += '/';
-