[Cmake-commits] CMake branch, master, updated. v3.3.1-1062-g29eed26

2015-09-01 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  29eed26aa63103daf7a50265124bc0be58c64a0d (commit)
  from  b4338c88df301082662c8c2808501e4700f41124 (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29eed26aa63103daf7a50265124bc0be58c64a0d
commit 29eed26aa63103daf7a50265124bc0be58c64a0d
Author: Kitware Robot 
AuthorDate: Wed Sep 2 00:01:04 2015 -0400
Commit: Kitware Robot 
CommitDate: Wed Sep 2 00:01:04 2015 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index f7d1ba6..ed72665 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 3)
-set(CMake_VERSION_PATCH 20150901)
+set(CMake_VERSION_PATCH 20150902)
 #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.3.1-2699-gf552aed

2015-09-01 Thread Chuck Atkins 
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  f552aedf2f3d8aba1e8123e5adce58ca15078a56 (commit)
   via  44881dfa3dc16d8d949d6a7adffbf950cc575e4a (commit)
   via  3307b0726c86219dab836b01fac298ec899bd4a1 (commit)
  from  fcae8fa974c753a3c6b7051ba2506cbbeb4c733e (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f552aedf2f3d8aba1e8123e5adce58ca15078a56
commit f552aedf2f3d8aba1e8123e5adce58ca15078a56
Merge: fcae8fa 44881df
Author: Chuck Atkins 
AuthorDate: Tue Sep 1 17:57:29 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 17:57:29 2015 -0400

Merge topic 'restrict-shlib-link-flags-to-enable-exports' into next

44881dfa try_compile: Propogate CMP0065 to the generated project.
3307b072 CMP0065: Restrict the use of CMAKE_SHARED_LIBRARY_LINK__FLAGS


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44881dfa3dc16d8d949d6a7adffbf950cc575e4a
commit 44881dfa3dc16d8d949d6a7adffbf950cc575e4a
Author: Chuck Atkins 
AuthorDate: Mon Aug 24 22:56:31 2015 -0400
Commit: Chuck Atkins 
CommitDate: Tue Sep 1 17:04:48 2015 -0400

try_compile: Propogate CMP0065 to the generated project.

Set policy CMP0065 to the value used in the calling project.

Set the the value of CMAKE_ENABLE_EXPORTS if set in the calling
project to initialize the target property appropriately.

diff --git a/Help/command/try_compile.rst b/Help/command/try_compile.rst
index 1ed24df..28dae80 100644
--- a/Help/command/try_compile.rst
+++ b/Help/command/try_compile.rst
@@ -100,6 +100,7 @@ If set, the following variables are passed in to the 
generated
 try_compile CMakeLists.txt to initialize compile target properties with
 default values:
 
+* :variable:`CMAKE_ENABLE_EXPORTS`
 * :variable:`CMAKE_LINK_SEARCH_START_STATIC`
 * :variable:`CMAKE_LINK_SEARCH_END_STATIC`
 * :variable:`CMAKE_POSITION_INDEPENDENT_CODE`
@@ -107,5 +108,7 @@ default values:
 If :policy:`CMP0056` is set to ``NEW``, then
 :variable:`CMAKE_EXE_LINKER_FLAGS` is passed in as well.
 
+The current setting of :policy:`CMP0065` is set in the generated project.
+
 Set the :variable:`CMAKE_TRY_COMPILE_CONFIGURATION` variable to choose
 a build configuration.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 9411555..e489ad2 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -481,6 +481,16 @@ int 
cmCoreTryCompile::TryCompileCode(std::vector const& argv)
   fprintf(fout, "set(CMAKE_LINK_SEARCH_END_STATIC \"%s\")\n", lssDef);
   }
 
+/* Set the appropriate policy information for ENABLE_EXPORTS */
+fprintf(fout, "cmake_policy(SET CMP0065 %s)\n",
+   this->Makefile->GetPolicyStatus(cmPolicies::CMP0065) ==
+ cmPolicies::NEW ? "NEW" : "OLD");
+if(const char *ee = this->Makefile->GetDefinition(
+"CMAKE_ENABLE_EXPORTS"))
+  {
+  fprintf(fout, "set(CMAKE_ENABLE_EXPORTS %s)\n", ee);
+  }
+
 /* Put the executable at a known location (for COPY_FILE).  */
 fprintf(fout, "set(CMAKE_RUNTIME_OUTPUT_DIRECTORY \"%s\")\n",
 this->BinaryDirectory.c_str());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3307b0726c86219dab836b01fac298ec899bd4a1
commit 3307b0726c86219dab836b01fac298ec899bd4a1
Author: Chuck Atkins 
AuthorDate: Mon Aug 24 14:33:31 2015 -0400
Commit: Chuck Atkins 
CommitDate: Tue Sep 1 17:04:42 2015 -0400

CMP0065: Restrict the use of CMAKE_SHARED_LIBRARY_LINK__FLAGS

This new policy restricts the addition of the shared library link flags
to executables only when the ENABLE_EXPORTS property is set to True.
This is a step closer to enabling static executables as a first class
citizen.

diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 590f10d..ae5354f 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -122,3 +122,4 @@ All Policies
/policy/CMP0062
/policy/CMP0063
/policy/CMP0064
+   /policy/CMP0065
diff --git a/Help/manual/cmake-variables.7.rst 
b/Help/manual/cmake-variables.7.rst
index e0dbdeb..1fa117f 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -245,6 +245,7 @@ Variables that Control the Build
/variable/CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG
/variable/CMAKE_CONFIG_POSTFIX
/variable/CMAKE_DEBUG_POSTFIX
+   /variable/CMAKE_ENABLE_EXPORTS
/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG
/variable/CMAKE_EXE_LINKER_FLAGS
/variable/CMAKE_Fortran_FORMAT
diff --git a/Help/policy/CMP0065.rst b/Help/policy/CMP0065.rst
new file mode 10

[Cmake-commits] CMake branch, next, updated. v3.3.1-2696-gfcae8fa

2015-09-01 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  fcae8fa974c753a3c6b7051ba2506cbbeb4c733e (commit)
   via  b4338c88df301082662c8c2808501e4700f41124 (commit)
  from  b8179759b8cbeebab8f3655eef0f1c90c84b786f (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcae8fa974c753a3c6b7051ba2506cbbeb4c733e
commit fcae8fa974c753a3c6b7051ba2506cbbeb4c733e
Merge: b817975 b4338c8
Author: Brad King 
AuthorDate: Tue Sep 1 16:47:41 2015 -0400
Commit: Brad King 
CommitDate: Tue Sep 1 16:47:41 2015 -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, master, updated. v3.3.1-1061-gb4338c8

2015-09-01 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  b4338c88df301082662c8c2808501e4700f41124 (commit)
   via  76fa8596997da889349b759990ea93dcd4c34c8f (commit)
  from  7b33d4efe18f0e63ab9ecb7f3420265b9ca48cb8 (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4338c88df301082662c8c2808501e4700f41124
commit b4338c88df301082662c8c2808501e4700f41124
Merge: 7b33d4e 76fa859
Author: Brad King 
AuthorDate: Tue Sep 1 16:47:29 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 16:47:29 2015 -0400

Merge topic 'drop-cmsys-std-layer'

76fa8596 Tests: Remove use of include  and 
kwsys_{ios,stl}::


---

Summary of changes:
 Tests/Plugin/src/example_exe.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 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.3.1-2694-gb817975

2015-09-01 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  b8179759b8cbeebab8f3655eef0f1c90c84b786f (commit)
   via  61b6d52ad01dec76f8b798f1c52a5c03cf9e45d8 (commit)
  from  8033831b5e3475ea52eaf83ab219615dee2be1df (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8179759b8cbeebab8f3655eef0f1c90c84b786f
commit b8179759b8cbeebab8f3655eef0f1c90c84b786f
Merge: 8033831 61b6d52
Author: Gregor Jasny 
AuthorDate: Tue Sep 1 14:35:16 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 14:35:16 2015 -0400

Merge topic 'swift2-compatibility' into next

61b6d52a Swift: Use dump instead of println


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61b6d52ad01dec76f8b798f1c52a5c03cf9e45d8
commit 61b6d52ad01dec76f8b798f1c52a5c03cf9e45d8
Author: Gregor Jasny 
AuthorDate: Tue Sep 1 20:32:38 2015 +0200
Commit: Gregor Jasny 
CommitDate: Tue Sep 1 20:32:38 2015 +0200

Swift: Use dump instead of println

With Swift 2.0 in Xcode7 the println function was renamed into
print. Use dump function instead which adds newlines like println.

diff --git a/Tests/SwiftMix/SwiftMain.swift b/Tests/SwiftMix/SwiftMain.swift
index 9af9883..7e7c4ab 100644
--- a/Tests/SwiftMix/SwiftMain.swift
+++ b/Tests/SwiftMix/SwiftMain.swift
@@ -1,9 +1,9 @@
 @objc class SwiftMainClass {
   class func SwiftMain(argc:Int, argv:UnsafePointer>) -> 
Int32 {
-println("argc: \(argc)")
+dump("argc: \(argc)")
 for (var i = 0; i < argc; ++i) {
   var argi = String.fromCString(argv[i])
-  println("arg[\(i)]: \(argi)");
+  dump("arg[\(i)]: \(argi)");
 }
 return 0;
   }
diff --git a/Tests/SwiftOnly/main.swift b/Tests/SwiftOnly/main.swift
index 67be986..28560d0 100644
--- a/Tests/SwiftOnly/main.swift
+++ b/Tests/SwiftOnly/main.swift
@@ -1 +1 @@
-println("SwiftOnly")
+dump("SwiftOnly")

---

Summary of changes:
 Tests/SwiftMix/SwiftMain.swift |4 ++--
 Tests/SwiftOnly/main.swift |2 +-
 2 files changed, 3 insertions(+), 3 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.3.1-2692-g8033831

2015-09-01 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  8033831b5e3475ea52eaf83ab219615dee2be1df (commit)
   via  f7f73df1b3e58f55178f899352b6ffa9b4b14cb6 (commit)
   via  19e7db07e36b03e7d57b80c8f9732347116d8c5d (commit)
  from  52bfa089205632b0a64185c37741786877846f62 (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8033831b5e3475ea52eaf83ab219615dee2be1df
commit 8033831b5e3475ea52eaf83ab219615dee2be1df
Merge: 52bfa08 f7f73df
Author: Brad King 
AuthorDate: Tue Sep 1 11:17:33 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 11:17:33 2015 -0400

Merge topic 'FindHDF5-updates' into next

f7f73df1 FindHDF5: Add hdf5_hl to list of libraries to search for Fortran_HL
19e7db07 FindHDF5: Fix support for HL and Fortran_HL components


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7f73df1b3e58f55178f899352b6ffa9b4b14cb6
commit f7f73df1b3e58f55178f899352b6ffa9b4b14cb6
Author: Paul Romano 
AuthorDate: Tue Sep 1 09:20:25 2015 +0700
Commit: Brad King 
CommitDate: Tue Sep 1 10:56:51 2015 -0400

FindHDF5: Add hdf5_hl to list of libraries to search for Fortran_HL

When the Fortran_HL component is specified, the hdf5_hl library is not 
included
in HDF5_LIBRARIES which causes a bunch of undefined references at link
time. This commit adds hdf5_hl to the list of libraries to search for when 
the
Fortran_HL component is specified.

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 47d85f7..a449132 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -234,7 +234,7 @@ if( NOT HDF5_FOUND )
 set( HDF5_CXX_LIBRARY_NAMES_INIT hdf5_cpp ${HDF5_C_LIBRARY_NAMES_INIT} )
 set( HDF5_Fortran_LIBRARY_NAMES_INIT hdf5_fortran
 ${HDF5_C_LIBRARY_NAMES_INIT} )
-set( HDF5_Fortran_HL_LIBRARY_NAMES_INIT hdf5hl_fortran
+set( HDF5_Fortran_HL_LIBRARY_NAMES_INIT hdf5hl_fortran hdf5_hl
 ${HDF5_Fortran_LIBRARY_NAMES_INIT} )
 
 foreach( LANGUAGE ${HDF5_LANGUAGE_BINDINGS} )

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19e7db07e36b03e7d57b80c8f9732347116d8c5d
commit 19e7db07e36b03e7d57b80c8f9732347116d8c5d
Author: Paul Romano 
AuthorDate: Tue Sep 1 09:18:51 2015 +0700
Commit: Brad King 
CommitDate: Tue Sep 1 10:56:40 2015 -0400

FindHDF5: Fix support for HL and Fortran_HL components

Define HDF5_{Fortran_,}HL_COMPILE_LINE so that 
HDF5_{Fortran_,}HL_INCLUDE_DIR
and HDF5_{Fortran_,}HL_LIBRARIES are found when the macro is invoked for HL 
and
Fortran_HL components.  (Use patch from debian cmake-data package.)

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 3bd6f1e..47d85f7 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -225,6 +225,8 @@ if( NOT HDF5_FOUND )
 _HDF5_invoke_compiler( C HDF5_C_COMPILE_LINE HDF5_C_RETURN_VALUE )
 _HDF5_invoke_compiler( CXX HDF5_CXX_COMPILE_LINE HDF5_CXX_RETURN_VALUE )
 _HDF5_invoke_compiler( Fortran HDF5_Fortran_COMPILE_LINE 
HDF5_Fortran_RETURN_VALUE )
+set(HDF5_HL_COMPILE_LINE ${HDF5_C_COMPILE_LINE})
+set(HDF5_Fortran_HL_COMPILE_LINE ${HDF5_Fortran_COMPILE_LINE})
 
 # seed the initial lists of libraries to find with items we know we need
 set( HDF5_C_LIBRARY_NAMES_INIT hdf5 )

---

Summary of changes:
 Modules/FindHDF5.cmake |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, next, updated. v3.3.1-2689-g52bfa08

2015-09-01 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  52bfa089205632b0a64185c37741786877846f62 (commit)
   via  21d99aa345f0af53987cd745384d28f639044507 (commit)
  from  3f9f0a62a433a3cae1749a93fb95459fbfdb61e6 (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52bfa089205632b0a64185c37741786877846f62
commit 52bfa089205632b0a64185c37741786877846f62
Merge: 3f9f0a6 21d99aa
Author: Brad King 
AuthorDate: Tue Sep 1 10:30:29 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 10:30:29 2015 -0400

Merge topic 'modules-no-soname' into next

21d99aa3 Tests: Use a less strict regular expression to look for "SONAME"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21d99aa345f0af53987cd745384d28f639044507
commit 21d99aa345f0af53987cd745384d28f639044507
Author: Raphael Kubo da Costa 
AuthorDate: Tue Sep 1 15:33:15 2015 +0200
Commit: Brad King 
CommitDate: Tue Sep 1 10:30:09 2015 -0400

Tests: Use a less strict regular expression to look for "SONAME"

Commit 899458ab (Tests: Cover NO_SONAME property for SHARED libraries,
2015-08-20) introduced a few new ExportImport tests, and the
check_lib_{no}soname.cmake scripts that parse readelf(1)'s output.

Make the regular expression matching the SONAME line output by readelf
less strict, as the output format varies across implementations: GNU
binutils' readelf is the only one to write each ELF header within
parentheses (which the previous regular expression expected).  The new
tests were thus failing when either Fedora's elfutils (eu-readelf) or
elftoolchain's readelf (present on recent FreeBSD versions) were being
used, as they both list the headers without parentheses.

The same issue also affected Tests/Plugin's check_mod_soname.cmake, so
fix that one as well -- the only reason the test was not failing is that
it tested that the regular expression did not match, which was always
the case with a non-binutils readelf.

diff --git a/Tests/ExportImport/Import/A/check_lib_nosoname.cmake 
b/Tests/ExportImport/Import/A/check_lib_nosoname.cmake
index 6261ff4..613391e 100644
--- a/Tests/ExportImport/Import/A/check_lib_nosoname.cmake
+++ b/Tests/ExportImport/Import/A/check_lib_nosoname.cmake
@@ -1,5 +1,5 @@
 execute_process(COMMAND ${readelf} -d ${lib} OUTPUT_FILE ${lib}.readelf.txt)
-file(STRINGS ${lib}.readelf.txt soname REGEX "\\(SONAME\\)")
+file(STRINGS ${lib}.readelf.txt soname REGEX "SONAME")
 if(soname)
   message(FATAL_ERROR "${lib} has soname but should not:\n  ${soname}")
 else()
diff --git a/Tests/ExportImport/Import/A/check_lib_soname.cmake 
b/Tests/ExportImport/Import/A/check_lib_soname.cmake
index 7794e80..a3c4b54 100644
--- a/Tests/ExportImport/Import/A/check_lib_soname.cmake
+++ b/Tests/ExportImport/Import/A/check_lib_soname.cmake
@@ -1,5 +1,5 @@
 execute_process(COMMAND ${readelf} -d ${lib} OUTPUT_FILE ${lib}.readelf.txt)
-file(STRINGS ${lib}.readelf.txt soname REGEX "\\(SONAME\\)")
+file(STRINGS ${lib}.readelf.txt soname REGEX "SONAME")
 if(soname)
   message(STATUS "${lib} has soname as expected:\n  ${soname}")
 else()
diff --git a/Tests/Plugin/check_mod_soname.cmake 
b/Tests/Plugin/check_mod_soname.cmake
index 21a33b1..eeededa 100644
--- a/Tests/Plugin/check_mod_soname.cmake
+++ b/Tests/Plugin/check_mod_soname.cmake
@@ -1,5 +1,5 @@
 execute_process(COMMAND ${readelf} -d ${mod} OUTPUT_FILE ${mod}.readelf.txt)
-file(STRINGS ${mod}.readelf.txt soname REGEX "\\(SONAME\\)")
+file(STRINGS ${mod}.readelf.txt soname REGEX "SONAME")
 if(soname)
   message(FATAL_ERROR "${mod} has soname but should not:\n  ${soname}")
 else()

---

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.3.1-2687-g3f9f0a6

2015-09-01 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  3f9f0a62a433a3cae1749a93fb95459fbfdb61e6 (commit)
   via  45fa2e6213939bfe87bb6467dbccea226eba12a3 (commit)
  from  f0d384aa8b6eff101c1701db3542a0c7419cc8dc (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f9f0a62a433a3cae1749a93fb95459fbfdb61e6
commit 3f9f0a62a433a3cae1749a93fb95459fbfdb61e6
Merge: f0d384a 45fa2e6
Author: Brad King 
AuthorDate: Tue Sep 1 10:29:48 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 10:29:48 2015 -0400

Merge topic 'modules-no-soname' into next

45fa2e62 fixup! Tests: Use a less strict regular expression to look for 
"SONAME"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45fa2e6213939bfe87bb6467dbccea226eba12a3
commit 45fa2e6213939bfe87bb6467dbccea226eba12a3
Author: Brad King 
AuthorDate: Tue Sep 1 10:28:36 2015 -0400
Commit: Brad King 
CommitDate: Tue Sep 1 10:28:36 2015 -0400

fixup! Tests: Use a less strict regular expression to look for "SONAME"

diff --git a/Tests/Plugin/check_mod_soname.cmake 
b/Tests/Plugin/check_mod_soname.cmake
index 21a33b1..eeededa 100644
--- a/Tests/Plugin/check_mod_soname.cmake
+++ b/Tests/Plugin/check_mod_soname.cmake
@@ -1,5 +1,5 @@
 execute_process(COMMAND ${readelf} -d ${mod} OUTPUT_FILE ${mod}.readelf.txt)
-file(STRINGS ${mod}.readelf.txt soname REGEX "\\(SONAME\\)")
+file(STRINGS ${mod}.readelf.txt soname REGEX "SONAME")
 if(soname)
   message(FATAL_ERROR "${mod} has soname but should not:\n  ${soname}")
 else()

---

Summary of changes:
 Tests/Plugin/check_mod_soname.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, master, updated. v3.3.1-1051-gd73c445

2015-09-01 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  d73c445a25a4c778c12c29f0b8473ae4c3afcaac (commit)
   via  49d293a795c42c0325aa677d6a7c0f55c647da91 (commit)
   via  ca96be228345d93f51cb4edbd0428b709f529b84 (commit)
  from  d833df1228b3482be36be8517839f4b23c789bf3 (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d73c445a25a4c778c12c29f0b8473ae4c3afcaac
commit d73c445a25a4c778c12c29f0b8473ae4c3afcaac
Merge: d833df1 49d293a
Author: Brad King 
AuthorDate: Tue Sep 1 09:53:24 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 09:53:24 2015 -0400

Merge topic 'update-kwsys'

49d293a7 Merge branch 'upstream-kwsys' into update-kwsys
ca96be22 KWSys 2015-08-24 (cdaf522c)


---

Summary of changes:
 Source/kwsys/CMakeEmptyInputFile.in |1 -
 Source/kwsys/CMakeLists.txt |   12 ++-
 Source/kwsys/SystemTools.cxx|   71 +++--
 Source/kwsys/SystemTools.hxx.in |  156 ++--
 Source/kwsys/testProcess.c  |   28 -
 Source/kwsys/testSystemTools.cxx|  196 ++-
 6 files changed, 370 insertions(+), 94 deletions(-)
 delete mode 100644 Source/kwsys/CMakeEmptyInputFile.in


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.3.1-1048-gd833df1

2015-09-01 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  d833df1228b3482be36be8517839f4b23c789bf3 (commit)
   via  9e21b01a4d4781cdcfb8990bdf72a11c83da3887 (commit)
  from  02ab8e30c1a8617616669cb67022b7fc1f84647d (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d833df1228b3482be36be8517839f4b23c789bf3
commit d833df1228b3482be36be8517839f4b23c789bf3
Merge: 02ab8e3 9e21b01
Author: Brad King 
AuthorDate: Tue Sep 1 09:53:21 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 09:53:21 2015 -0400

Merge topic 'add-link-search-static-properties-defaults'

9e21b01a Revert LINK_SEARCH_{START,END}_STATIC behavior change


---

Summary of changes:
 Source/cmComputeLinkInformation.cxx |8 +++-
 1 file changed, 3 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, master, updated. v3.3.1-1059-g7b33d4e

2015-09-01 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  7b33d4efe18f0e63ab9ecb7f3420265b9ca48cb8 (commit)
   via  e92c59e77f0e5aaf72d0f9f80dab33ac83d8a42c (commit)
  from  dd2b88777fa549bf261a84a0914a5a8171ae0a56 (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b33d4efe18f0e63ab9ecb7f3420265b9ca48cb8
commit 7b33d4efe18f0e63ab9ecb7f3420265b9ca48cb8
Merge: dd2b887 e92c59e
Author: Brad King 
AuthorDate: Tue Sep 1 09:53:32 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 09:53:32 2015 -0400

Merge topic 'jacoco_find_files'

e92c59e7 ctest_coverage: Make Jacoco parser better at finding source files


---

Summary of changes:
 Source/CTest/cmParseJacocoCoverage.cxx |  139 
 1 file changed, 87 insertions(+), 52 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.3.1-1053-g0e08ab6

2015-09-01 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  0e08ab6ef165791e582fce9aecc2a288075a7da4 (commit)
   via  e0cf77b3109e74cbc4c050e9907dacc9f0f40f70 (commit)
  from  d73c445a25a4c778c12c29f0b8473ae4c3afcaac (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e08ab6ef165791e582fce9aecc2a288075a7da4
commit 0e08ab6ef165791e582fce9aecc2a288075a7da4
Merge: d73c445 e0cf77b
Author: Brad King 
AuthorDate: Tue Sep 1 09:53:28 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 09:53:28 2015 -0400

Merge topic 'vs-store-phone-cert-thumbs'

e0cf77b3 cmSystemTools: Use CreateFileW explicitly to pass wchar_t path


---

Summary of changes:
 Source/cmSystemTools.cxx |   15 ---
 1 file changed, 8 insertions(+), 7 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.3.1-2685-gf0d384a

2015-09-01 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  f0d384aa8b6eff101c1701db3542a0c7419cc8dc (commit)
   via  7b33d4efe18f0e63ab9ecb7f3420265b9ca48cb8 (commit)
   via  dd2b88777fa549bf261a84a0914a5a8171ae0a56 (commit)
   via  0e08ab6ef165791e582fce9aecc2a288075a7da4 (commit)
   via  d73c445a25a4c778c12c29f0b8473ae4c3afcaac (commit)
   via  d833df1228b3482be36be8517839f4b23c789bf3 (commit)
   via  02ab8e30c1a8617616669cb67022b7fc1f84647d (commit)
  from  01742a7c1c9cc531e98e11f1497c8598be731189 (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0d384aa8b6eff101c1701db3542a0c7419cc8dc
commit f0d384aa8b6eff101c1701db3542a0c7419cc8dc
Merge: 01742a7 7b33d4e
Author: Brad King 
AuthorDate: Tue Sep 1 09:53:41 2015 -0400
Commit: Brad King 
CommitDate: Tue Sep 1 09:53:41 2015 -0400

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, master, updated. v3.3.1-1057-gdd2b887

2015-09-01 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  dd2b88777fa549bf261a84a0914a5a8171ae0a56 (commit)
   via  ad262917d96aa4d6faeff3c9dfecf684cebbe123 (commit)
   via  48fe617e667d2e6b1e471cfb56346de51f984ba5 (commit)
   via  d2c2319d6479d4319ef298f6178b00e953a9b179 (commit)
  from  0e08ab6ef165791e582fce9aecc2a288075a7da4 (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd2b88777fa549bf261a84a0914a5a8171ae0a56
commit dd2b88777fa549bf261a84a0914a5a8171ae0a56
Merge: 0e08ab6 ad26291
Author: Brad King 
AuthorDate: Tue Sep 1 09:53:30 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 09:53:30 2015 -0400

Merge topic 'fix-ios-install'

ad262917 Xcode: Add unit test for iOS project install (#12506)
48fe617e Fix installation of iOS targets (#12506)
d2c2319d Replace CMAKE_XCODE_EFFECTIVE_PLATFORMS with call to 
PlatformIsAppleIos


---

Summary of changes:
 Source/cmGlobalGenerator.cxx |   12 +++-
 Source/cmTarget.cxx  |5 ++---
 Tests/RunCMake/XcodeProject/RunCMakeTest.cmake   |   14 ++
 Tests/RunCMake/XcodeProject/XcodeBundles.cmake   |1 -
 .../XcodeProject/XcodeInstallIOS-install-stdout.txt  |2 ++
 Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake|   12 
 Tests/RunCMake/XcodeProject/foo.cpp  |1 +
 Tests/iOSNavApp/CMakeLists.txt   |1 -
 8 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 
Tests/RunCMake/XcodeProject/XcodeInstallIOS-install-stdout.txt
 create mode 100644 Tests/RunCMake/XcodeProject/XcodeInstallIOS.cmake
 create mode 100644 Tests/RunCMake/XcodeProject/foo.cpp


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.3.1-2678-g01742a7

2015-09-01 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  01742a7c1c9cc531e98e11f1497c8598be731189 (commit)
   via  e92c59e77f0e5aaf72d0f9f80dab33ac83d8a42c (commit)
  from  26f1c64fc48a8f86f4e83e6c5ae29ced03e641a4 (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01742a7c1c9cc531e98e11f1497c8598be731189
commit 01742a7c1c9cc531e98e11f1497c8598be731189
Merge: 26f1c64 e92c59e
Author: Brad King 
AuthorDate: Tue Sep 1 09:49:26 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 09:49:26 2015 -0400

Merge topic 'jacoco_find_files' into next

e92c59e7 ctest_coverage: Make Jacoco parser better at finding source files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e92c59e77f0e5aaf72d0f9f80dab33ac83d8a42c
commit e92c59e77f0e5aaf72d0f9f80dab33ac83d8a42c
Author: Zack Galbreath 
AuthorDate: Fri Aug 28 13:35:47 2015 -0400
Commit: Brad King 
CommitDate: Tue Sep 1 09:48:59 2015 -0400

ctest_coverage: Make Jacoco parser better at finding source files

Instead of searching for source files in a couple hard-coded
locations, we now search the source and binary directory for files
matching both the name of the covered file and its package
directory structure.

diff --git a/Source/CTest/cmParseJacocoCoverage.cxx 
b/Source/CTest/cmParseJacocoCoverage.cxx
index 31ad9fe..47e3b32 100644
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@@ -15,11 +15,9 @@ class cmParseJacocoCoverage::XMLParser: public cmXMLParser
 XMLParser(cmCTest* ctest, cmCTestCoverageHandlerContainer& cont)
   : CTest(ctest), Coverage(cont)
   {
+  this->FilePath = "";
+  this->PackagePath = "";
   this->PackageName = "";
-  this->ModuleName = "";
-  this->FileName = "";
-  this->CurFileName = "";
-  this->FilePaths.push_back(this->Coverage.SourceDir);
   }
 
 virtual ~XMLParser()
@@ -38,58 +36,46 @@ class cmParseJacocoCoverage::XMLParser: public cmXMLParser
   if(name == "package")
 {
 this->PackageName = atts[1];
-std::string FilePath = this->Coverage.SourceDir +
-  "/" + this->ModuleName + "/src/main/java/" +
-  this->PackageName;
-this->FilePaths.push_back(FilePath);
-FilePath = this->Coverage.SourceDir +
- "/src/main/java/" + this->PackageName;
-this->FilePaths.push_back(FilePath);
+this->PackagePath = "";
 }
   else if(name == "sourcefile")
 {
-this->FileName = atts[1];
-cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
-  "Reading file: " << this->FileName << std::endl,
-  this->Coverage.Quiet);
-  for(size_t i=0;i < FilePaths.size();i++)
-{
-std::string finalpath = FilePaths[i] + "/" + this->FileName;
-if(cmSystemTools::FileExists(finalpath.c_str()))
-  {
-  this->CurFileName = finalpath;
-  break;
-  }
-}
-  cmsys::ifstream fin(this->CurFileName.c_str());
-  if(this->CurFileName == "" || !fin )
+std::string fileName = atts[1];
+
+if (this->PackagePath == "")
   {
-this->CurFileName = this->Coverage.BinaryDir + "/" +
-   this->FileName;
-fin.open(this->CurFileName.c_str());
-if (!fin)
+  if(!this->FindPackagePath(fileName))
 {
-  cmCTestLog(this->CTest, ERROR_MESSAGE,
- "Jacoco Coverage: Error opening " << this->CurFileName
- << std::endl);
-  this->Coverage.Error++;
+cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find file: "
+  << this->PackageName << "/" << fileName << std::endl);
+this->Coverage.Error++;
+return;
 }
   }
-  std::string line;
-  FileLinesType& curFileLines =
-this->Coverage.TotalCoverage[this->CurFileName];
-  if(fin)
-{
-curFileLines.push_back(-1);
-}
-  while(cmSystemTools::GetLineFromStream(fin, line))
+
+cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+  "Reading file: " << fileName << std::endl,
+  this->Coverage.Quiet);
+
+this->FilePath = this->PackagePath + "/" + fileName;
+cmsys::ifstream fin(this->FilePath.c_str());
+if (!fin)
   {
-curFileLines.push_back(-1);
+  cmCTestLog(this->CTest, ERROR_MESSAGE,
+

[Cmake-commits] CMake branch, next, updated. v3.3.1-2676-g26f1c64

2015-09-01 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  26f1c64fc48a8f86f4e83e6c5ae29ced03e641a4 (commit)
   via  321d8265d108dc9645a84975841d9d89124d471d (commit)
  from  51e62249592aedb7b5acfbe649004020efb5073d (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26f1c64fc48a8f86f4e83e6c5ae29ced03e641a4
commit 26f1c64fc48a8f86f4e83e6c5ae29ced03e641a4
Merge: 51e6224 321d826
Author: Brad King 
AuthorDate: Tue Sep 1 09:48:25 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 09:48:25 2015 -0400

Merge topic 'release-scripts-osx-doc-dir' into next

321d8265 Revert topic 'release-scripts-osx-doc-dir'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=321d8265d108dc9645a84975841d9d89124d471d
commit 321d8265d108dc9645a84975841d9d89124d471d
Author: Brad King 
AuthorDate: Tue Sep 1 09:47:26 2015 -0400
Commit: Brad King 
CommitDate: Tue Sep 1 09:47:36 2015 -0400

Revert topic 'release-scripts-osx-doc-dir'

The actual release tarballs use separate documentation tarball
generation so the location of the html docs is not controlled
by the per-machine release scripts.

diff --git a/Utilities/Release/dashmacmini2_release.cmake 
b/Utilities/Release/dashmacmini2_release.cmake
index cd4c5a1..01f5b8b 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -1,7 +1,7 @@
 set(PROCESSORS 2)
 set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
 set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc   
-o
-shared-libgcc -lstdc++-static\\\")")
-set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
+set(INSTALL_PREFIX /)
 set(HOST dashmacmini2)
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j2")
diff --git a/Utilities/Release/dashmacmini5_release.cmake 
b/Utilities/Release/dashmacmini5_release.cmake
index b147013..be1dfa9 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -1,7 +1,7 @@
 set(PROCESSORS 4)
 set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
 # set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc   
-o
-shared-libgcc -lstdc++-static\\\")")
-set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
+set(INSTALL_PREFIX /)
 set(HOST dashmacmini5)
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j5")
diff --git a/Utilities/Release/release_cmake.sh.in 
b/Utilities/Release/release_cmake.sh.in
index 06e720f..76fdb3a 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -116,9 +116,15 @@ if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then
 @CMAKE_CONFIGURE_PATH@ ../@CMAKE_CREATE_VERSION@
 check_exit_value $? "Configure cmake" || exit 1
 else
-echo  "Run cmake bootstrap @BOOTSTRAP_ARGS@ --parallel=@PROCESSORS@"
-../@CMAKE_CREATE_VERSION@/bootstrap @BOOTSTRAP_ARGS@ 
--parallel=@PROCESSORS@
-check_exit_value $? "Bootstrap cmake" || exit 1
+if [ -z "@INSTALL_PREFIX@" ]; then
+   echo  "Run cmake bootstrap --parallel=@PROCESSORS@"
+   ../@CMAKE_CREATE_VERSION@/bootstrap --parallel=@PROCESSORS@
+   check_exit_value $? "Bootstrap cmake" || exit 1
+else
+   echo  "Run cmake bootstrap --prefix=@INSTALL_PREFIX@ 
--parallel=@PROCESSORS@"
+   ../@CMAKE_CREATE_VERSION@/bootstrap --prefix=@INSTALL_PREFIX@ 
--parallel=@PROCESSORS@
+   check_exit_value $? "Bootstrap cmake" || exit 1
+fi
 fi
 
 echo "Build cmake with @MAKE@"

---

Summary of changes:
 Utilities/Release/dashmacmini2_release.cmake |2 +-
 Utilities/Release/dashmacmini5_release.cmake |2 +-
 Utilities/Release/release_cmake.sh.in|   12 +---
 3 files changed, 11 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.3.1-2674-g51e6224

2015-09-01 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  51e62249592aedb7b5acfbe649004020efb5073d (commit)
   via  9025eeb71d2499e18ec53bad7c6766f576074990 (commit)
  from  13bfc90b30f10c06eabacd22332a33c348057863 (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51e62249592aedb7b5acfbe649004020efb5073d
commit 51e62249592aedb7b5acfbe649004020efb5073d
Merge: 13bfc90 9025eeb
Author: Brad King 
AuthorDate: Tue Sep 1 09:27:51 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 09:27:51 2015 -0400

Merge topic 'release-scripts-osx-doc-dir' into next

9025eeb7 fixup! Utilities/Release: Install docs in unversioned dir on OS X 
(#15692)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9025eeb71d2499e18ec53bad7c6766f576074990
commit 9025eeb71d2499e18ec53bad7c6766f576074990
Author: Brad King 
AuthorDate: Tue Sep 1 09:27:27 2015 -0400
Commit: Brad King 
CommitDate: Tue Sep 1 09:27:27 2015 -0400

fixup! Utilities/Release: Install docs in unversioned dir on OS X (#15692)

diff --git a/Utilities/Release/dashmacmini2_release.cmake 
b/Utilities/Release/dashmacmini2_release.cmake
index 2802e47..cd4c5a1 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -1,7 +1,7 @@
 set(PROCESSORS 2)
 set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
 set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc   
-o
-shared-libgcc -lstdc++-static\\\")")
-set(INSTALL_PREFIX /)
+set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
 set(HOST dashmacmini2)
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j2")
@@ -9,7 +9,6 @@ set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
 set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
-CMAKE_DOC_DIR:PATH=doc/cmake
 CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
 CMAKE_USE_OPENSSL:BOOL=ON
 
OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a
diff --git a/Utilities/Release/dashmacmini5_release.cmake 
b/Utilities/Release/dashmacmini5_release.cmake
index 0278f28..b147013 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -1,7 +1,7 @@
 set(PROCESSORS 4)
 set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
 # set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc   
-o
-shared-libgcc -lstdc++-static\\\")")
-set(INSTALL_PREFIX /)
+set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
 set(HOST dashmacmini5)
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j5")
@@ -14,7 +14,6 @@ 
OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcry
 OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1g-install/include
 OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libssl.a
 CMAKE_BUILD_TYPE:STRING=Release
-CMAKE_DOC_DIR:PATH=doc/cmake
 CMAKE_OSX_ARCHITECTURES:STRING=x86_64
 CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
diff --git a/Utilities/Release/release_cmake.sh.in 
b/Utilities/Release/release_cmake.sh.in
index 76fdb3a..06e720f 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -116,15 +116,9 @@ if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then
 @CMAKE_CONFIGURE_PATH@ ../@CMAKE_CREATE_VERSION@
 check_exit_value $? "Configure cmake" || exit 1
 else
-if [ -z "@INSTALL_PREFIX@" ]; then
-   echo  "Run cmake bootstrap --parallel=@PROCESSORS@"
-   ../@CMAKE_CREATE_VERSION@/bootstrap --parallel=@PROCESSORS@
-   check_exit_value $? "Bootstrap cmake" || exit 1
-else
-   echo  "Run cmake bootstrap --prefix=@INSTALL_PREFIX@ 
--parallel=@PROCESSORS@"
-   ../@CMAKE_CREATE_VERSION@/bootstrap --prefix=@INSTALL_PREFIX@ 
--parallel=@PROCESSORS@
-   check_exit_value $? "Bootstrap cmake" || exit 1
-fi
+echo  "Run cmake bootstrap @BOOTSTRAP_ARGS@ --parallel=@PROCESSORS@"
+../@CMAKE_CREATE_VERSION@/bootstrap @BOOTSTRAP_ARGS@ 
--parallel=@PROCESSORS@
+check_exit_value $? "Bootstrap cmake" || exit 1
 fi
 
 echo "Build cmake with @MAKE@"

---

Summary of changes:
 Utilities/Release/dashmacmini2_release.cmake |3 +--
 Utilities/Release/dashmacmini5_release.cmake |3 +--
 Utilities/Release/release_cmake.sh.in|   12 +++-
 3 files changed, 5 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list

[Cmake-commits] CMake branch, next, updated. v3.3.1-2672-g13bfc90

2015-09-01 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  13bfc90b30f10c06eabacd22332a33c348057863 (commit)
   via  54ec4cc692fbc7ff41aef5dd3b11dec0891ff3ac (commit)
  from  b53baca15b6531a1f4c68f8bdbd1bdf10bc1ec94 (commit)

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

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13bfc90b30f10c06eabacd22332a33c348057863
commit 13bfc90b30f10c06eabacd22332a33c348057863
Merge: b53baca 54ec4cc
Author: Brad King 
AuthorDate: Tue Sep 1 09:09:20 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Sep 1 09:09:20 2015 -0400

Merge topic 'modules-no-soname' into next

54ec4cc6 Tests: Use a less strict regular expression to look for "SONAME"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54ec4cc692fbc7ff41aef5dd3b11dec0891ff3ac
commit 54ec4cc692fbc7ff41aef5dd3b11dec0891ff3ac
Author: Raphael Kubo da Costa 
AuthorDate: Tue Sep 1 00:25:37 2015 +0200
Commit: Brad King 
CommitDate: Tue Sep 1 08:48:01 2015 -0400

Tests: Use a less strict regular expression to look for "SONAME"

Commit 899458ab (Tests: Cover NO_SONAME property for SHARED libraries,
2015-08-20) introduced a few new ExportImport tests, and the
check_lib_{no}soname.cmake scripts that parse readelf(1)'s output.

Make the regular expression matching the SONAME line output by readelf
less strict, as the output format varies across implementations: GNU
binutils' readelf is the only one to write each ELF header within
parentheses (which the previous regular expression expected).  The new
tests were thus failing when either Fedora's elfutils (eu-readelf) or
elftoolchain's readelf (present on recent FreeBSD versions) were being
used, as they both list the headers without parentheses.

diff --git a/Tests/ExportImport/Import/A/check_lib_nosoname.cmake 
b/Tests/ExportImport/Import/A/check_lib_nosoname.cmake
index 6261ff4..613391e 100644
--- a/Tests/ExportImport/Import/A/check_lib_nosoname.cmake
+++ b/Tests/ExportImport/Import/A/check_lib_nosoname.cmake
@@ -1,5 +1,5 @@
 execute_process(COMMAND ${readelf} -d ${lib} OUTPUT_FILE ${lib}.readelf.txt)
-file(STRINGS ${lib}.readelf.txt soname REGEX "\\(SONAME\\)")
+file(STRINGS ${lib}.readelf.txt soname REGEX "SONAME")
 if(soname)
   message(FATAL_ERROR "${lib} has soname but should not:\n  ${soname}")
 else()
diff --git a/Tests/ExportImport/Import/A/check_lib_soname.cmake 
b/Tests/ExportImport/Import/A/check_lib_soname.cmake
index 7794e80..a3c4b54 100644
--- a/Tests/ExportImport/Import/A/check_lib_soname.cmake
+++ b/Tests/ExportImport/Import/A/check_lib_soname.cmake
@@ -1,5 +1,5 @@
 execute_process(COMMAND ${readelf} -d ${lib} OUTPUT_FILE ${lib}.readelf.txt)
-file(STRINGS ${lib}.readelf.txt soname REGEX "\\(SONAME\\)")
+file(STRINGS ${lib}.readelf.txt soname REGEX "SONAME")
 if(soname)
   message(STATUS "${lib} has soname as expected:\n  ${soname}")
 else()

---

Summary of changes:
 Tests/ExportImport/Import/A/check_lib_nosoname.cmake |2 +-
 Tests/ExportImport/Import/A/check_lib_soname.cmake   |2 +-
 2 files 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