[Cmake-commits] CMake branch, next, updated. v3.7.1-1928-gf14f487

2017-01-09 Thread Domen Vrankar 
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  f14f4875429bcc4445ec06328f42d3243bd36892 (commit)
   via  adbf72280d1eb823402c4cc7f2c27ec0ef16062a (commit)
   via  aff368bb8456694e2550e2f69451456728ab31eb (commit)
  from  8dc707a2ffd830f95271275808b645a372e7cebd (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=f14f4875429bcc4445ec06328f42d3243bd36892
commit f14f4875429bcc4445ec06328f42d3243bd36892
Merge: 8dc707a adbf722
Author: Domen Vrankar 
AuthorDate: Tue Jan 10 02:41:09 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 10 02:41:09 2017 -0500

Merge topic 'cpack-test-extra-std-out-err-file-overloads' into next

adbf7228 CPack test additional std out/err regex file overloads
aff368bb CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adbf72280d1eb823402c4cc7f2c27ec0ef16062a
commit adbf72280d1eb823402c4cc7f2c27ec0ef16062a
Author: Domen Vrankar 
AuthorDate: Fri Dec 23 23:26:45 2016 +0100
Commit: Domen Vrankar 
CommitDate: Tue Jan 10 08:40:16 2017 +0100

CPack test additional std out/err regex file overloads

Added std out/std err expected regex file name
overloads for packaging type.

diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake 
b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index 89da610..f883c69 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -60,7 +60,11 @@ function(run_cpack_test_common_ TEST_NAME types build 
SUBTEST_SUFFIX source PACK
   )
 
 foreach(o out err)
-  if(SUBTEST_SUFFIX AND EXISTS 
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+  if(SUBTEST_SUFFIX AND EXISTS 
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+set(RunCMake-std${o}-file 
"tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
+  elseif(EXISTS 
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt)
+set(RunCMake-std${o}-file 
"tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt")
+  elseif(SUBTEST_SUFFIX AND EXISTS 
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
 set(RunCMake-std${o}-file 
"tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
   elseif(EXISTS 
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt)
 set(RunCMake-std${o}-file 
"tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt")
diff --git a/Tests/RunCMake/CPack/README.txt b/Tests/RunCMake/CPack/README.txt
index f51d254..7c98f69 100644
--- a/Tests/RunCMake/CPack/README.txt
+++ b/Tests/RunCMake/CPack/README.txt
@@ -155,8 +155,18 @@ VerifyResult.cmake script also automatically prints out 
standard output and
 standard error from CPack execution phase that is compared with
 '/-stdout.txt' regular expression and
 and '/-stderr.txt' regular expresson respectively.
-NOTE: For subtests generator name can also be suffixed with subtest name and in
-  such case subtest file is preferred.
+NOTE: For subtests generator name can also be suffixed with subtest name and/or
+  packaging type (MONOLITHIC, COMPONENT, GROUP) and in such cases the
+  preferences of which file will be used are as follows:
+- generator name + packaging type + subtest name
+- generator name + packaging type
+- generator name + subtest name
+- generator name
+- default generator
+  File name format: 
'---std.txt'
+where  can either be 'out' or 'err'.
+  File name format: '--std.txt'
+where  can either be 'out' or 'err'.
   File name format: '--std.txt' where
  can either be 'out' or 'err'.
 NOTE: If none of the comparison files are present then the default generator
@@ -223,3 +233,4 @@ To add a new generator we must
 - if needed add 'default_expected_std.txt' files where  is either
   'out' or 'err' which will contain default expected output of package
   generation regular expression.
+- add generator to list of other CPack generators in RunCMake/CMakeLists.txt

---

Summary of changes:
 Source/CMakeVersion.cmake   |2 +-
 Tests/RunCMake/CPack/CPackTestHelpers.cmake |6 +-
 Tests/RunCMake/CPack/README.txt |   15 +--

[Cmake-commits] CMake branch, next, updated. v3.7.1-1925-g8dc707a

2017-01-09 Thread Domen Vrankar 
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  8dc707a2ffd830f95271275808b645a372e7cebd (commit)
   via  574c81e28cef6737adc1619ce3b44b43bdcf308b (commit)
  from  1f2f6e07bb430fb36bba3acef474b2ce8e1ceaa2 (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=8dc707a2ffd830f95271275808b645a372e7cebd
commit 8dc707a2ffd830f95271275808b645a372e7cebd
Merge: 1f2f6e0 574c81e
Author: Domen Vrankar 
AuthorDate: Tue Jan 10 02:38:12 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 10 02:38:12 2017 -0500

Merge topic 'cpack-rpm-user-binary-spec-file-fix' into next

574c81e2 CPack/RPM fix - custom binary spec file handling


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=574c81e28cef6737adc1619ce3b44b43bdcf308b
commit 574c81e28cef6737adc1619ce3b44b43bdcf308b
Author: Domen Vrankar 
AuthorDate: Tue Jan 10 08:37:14 2017 +0100
Commit: Domen Vrankar 
CommitDate: Tue Jan 10 08:37:14 2017 +0100

CPack/RPM fix - custom binary spec file handling

Fixes #16507

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 0640630..673aaea 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2269,8 +2269,8 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
 # We should generate a USER spec file template:
 #  - either because the user asked for it : 
CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE
 #  - or the user did not provide one : NOT CPACK_RPM_USER_BINARY_SPECFILE
+set(RPMBUILD_FLAGS "-bb")
 if(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT 
CPACK_RPM_USER_BINARY_SPECFILE)
-  set(RPMBUILD_FLAGS "-bb")
 
   file(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
 "# -*- rpm-spec -*-

---

Summary of changes:
 Modules/CPackRPM.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.7.1-1923-g1f2f6e0

2017-01-09 Thread Domen Vrankar 
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  1f2f6e07bb430fb36bba3acef474b2ce8e1ceaa2 (commit)
   via  23435daa22f650a1a6509025fb2d38e8714f8ceb (commit)
   via  9a0bf4d558cfd16917d2cb5c41a754740f159c98 (commit)
   via  d9775228dabb1424d2f8d1a250c5a0e6ffad47b1 (commit)
  from  18e54de628127ac7dd948f473db3977c350c4bca (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=1f2f6e07bb430fb36bba3acef474b2ce8e1ceaa2
commit 1f2f6e07bb430fb36bba3acef474b2ce8e1ceaa2
Merge: 18e54de 23435da
Author: Domen Vrankar 
AuthorDate: Tue Jan 10 02:31:41 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 10 02:31:41 2017 -0500

Merge topic 'cpack-rpm-user-bin-spec-file-fix' into next

23435daa Revert "CPack/RPM fix - custom binary spec file handling"
9a0bf4d5 Revert "CPack test additional std out/err regex file overloads"
d9775228 Revert "CPack/RPM test - custom binary spec file handling"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23435daa22f650a1a6509025fb2d38e8714f8ceb
commit 23435daa22f650a1a6509025fb2d38e8714f8ceb
Author: Domen Vrankar 
AuthorDate: Tue Jan 10 08:28:17 2017 +0100
Commit: Domen Vrankar 
CommitDate: Tue Jan 10 08:28:17 2017 +0100

Revert "CPack/RPM fix - custom binary spec file handling"

This reverts commit e0bfd3f4f565ea936f665a461380079573521916.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index e1bcb48..5021c41 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2470,12 +2470,11 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
   endforeach()
 endif()
 
-set(RPMBUILD_FLAGS "-bb")
-
 # We should generate a USER spec file template:
 #  - either because the user asked for it : 
CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE
 #  - or the user did not provide one : NOT CPACK_RPM_USER_BINARY_SPECFILE
 if(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT 
CPACK_RPM_USER_BINARY_SPECFILE)
+  set(RPMBUILD_FLAGS "-bb")
 
   file(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
 "# -*- rpm-spec -*-

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a0bf4d558cfd16917d2cb5c41a754740f159c98
commit 9a0bf4d558cfd16917d2cb5c41a754740f159c98
Author: Domen Vrankar 
AuthorDate: Tue Jan 10 08:28:16 2017 +0100
Commit: Domen Vrankar 
CommitDate: Tue Jan 10 08:28:16 2017 +0100

Revert "CPack test additional std out/err regex file overloads"

This reverts commit 4ce8a4d0a18702cf228beaa6a9ecc7b38e355751.

diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake 
b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index f883c69..89da610 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -60,11 +60,7 @@ function(run_cpack_test_common_ TEST_NAME types build 
SUBTEST_SUFFIX source PACK
   )
 
 foreach(o out err)
-  if(SUBTEST_SUFFIX AND EXISTS 
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
-set(RunCMake-std${o}-file 
"tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
-  elseif(EXISTS 
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt)
-set(RunCMake-std${o}-file 
"tests/${TEST_NAME}/${TEST_TYPE}-${PACKAGING_TYPE}-std${o}.txt")
-  elseif(SUBTEST_SUFFIX AND EXISTS 
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
+  if(SUBTEST_SUFFIX AND EXISTS 
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt)
 set(RunCMake-std${o}-file 
"tests/${TEST_NAME}/${TEST_TYPE}-${SUBTEST_SUFFIX}-std${o}.txt")
   elseif(EXISTS 
${RunCMake_SOURCE_DIR}/tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt)
 set(RunCMake-std${o}-file 
"tests/${TEST_NAME}/${TEST_TYPE}-std${o}.txt")
diff --git a/Tests/RunCMake/CPack/README.txt b/Tests/RunCMake/CPack/README.txt
index 7c98f69..f51d254 100644
--- a/Tests/RunCMake/CPack/README.txt
+++ b/Tests/RunCMake/CPack/README.txt
@@ -155,18 +155,8 @@ VerifyResult.cmake script also automatically prints out 
standard output and
 standard error from CPack execution phase that is compared with
 '/-stdout.txt' regular expression and
 and '/-stderr.txt' regular expresson respectively.
-NOTE: For subtests generator name can also be suffixed with subtest name and/or
-  packaging type (MONOLITHIC, COMPONENT, GROUP) and in such

[Cmake-commits] CMake branch, next, updated. v3.7.1-1919-g18e54de

2017-01-09 Thread Domen Vrankar 
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  18e54de628127ac7dd948f473db3977c350c4bca (commit)
   via  699ce812f43553bb6b6732141d62e77716ad8726 (commit)
   via  4ce8a4d0a18702cf228beaa6a9ecc7b38e355751 (commit)
   via  e0bfd3f4f565ea936f665a461380079573521916 (commit)
  from  2d08b225f78c13781887dc26ff3a3ce621394262 (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=18e54de628127ac7dd948f473db3977c350c4bca
commit 18e54de628127ac7dd948f473db3977c350c4bca
Merge: 2d08b22 699ce81
Author: Domen Vrankar 
AuthorDate: Tue Jan 10 02:25:10 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Tue Jan 10 02:25:10 2017 -0500

Merge topic 'cpack-rpm-user-bin-spec-file-fix' into next

699ce812 CPack/RPM test - custom binary spec file handling
4ce8a4d0 CPack test additional std out/err regex file overloads
e0bfd3f4 CPack/RPM fix - custom binary spec file handling


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=699ce812f43553bb6b6732141d62e77716ad8726
commit 699ce812f43553bb6b6732141d62e77716ad8726
Author: Domen Vrankar 
AuthorDate: Mon Jan 9 21:08:47 2017 +0100
Commit: Domen Vrankar 
CommitDate: Mon Jan 9 21:10:16 2017 +0100

CPack/RPM test - custom binary spec file handling

diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake 
b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 3077340..d550ec7 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -4,6 +4,7 @@ include(RunCMake)
 include("${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake")
 
 # run_cpack_test args: TEST_NAME "GENERATORS" RUN_CMAKE_BUILD_STEP 
"PACKAGING_TYPES"
+run_cpack_test(CUSTOM_BINARY_SPEC_FILE "RPM" false "MONOLITHIC;COMPONENT")
 run_cpack_test(CUSTOM_NAMES "RPM;DEB" true "COMPONENT")
 run_cpack_test(DEBUGINFO "RPM" true "COMPONENT")
 run_cpack_test(DEPENDENCIES "RPM;DEB" true "COMPONENT")
diff --git 
a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake 
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
new file mode 100644
index 000..694dc00
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake
@@ -0,0 +1,9 @@
+set(EXPECTED_FILES_COUNT "1")
+set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt")
+
+if(PACKAGING_TYPE STREQUAL "COMPONENT")
+  set(EXPECTED_FILES_COUNT "2")
+  set(EXPECTED_FILE_1_COMPONENT "test")
+  set(EXPECTED_FILE_2_COMPONENT "test2")
+  set(EXPECTED_FILE_CONTENT_2_LIST "/usr;/usr/bar;/usr/bar/CMakeLists.txt")
+endif()
diff --git 
a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt 
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
new file mode 100644
index 000..e6d86d0
--- /dev/null
+++ 
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt
@@ -0,0 +1,2 @@
+^CPackRPM: Will use USER specified spec file: 
(/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
+CPackRPM: Will use GENERATED spec 
file:.*/Tests/RunCMake/RPM/CPack/CUSTOM_BINARY_SPEC_FILE-build/_CPack_Packages/.*/RPM/SPECS/custom_binary_spec_file-test2\.spec$
diff --git 
a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt 
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
new file mode 100644
index 000..d7bb7af
--- /dev/null
+++ 
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt
@@ -0,0 +1 @@
+CPackRPM: Will use USER specified spec file: 
(/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in 
b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
new file mode 100644
index 000..db0ac6f
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in
@@ -0,0 +1,80 @@
+# -*- rpm-spec -*-
+BuildRoot:  
%_topdir/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@
+Summary:@CPACK_RPM_PACKAGE_SUMMARY@
+Name:   @CPACK_RPM_PACKAGE_NAME@
+Version:@CPACK_RPM_PACKAGE_VERSION@
+Release:@CPACK_RPM_PACKAGE_RELEASE@
+License:@CPACK_RPM_PACKAGE_LICENSE@
+Group:  @CPACK_RPM_PACKAGE_GROUP@
+Vendor: @CPACK_RPM_PACKAGE_VENDOR@
+
+@TMP_RPM_URL@
+@TMP_RPM_REQUIRES@
+@TMP_RPM_REQUIRES_PRE@
+@TMP_RPM_REQUIRES_POST@
+@TMP_RPM_REQUIRES_PREUN@
+@TMP_RPM_REQUIRES_POSTUN@
+@TMP_RPM_PROVIDES@
+@TMP_RPM_OBSOLETES@
+@TMP_RPM_CONFLICTS@
+@TMP_RPM_SUGGESTS@

[Cmake-commits] CMake branch, master, updated. v3.7.1-941-gaff368b

2017-01-09 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  aff368bb8456694e2550e2f69451456728ab31eb (commit)
  from  eee51e24d2290771ad3dded566ef897243f21331 (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=aff368bb8456694e2550e2f69451456728ab31eb
commit aff368bb8456694e2550e2f69451456728ab31eb
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Tue Jan 10 00:01:04 2017 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Jan 10 00:01:04 2017 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 6b0bfe4..7a2482a 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 7)
-set(CMake_VERSION_PATCH 20170109)
+set(CMake_VERSION_PATCH 20170110)
 #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.7.1-1915-g2d08b22

2017-01-09 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  2d08b225f78c13781887dc26ff3a3ce621394262 (commit)
   via  c6c976f2c2a3e6503fff3bc77c9f7b8c61cd7e0b (commit)
  from  73b458473d4bf8001037b9605543b03099d0c481 (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=2d08b225f78c13781887dc26ff3a3ce621394262
commit 2d08b225f78c13781887dc26ff3a3ce621394262
Merge: 73b4584 c6c976f
Author: Brad King 
AuthorDate: Mon Jan 9 16:46:30 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:46:30 2017 -0500

Merge topic 'codeblocks-nmake-makefiles-jom' into next

c6c976f2 Revert "Allow CodeBlocks for NMake Makefiles JOM"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6c976f2c2a3e6503fff3bc77c9f7b8c61cd7e0b
commit c6c976f2c2a3e6503fff3bc77c9f7b8c61cd7e0b
Author: Brad King 
AuthorDate: Mon Jan 9 16:46:22 2017 -0500
Commit: Brad King 
CommitDate: Mon Jan 9 16:46:22 2017 -0500

Revert "Allow CodeBlocks for NMake Makefiles JOM"

This reverts commit 78c5db6a0ad90eec54958e06e7b9dcac9b6cc8ab.

diff --git a/Help/generator/CodeBlocks.rst b/Help/generator/CodeBlocks.rst
index d03cb0c..01798c7 100644
--- a/Help/generator/CodeBlocks.rst
+++ b/Help/generator/CodeBlocks.rst
@@ -18,9 +18,6 @@ This "extra" generator may be specified as:
 ``CodeBlocks - NMake Makefiles``
  Generate with :generator:`NMake Makefiles`.
 
-``CodeBlocks - NMake Makefiles JOM``
- Generate with :generator:`NMake Makefiles JOM`.
-
 ``CodeBlocks - Ninja``
  Generate with :generator:`Ninja`.
 
diff --git a/Help/release/3.7.rst b/Help/release/3.7.rst
index e42ce48..4c51af4 100644
--- a/Help/release/3.7.rst
+++ b/Help/release/3.7.rst
@@ -46,9 +46,6 @@ Generators
   :variable:`CMAKE_CODELITE_USE_TARGETS` option
   to change project creation from projects to targets.
 
-* The :generator:`CodeBlocks` now can generate with
-  :generator:`NMake Makefiles JOM`.
-
 Commands
 
 
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx 
b/Source/cmExtraCodeBlocksGenerator.cxx
index bc81a6a..18c732d 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -49,7 +49,6 @@ cmExtraCodeBlocksGenerator::GetFactory()
 #if defined(_WIN32)
 factory.AddSupportedGlobalGenerator("MinGW Makefiles");
 factory.AddSupportedGlobalGenerator("NMake Makefiles");
-factory.AddSupportedGlobalGenerator("NMake Makefiles JOM");
 // disable until somebody actually tests it:
 // this->AddSupportedGlobalGenerator("MSYS Makefiles");
 #endif
@@ -744,7 +743,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
   }
 
   std::string generator = this->GlobalGenerator->GetName();
-  if (generator == "NMake Makefiles" || generator == "NMake Makefiles JOM") {
+  if (generator == "NMake Makefiles") {
 // For Windows ConvertToOutputPath already adds quotes when required.
 // These need to be escaped, see
 // https://gitlab.kitware.com/cmake/cmake/issues/13952

---

Summary of changes:
 Help/generator/CodeBlocks.rst |3 ---
 Help/release/3.7.rst  |3 ---
 Source/cmExtraCodeBlocksGenerator.cxx |3 +--
 3 files changed, 1 insertion(+), 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, next, updated. v3.7.1-1913-g73b4584

2017-01-09 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  73b458473d4bf8001037b9605543b03099d0c481 (commit)
   via  0471d13ecd2ff4d4a0e824a1b1d0d850ea070d05 (commit)
   via  c0bd1eb6d0da40d429120e925aa755a1f5a754e8 (commit)
  from  a2773b1709e7c853512981039144ed53e3ef802f (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=73b458473d4bf8001037b9605543b03099d0c481
commit 73b458473d4bf8001037b9605543b03099d0c481
Merge: a2773b1 0471d13
Author: Brad King 
AuthorDate: Mon Jan 9 16:41:53 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:41:53 2017 -0500

Merge topic 'cmake-server-do-not-crash-on-interface-lib-for-master' into 
next

0471d13e Merge branch 'cmake-server-do-not-crash-on-interface-lib' into 
cmake-server-do-not-crash-on-interface-lib-for-master
c0bd1eb6 server-mode: Do not crash when running into INTERFACE_LIBRARY


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0471d13ecd2ff4d4a0e824a1b1d0d850ea070d05
commit 0471d13ecd2ff4d4a0e824a1b1d0d850ea070d05
Merge: c0bd1eb 33e628e
Author: Brad King 
AuthorDate: Mon Jan 9 16:41:32 2017 -0500
Commit: Brad King 
CommitDate: Mon Jan 9 16:41:32 2017 -0500

Merge branch 'cmake-server-do-not-crash-on-interface-lib' into 
cmake-server-do-not-crash-on-interface-lib-for-master


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0bd1eb6d0da40d429120e925aa755a1f5a754e8
commit c0bd1eb6d0da40d429120e925aa755a1f5a754e8
Author: Tobias Hunger 
AuthorDate: Fri Jan 6 15:18:52 2017 +0100
Commit: Brad King 
CommitDate: Mon Jan 9 16:40:46 2017 -0500

server-mode: Do not crash when running into INTERFACE_LIBRARY

Closes: #16539

diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index a86236c..334a05a 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -731,12 +731,16 @@ static Json::Value DumpTarget(cmGeneratorTarget* target,
 
   Json::Value result = Json::objectValue;
   result[kNAME_KEY] = target->GetName();
-
   result[kTYPE_KEY] = typeName;
-  result[kFULL_NAME_KEY] = target->GetFullName(config);
   result[kSOURCE_DIRECTORY_KEY] = lg->GetCurrentSourceDirectory();
   result[kBUILD_DIRECTORY_KEY] = lg->GetCurrentBinaryDirectory();
 
+  if (type == cmStateEnums::INTERFACE_LIBRARY) {
+return result;
+  }
+
+  result[kFULL_NAME_KEY] = target->GetFullName(config);
+
   if (target->HaveWellDefinedOutputFiles()) {
 Json::Value artifacts = Json::arrayValue;
 artifacts.append(target->GetFullPath(config, false));

---

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


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

[Cmake-commits] CMake branch, next, updated. v3.7.1-1910-ga2773b1

2017-01-09 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  a2773b1709e7c853512981039144ed53e3ef802f (commit)
   via  33e628ee809cd1d7ec2a8a0290ac0351fa4d499b (commit)
  from  0e1c33dcb83294825f0f1785895684721f99875b (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=a2773b1709e7c853512981039144ed53e3ef802f
commit a2773b1709e7c853512981039144ed53e3ef802f
Merge: 0e1c33d 33e628e
Author: Brad King 
AuthorDate: Mon Jan 9 16:33:19 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:33:19 2017 -0500

Merge topic 'cmake-server-do-not-crash-on-interface-lib' into next

33e628ee server-mode: Do not crash when running into INTERFACE_LIBRARY


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33e628ee809cd1d7ec2a8a0290ac0351fa4d499b
commit 33e628ee809cd1d7ec2a8a0290ac0351fa4d499b
Author: Tobias Hunger 
AuthorDate: Fri Jan 6 15:18:52 2017 +0100
Commit: Brad King 
CommitDate: Mon Jan 9 16:31:11 2017 -0500

server-mode: Do not crash when running into INTERFACE_LIBRARY

Closes: #16539

diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index e159c8f..c3bffd6 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -720,12 +720,16 @@ static Json::Value DumpTarget(cmGeneratorTarget* target,
 
   Json::Value result = Json::objectValue;
   result[kNAME_KEY] = target->GetName();
-
   result[kTYPE_KEY] = typeName;
-  result[kFULL_NAME_KEY] = target->GetFullName(config);
   result[kSOURCE_DIRECTORY_KEY] = lg->GetCurrentSourceDirectory();
   result[kBUILD_DIRECTORY_KEY] = lg->GetCurrentBinaryDirectory();
 
+  if (type == cmState::INTERFACE_LIBRARY) {
+return result;
+  }
+
+  result[kFULL_NAME_KEY] = target->GetFullName(config);
+
   if (target->HaveWellDefinedOutputFiles()) {
 Json::Value artifacts = Json::arrayValue;
 artifacts.append(target->GetFullPath(config, false));

---

Summary of changes:
 Source/cmServerProtocol.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, master, updated. v3.7.1-938-g4ce6cd2

2017-01-09 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  4ce6cd2bcfa847fe2e9926d97f27be1d89fe1c4b (commit)
   via  88f07fb417a25f98662da2abf09a9db03f48eb7f (commit)
  from  cda3a69b1bcc2e83806f7423c6970a794be8261f (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=4ce6cd2bcfa847fe2e9926d97f27be1d89fe1c4b
commit 4ce6cd2bcfa847fe2e9926d97f27be1d89fe1c4b
Merge: cda3a69 88f07fb
Author: Brad King 
AuthorDate: Mon Jan 9 16:27:28 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:27:28 2017 -0500

Merge topic '15687-revisit-xcode-system-include'

88f07fb4 Xcode: Properly mark SYSTEM includes as such


---

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx  |   16 
 Tests/IncludeDirectories/CMakeLists.txt|4 +++-
 .../SystemIncludeDirectories/CMakeLists.txt|   15 +++
 3 files changed, 30 insertions(+), 5 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.7.1-1908-g0e1c33d

2017-01-09 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  0e1c33dcb83294825f0f1785895684721f99875b (commit)
   via  eee51e24d2290771ad3dded566ef897243f21331 (commit)
   via  4ce6cd2bcfa847fe2e9926d97f27be1d89fe1c4b (commit)
   via  cda3a69b1bcc2e83806f7423c6970a794be8261f (commit)
   via  0dabeb6024b352bc7d5f9e1dce63ad87186ce36f (commit)
   via  a0ed39ac2207edbda08b1459096d2c1bf757cc71 (commit)
   via  8f9e0884d4f948526c08c35dde345a142352d549 (commit)
  from  12663fc8718aa156afdf43697193747b35348988 (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=0e1c33dcb83294825f0f1785895684721f99875b
commit 0e1c33dcb83294825f0f1785895684721f99875b
Merge: 12663fc eee51e2
Author: Brad King 
AuthorDate: Mon Jan 9 16:27:42 2017 -0500
Commit: Brad King 
CommitDate: Mon Jan 9 16:27:42 2017 -0500

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, master, updated. v3.7.1-940-geee51e2

2017-01-09 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  eee51e24d2290771ad3dded566ef897243f21331 (commit)
   via  2f4e5ed66dc34a5f4ecb80d38d291d1e78ac12f7 (commit)
  from  4ce6cd2bcfa847fe2e9926d97f27be1d89fe1c4b (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=eee51e24d2290771ad3dded566ef897243f21331
commit eee51e24d2290771ad3dded566ef897243f21331
Merge: 4ce6cd2 2f4e5ed
Author: Brad King 
AuthorDate: Mon Jan 9 16:27:31 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:27:31 2017 -0500

Merge topic 'cpack-deb-package-version-override-fix'

2f4e5ed6 CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION


---

Summary of changes:
 Modules/CPackDeb.cmake |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, master, updated. v3.7.1-934-g0dabeb6

2017-01-09 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  0dabeb6024b352bc7d5f9e1dce63ad87186ce36f (commit)
   via  8e4d286e7b105407d523ccf745198d0400b5fdb3 (commit)
  from  a0ed39ac2207edbda08b1459096d2c1bf757cc71 (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=0dabeb6024b352bc7d5f9e1dce63ad87186ce36f
commit 0dabeb6024b352bc7d5f9e1dce63ad87186ce36f
Merge: a0ed39a 8e4d286
Author: Brad King 
AuthorDate: Mon Jan 9 16:27:22 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:27:22 2017 -0500

Merge topic 'fix-required-var-error-typo'

8e4d286e Fix typo in error message on missing required variable


---

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


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

[Cmake-commits] CMake branch, master, updated. v3.7.1-936-gcda3a69

2017-01-09 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  cda3a69b1bcc2e83806f7423c6970a794be8261f (commit)
   via  98f2143305b8b8c5ce08dfa38ee79750696865a6 (commit)
  from  0dabeb6024b352bc7d5f9e1dce63ad87186ce36f (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=cda3a69b1bcc2e83806f7423c6970a794be8261f
commit cda3a69b1bcc2e83806f7423c6970a794be8261f
Merge: 0dabeb6 98f2143
Author: Brad King 
AuthorDate: Mon Jan 9 16:27:25 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:27:25 2017 -0500

Merge topic 'read-only-type-target-property'

98f21433 cmTarget: Enforce TYPE being a read-only property


---

Summary of changes:
 Source/cmTarget.cxx  |6 ++
 Tests/RunCMake/set_property/RunCMakeTest.cmake   |1 +
 .../BadSYSROOT-result.txt => set_property/TYPE-result.txt}   |0
 Tests/RunCMake/set_property/TYPE-stderr.txt  |1 +
 Tests/RunCMake/set_property/TYPE.cmake   |2 ++
 5 files changed, 10 insertions(+)
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => 
set_property/TYPE-result.txt} (100%)
 create mode 100644 Tests/RunCMake/set_property/TYPE-stderr.txt
 create mode 100644 Tests/RunCMake/set_property/TYPE.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, master, updated. v3.7.1-932-ga0ed39a

2017-01-09 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  a0ed39ac2207edbda08b1459096d2c1bf757cc71 (commit)
   via  7789dd9a1ae79d6747883739a21cf90c139d1e54 (commit)
  from  8f9e0884d4f948526c08c35dde345a142352d549 (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=a0ed39ac2207edbda08b1459096d2c1bf757cc71
commit a0ed39ac2207edbda08b1459096d2c1bf757cc71
Merge: 8f9e088 7789dd9
Author: Brad King 
AuthorDate: Mon Jan 9 16:27:19 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:27:19 2017 -0500

Merge topic 'mr-reset-error-flag-on-configure'

7789dd9a server-mode: Call ResetErrorOccured before configure


---

Summary of changes:
 Source/cmServerProtocol.cxx |2 ++
 1 file changed, 2 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, master, updated. v3.7.1-930-g8f9e088

2017-01-09 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  8f9e0884d4f948526c08c35dde345a142352d549 (commit)
   via  4087d0ae85cd9835296a82e0d5a63db0feabcb93 (commit)
  from  976574b01009e11326c7894edf35a4f315b216d4 (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=8f9e0884d4f948526c08c35dde345a142352d549
commit 8f9e0884d4f948526c08c35dde345a142352d549
Merge: 976574b 4087d0a
Author: Brad King 
AuthorDate: Mon Jan 9 16:27:16 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:27:16 2017 -0500

Merge topic 'pgi-ninja-fortran'

4087d0ae PGI: Add support for Fortran with the Ninja generator


---

Summary of changes:
 Modules/Compiler/PGI-Fortran.cmake |3 +++
 1 file changed, 3 insertions(+)


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

[Cmake-commits] CMake branch, next, updated. v3.7.1-1901-g12663fc

2017-01-09 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  12663fc8718aa156afdf43697193747b35348988 (commit)
   via  2f4e5ed66dc34a5f4ecb80d38d291d1e78ac12f7 (commit)
  from  c354e6695678ce81925ff73327bdfb4f7b5f9b7b (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=12663fc8718aa156afdf43697193747b35348988
commit 12663fc8718aa156afdf43697193747b35348988
Merge: c354e66 2f4e5ed
Author: Brad King 
AuthorDate: Mon Jan 9 16:17:10 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:17:10 2017 -0500

Merge topic 'cpack-deb-package-version-override-fix' into next

2f4e5ed6 CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f4e5ed66dc34a5f4ecb80d38d291d1e78ac12f7
commit 2f4e5ed66dc34a5f4ecb80d38d291d1e78ac12f7
Author: Daniel Pfeifer 
AuthorDate: Tue Dec 20 14:09:20 2016 +0100
Commit: Daniel Pfeifer 
CommitDate: Tue Dec 20 14:09:20 2016 +0100

CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index bee69d9..ddf8b23 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -914,7 +914,7 @@ function(cpack_deb_prepare_package_vars)
 extract_so_info("${_FILE}" libname soversion)
 if(libname AND soversion)
   list(APPEND CPACK_DEBIAN_PACKAGE_SHLIBS_LIST
-   "${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME} 
(${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY} ${CPACK_PACKAGE_VERSION})")
+   "${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME} 
(${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY} 
${CPACK_DEBIAN_PACKAGE_VERSION})")
 else()
   message(AUTHOR_WARNING "Shared library '${_FILE}' is missing soname 
or soversion. Library will not be added to DEBIAN/shlibs control file.")
 endif()
@@ -967,7 +967,7 @@ function(cpack_deb_prepare_package_vars)
   # Patch package file name to be in corrent debian format:
   # _-_.deb
   set(CPACK_OUTPUT_FILE_NAME
-
"${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
+
"${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
 else()
   cmake_policy(PUSH)
 cmake_policy(SET CMP0010 NEW)

---

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.7.1-1899-gc354e66

2017-01-09 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  c354e6695678ce81925ff73327bdfb4f7b5f9b7b (commit)
   via  976574b01009e11326c7894edf35a4f315b216d4 (commit)
   via  9cad0ec691f3d019a8737c4a6bb61c11573e6062 (commit)
   via  0d8874e49374fda8513f1f3c5fa1797aa86d90ed (commit)
   via  737350526234269b79c52f9dc567e0f1d93b13f2 (commit)
   via  5df77fba5327ce78d297587be1a29fe7688b6b42 (commit)
   via  c628fd2fab273999e959aad00834369924dd9d06 (commit)
   via  bd9b53ab33bb2185d526e8897cbd8f95c680b2c7 (commit)
   via  c8084b3020b51150ecb5b1dc3b91758b171c93f4 (commit)
   via  ea0db79e65fb943381c8a3358fd18ba2516e29bd (commit)
   via  fbf0f0b3b6a2a6c7cfd8bc7eca2cfbd0263670f9 (commit)
   via  da04b68f3937ae2d4497068b41e7cd69d449320a (commit)
  from  73677b9fab31d1f68cf0d5dfe2bb68f4b9887d81 (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=c354e6695678ce81925ff73327bdfb4f7b5f9b7b
commit c354e6695678ce81925ff73327bdfb4f7b5f9b7b
Merge: 73677b9 976574b
Author: Brad King 
AuthorDate: Mon Jan 9 16:11:50 2017 -0500
Commit: Brad King 
CommitDate: Mon Jan 9 16:11:50 2017 -0500

Merge branch 'master' into next


---

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.7.1-1887-g73677b9

2017-01-09 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  73677b9fab31d1f68cf0d5dfe2bb68f4b9887d81 (commit)
   via  cfbc407faab422db01e4a7d2c4e5a7c3acdc9951 (commit)
  from  8be34d3d4c4669793f8a400dfa111230d92af701 (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=73677b9fab31d1f68cf0d5dfe2bb68f4b9887d81
commit 73677b9fab31d1f68cf0d5dfe2bb68f4b9887d81
Merge: 8be34d3 cfbc407
Author: Brad King 
AuthorDate: Mon Jan 9 16:06:29 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:06:29 2017 -0500

Merge topic 'gcc-34-features' into next

cfbc407f Revert topic 'gcc-34-features'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfbc407faab422db01e4a7d2c4e5a7c3acdc9951
commit cfbc407faab422db01e4a7d2c4e5a7c3acdc9951
Author: Brad King 
AuthorDate: Mon Jan 9 16:06:14 2017 -0500
Commit: Brad King 
CommitDate: Mon Jan 9 16:06:14 2017 -0500

Revert topic 'gcc-34-features'

It will be revised and restored with an alternative approach.

diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt 
b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
index 7da526a..9b35f27 100644
--- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
@@ -32,14 +32,14 @@ if (CMAKE_CXX_COMPILE_FEATURES)
   endif()
   add_executable(target_compile_features${target_suffix} main.cpp)
   target_compile_features(target_compile_features${target_suffix}
-PRIVATE cxx_long_long_type
+PRIVATE cxx_auto_type
   )
 
-  add_library(lib_long_long_type lib_long_long_type.cpp)
-  target_compile_features(lib_long_long_type
-PUBLIC cxx_long_long_type
+  add_library(lib_auto_type lib_auto_type.cpp)
+  target_compile_features(lib_auto_type
+PUBLIC cxx_auto_type
   )
 
   add_executable(lib_user lib_user.cpp)
-  target_link_libraries(lib_user lib_long_long_type)
+  target_link_libraries(lib_user lib_auto_type)
 endif()
diff --git a/Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp 
b/Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
new file mode 100644
index 000..71b2215
--- /dev/null
+++ b/Tests/CMakeCommands/target_compile_features/lib_auto_type.cpp
@@ -0,0 +1,6 @@
+
+int getAutoTypeImpl()
+{
+  auto i = 0;
+  return i;
+}
diff --git a/Tests/CMakeCommands/target_compile_features/lib_auto_type.h 
b/Tests/CMakeCommands/target_compile_features/lib_auto_type.h
new file mode 100644
index 000..c825b10
--- /dev/null
+++ b/Tests/CMakeCommands/target_compile_features/lib_auto_type.h
@@ -0,0 +1,8 @@
+
+int getAutoTypeImpl();
+
+int getAutoType()
+{
+  auto i = getAutoTypeImpl();
+  return i;
+}
diff --git a/Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp 
b/Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp
deleted file mode 100644
index 4d3a896..000
--- a/Tests/CMakeCommands/target_compile_features/lib_long_long_type.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-
-int getLLTypeImpl(long long )
-{
-  int i = 64;
-  while(l) {
-if(l & 1)
-  i--;
-l >>= 1;
-  }
-  return i;
-}
diff --git a/Tests/CMakeCommands/target_compile_features/lib_long_long_type.h 
b/Tests/CMakeCommands/target_compile_features/lib_long_long_type.h
deleted file mode 100644
index 8111382..000
--- a/Tests/CMakeCommands/target_compile_features/lib_long_long_type.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-int getLLTypeImpl(long long &);
-
-int getLLType(int i)
-{
-  long long l = i;
-  return getLLTypeImpl(l);
-}
diff --git a/Tests/CMakeCommands/target_compile_features/lib_user.cpp 
b/Tests/CMakeCommands/target_compile_features/lib_user.cpp
index 8e6f860..541e528 100644
--- a/Tests/CMakeCommands/target_compile_features/lib_user.cpp
+++ b/Tests/CMakeCommands/target_compile_features/lib_user.cpp
@@ -1,7 +1,7 @@
 
-#include "lib_long_long_type.h"
+#include "lib_auto_type.h"
 
 int main(int argc, char** argv)
 {
-  return getLLType(42);
+  return getAutoType();
 }
diff --git a/Tests/CMakeCommands/target_compile_features/main.cpp 
b/Tests/CMakeCommands/target_compile_features/main.cpp
index aee232a..6f5daee 100644
--- a/Tests/CMakeCommands/target_compile_features/main.cpp
+++ b/Tests/CMakeCommands/target_compile_features/main.cpp
@@ -1,6 +1,6 @@
 
 int main(int, char**)
 {
-  long long i = 1 << 31;
-  return (i << 1) == 0;
+  auto i = 0;
+  return i;
 }
diff --git a/Tests/CompileFeatures/CMakeLists.txt 
b/Tests/CompileFeatures/CMakeLists.txt
index 7c5aa88..0405def 100644
---

[Cmake-commits] CMake branch, next, updated. v3.7.1-1883-g07d6480

2017-01-09 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  07d64808b353bb14faa959596f0489a17f5f85f6 (commit)
   via  567a4fe9b1984d5c770afab8bd677bcee3841659 (commit)
  from  d497b25dcc2d84a7222b32182586ecc4995221ec (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=07d64808b353bb14faa959596f0489a17f5f85f6
commit 07d64808b353bb14faa959596f0489a17f5f85f6
Merge: d497b25 567a4fe
Author: Brad King 
AuthorDate: Mon Jan 9 16:01:55 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:01:55 2017 -0500

Merge topic 'read-only-type-target-property' into next

567a4fe9 Revert "cmTarget: Enforce TYPE being a read-only property"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=567a4fe9b1984d5c770afab8bd677bcee3841659
commit 567a4fe9b1984d5c770afab8bd677bcee3841659
Author: Brad King 
AuthorDate: Mon Jan 9 16:01:40 2017 -0500
Commit: Brad King 
CommitDate: Mon Jan 9 16:01:40 2017 -0500

Revert "cmTarget: Enforce TYPE being a read-only property"

This reverts commit fd466d3fd3070b36aadbd7457ddb644b33d40a61.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 9261ca8..ee4ff39 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -858,12 +858,6 @@ void cmTarget::SetProperty(const std::string& prop, const 
char* value)
 this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
 return;
   }
-  if (prop == "TYPE") {
-std::ostringstream e;
-e << "TYPE property is read-only\n";
-this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
-return;
-  }
   if (prop == "EXPORT_NAME" && this->IsImported()) {
 std::ostringstream e;
 e << "EXPORT_NAME property can't be set on imported targets (\""
diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake 
b/Tests/RunCMake/set_property/RunCMakeTest.cmake
index 1ddacee..37c7124 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake
@@ -6,5 +6,4 @@ run_cmake(COMPILE_OPTIONS)
 run_cmake(INCLUDE_DIRECTORIES)
 run_cmake(LINK_LIBRARIES)
 run_cmake(SOURCES)
-run_cmake(TYPE)
 run_cmake(USER_PROP)
diff --git a/Tests/RunCMake/set_property/TYPE-result.txt 
b/Tests/RunCMake/set_property/TYPE-result.txt
deleted file mode 100644
index d00491f..000
--- a/Tests/RunCMake/set_property/TYPE-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/set_property/TYPE-stderr.txt 
b/Tests/RunCMake/set_property/TYPE-stderr.txt
deleted file mode 100644
index 6226051..000
--- a/Tests/RunCMake/set_property/TYPE-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-TYPE property is read-only
\ No newline at end of file
diff --git a/Tests/RunCMake/set_property/TYPE.cmake 
b/Tests/RunCMake/set_property/TYPE.cmake
deleted file mode 100644
index 8481266..000
--- a/Tests/RunCMake/set_property/TYPE.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-add_custom_target(CustomTarget)
-set_property(TARGET CustomTarget PROPERTY TYPE foo)

---

Summary of changes:
 Source/cmTarget.cxx|6 --
 Tests/RunCMake/set_property/RunCMakeTest.cmake |1 -
 Tests/RunCMake/set_property/TYPE-result.txt|1 -
 Tests/RunCMake/set_property/TYPE-stderr.txt|1 -
 Tests/RunCMake/set_property/TYPE.cmake |2 --
 5 files changed, 11 deletions(-)
 delete mode 100644 Tests/RunCMake/set_property/TYPE-result.txt
 delete mode 100644 Tests/RunCMake/set_property/TYPE-stderr.txt
 delete mode 100644 Tests/RunCMake/set_property/TYPE.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.7.1-1885-g8be34d3

2017-01-09 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  8be34d3d4c4669793f8a400dfa111230d92af701 (commit)
   via  98f2143305b8b8c5ce08dfa38ee79750696865a6 (commit)
  from  07d64808b353bb14faa959596f0489a17f5f85f6 (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=8be34d3d4c4669793f8a400dfa111230d92af701
commit 8be34d3d4c4669793f8a400dfa111230d92af701
Merge: 07d6480 98f2143
Author: Brad King 
AuthorDate: Mon Jan 9 16:02:07 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 16:02:07 2017 -0500

Merge topic 'read-only-type-target-property' into next

98f21433 cmTarget: Enforce TYPE being a read-only property


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98f2143305b8b8c5ce08dfa38ee79750696865a6
commit 98f2143305b8b8c5ce08dfa38ee79750696865a6
Author: Gregor Jasny 
AuthorDate: Thu Dec 29 23:11:50 2016 +0100
Commit: Brad King 
CommitDate: Mon Jan 9 16:00:39 2017 -0500

cmTarget: Enforce TYPE being a read-only property

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ee4ff39..9261ca8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -858,6 +858,12 @@ void cmTarget::SetProperty(const std::string& prop, const 
char* value)
 this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
 return;
   }
+  if (prop == "TYPE") {
+std::ostringstream e;
+e << "TYPE property is read-only\n";
+this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
+return;
+  }
   if (prop == "EXPORT_NAME" && this->IsImported()) {
 std::ostringstream e;
 e << "EXPORT_NAME property can't be set on imported targets (\""
diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake 
b/Tests/RunCMake/set_property/RunCMakeTest.cmake
index 37c7124..1ddacee 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake
@@ -6,4 +6,5 @@ run_cmake(COMPILE_OPTIONS)
 run_cmake(INCLUDE_DIRECTORIES)
 run_cmake(LINK_LIBRARIES)
 run_cmake(SOURCES)
+run_cmake(TYPE)
 run_cmake(USER_PROP)
diff --git a/Tests/RunCMake/set_property/TYPE-result.txt 
b/Tests/RunCMake/set_property/TYPE-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/set_property/TYPE-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/set_property/TYPE-stderr.txt 
b/Tests/RunCMake/set_property/TYPE-stderr.txt
new file mode 100644
index 000..fbc8653
--- /dev/null
+++ b/Tests/RunCMake/set_property/TYPE-stderr.txt
@@ -0,0 +1 @@
+TYPE property is read-only
diff --git a/Tests/RunCMake/set_property/TYPE.cmake 
b/Tests/RunCMake/set_property/TYPE.cmake
new file mode 100644
index 000..8481266
--- /dev/null
+++ b/Tests/RunCMake/set_property/TYPE.cmake
@@ -0,0 +1,2 @@
+add_custom_target(CustomTarget)
+set_property(TARGET CustomTarget PROPERTY TYPE foo)

---

Summary of changes:
 Source/cmTarget.cxx  |6 ++
 Tests/RunCMake/set_property/RunCMakeTest.cmake   |1 +
 .../BadSYSROOT-result.txt => set_property/TYPE-result.txt}   |0
 Tests/RunCMake/set_property/TYPE-stderr.txt  |1 +
 Tests/RunCMake/set_property/TYPE.cmake   |2 ++
 5 files changed, 10 insertions(+)
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => 
set_property/TYPE-result.txt} (100%)
 create mode 100644 Tests/RunCMake/set_property/TYPE-stderr.txt
 create mode 100644 Tests/RunCMake/set_property/TYPE.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.7.1-1881-gd497b25

2017-01-09 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  d497b25dcc2d84a7222b32182586ecc4995221ec (commit)
   via  cda9a904b5ef76d923a072a45c0c15fd1d87d6be (commit)
  from  6681122a8fd8d93bb49c79d8ba448fc870fd6747 (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=d497b25dcc2d84a7222b32182586ecc4995221ec
commit d497b25dcc2d84a7222b32182586ecc4995221ec
Merge: 6681122 cda9a90
Author: Brad King 
AuthorDate: Mon Jan 9 15:55:02 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 15:55:02 2017 -0500

Merge topic 'sparc-libatomic' into next

cda9a904 Explicitly link against libatomic on Linux/sparc for 
`__atomic_fetch_add_4`


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cda9a904b5ef76d923a072a45c0c15fd1d87d6be
commit cda9a904b5ef76d923a072a45c0c15fd1d87d6be
Author: Rolf Eike Beer 
AuthorDate: Mon Dec 19 14:47:01 2016 +0100
Commit: Brad King 
CommitDate: Mon Jan 9 15:51:35 2017 -0500

Explicitly link against libatomic on Linux/sparc for `__atomic_fetch_add_4`

On this platform atomic instructions are implemented using `libatomic`
so we need to link it to use them.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index d15fdbe..388bf89 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -785,6 +785,15 @@ target_link_libraries(CMakeLib cmsys
   ${CMake_KWIML_LIBRARIES}
   )
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES 
"sparc")
+  # the atomic instructions are implemented using libatomic on some platforms,
+  # so linking to that may be required
+  check_library_exists(atomic __atomic_fetch_add_4 "" LIBATOMIC_NEEDED)
+  if(LIBATOMIC_NEEDED)
+target_link_libraries(CMakeLib atomic)
+  endif()
+endif()
+
 # On Apple we need CoreFoundation
 if(APPLE)
   target_link_libraries(CMakeLib "-framework CoreFoundation")

---

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.7.1-1879-g6681122

2017-01-09 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  6681122a8fd8d93bb49c79d8ba448fc870fd6747 (commit)
   via  2a9429bbd2b67c9c639492bafc645ddd17c7 (commit)
  from  d0868c9866d1bec94285c51bf2c6258e1c835223 (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=6681122a8fd8d93bb49c79d8ba448fc870fd6747
commit 6681122a8fd8d93bb49c79d8ba448fc870fd6747
Merge: d0868c9 2a9429b
Author: Brad King 
AuthorDate: Mon Jan 9 15:46:49 2017 -0500
Commit: CMake Topic Stage 
CommitDate: Mon Jan 9 15:46:49 2017 -0500

Merge topic '16253-xcode-effective-platform-name' into next

2a9429bb Revert topic '16253-xcode-effective-platform-name'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a9429bbd2b67c9c639492bafc645ddd17c7
commit 2a9429bbd2b67c9c639492bafc645ddd17c7
Author: Brad King 
AuthorDate: Mon Jan 9 15:46:26 2017 -0500
Commit: Brad King 
CommitDate: Mon Jan 9 15:46:26 2017 -0500

Revert topic '16253-xcode-effective-platform-name'

It needs some revision and test fixes.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c2a76e4..b6db0d6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4419,9 +4419,9 @@ bool cmGeneratorTarget::ComputeOutputDir(const 
std::string& config,
 
   // The generator may add the configuration's subdirectory.
   if (!conf.empty()) {
-bool useEPN = this->Makefile->ShouldEmitEffectivePlatformName();
+bool iosPlatform = this->Makefile->PlatformIsAppleIos();
 std::string suffix =
-  usesDefaultOutputDir && useEPN ? "${EFFECTIVE_PLATFORM_NAME}" : "";
+  usesDefaultOutputDir && iosPlatform ? "${EFFECTIVE_PLATFORM_NAME}" : "";
 this->LocalGenerator->GetGlobalGenerator()->AppendDirectoryForConfig(
   "/", conf, suffix, out);
   }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index c2767f0..2808051 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2342,8 +2342,8 @@ void cmGlobalGenerator::AddGlobalTarget_Install(
 singleLine.push_back(cmd);
 if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
   std::string cfgArg = "-DBUILD_TYPE=";
-  bool useEPN = mf->ShouldEmitEffectivePlatformName();
-  if (useEPN) {
+  bool iosPlatform = mf->PlatformIsAppleIos();
+  if (iosPlatform) {
 cfgArg += "$(CONFIGURATION)";
 singleLine.push_back(cfgArg);
 cfgArg = "-DEFFECTIVE_PLATFORM_NAME=$(EFFECTIVE_PLATFORM_NAME)";
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0656b0a..fccb486 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2184,22 +2184,6 @@ bool cmMakefile::PlatformIsAppleIos() const
   return false;
 }
 
-bool cmMakefile::ShouldEmitEffectivePlatformName() const
-{
-  bool isXcode = this->IsOn("XCODE");
-  if (!isXcode) {
-return false;
-  }
-
-  const char* xcodeVersion = this->GetDefinition("XCODE_VERSION");
-  if (!xcodeVersion ||
-  cmSystemTools::VersionCompareGreater("5", xcodeVersion)) {
-return false;
-  }
-
-  return true;
-}
-
 const char* cmMakefile::GetSONameFlag(const std::string& language) const
 {
   std::string name = "CMAKE_SHARED_LIBRARY_SONAME";
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index f929951..3484e5a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -427,9 +427,6 @@ public:
   /** Return whether the target platform is Apple iOS.  */
   bool PlatformIsAppleIos() const;
 
-  /** Return whether the generator should use EFFECTIVE_PLATFORM_NAME.  */
-  bool ShouldEmitEffectivePlatformName() const;
-
   /** Retrieve soname flag for the specified language if supported */
   const char* GetSONameFlag(const std::string& language) const;
 
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index 57766db..60912c2 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -18,27 +18,6 @@ run_cmake(PerConfigPerSourceFlags)
 # Use a single build tree for a few tests without cleaning.
 
 if(NOT XCODE_VERSION VERSION_LESS 5)
-  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeMultiplatform-build)
-  set(RunCMake_TEST_NO_CLEAN 1)
-  set(RunCMake_TEST_OPTIONS)
-
-  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
-  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
-
-  run_cmake(XcodeMultiplatform)
-
-  run_cmake_command(XcodeMultiplatform-macosx-build