date:20151119

[Cmake-commits] CMake branch, next, updated. v3.4.0-1431-g49e1c1d

2015-11-19 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  49e1c1d7819707a52a5acf37dad5457c4ea3061b (commit)
   via  22ff7d51595092f5e12e0d604ba5c808ca1e9447 (commit)
  from  199e3b8d359905d04539712cb67a8d3e2a371735 (commit)

Those revisions listed 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=49e1c1d7819707a52a5acf37dad5457c4ea3061b
commit 49e1c1d7819707a52a5acf37dad5457c4ea3061b
Merge: 199e3b8 22ff7d5
Author: Brad King 
AuthorDate: Thu Nov 19 13:18:46 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 19 13:18:46 2015 -0500

Merge topic 'avoid-divide-by-zero' into next

22ff7d51 cmELF: Avoid divide by zero if there are no dynamic sections


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22ff7d51595092f5e12e0d604ba5c808ca1e9447
commit 22ff7d51595092f5e12e0d604ba5c808ca1e9447
Author: Ty Smith 
AuthorDate: Thu Nov 19 11:04:34 2015 -0600
Commit: Brad King 
CommitDate: Thu Nov 19 13:17:16 2015 -0500

cmELF: Avoid divide by zero if there are no dynamic sections

diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index d062987..37dd328 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -567,8 +567,14 @@ bool cmELFInternalImpl::LoadDynamicSection()
 return true;
 }
 
-  // Allocate the dynamic section entries.
+  // If there are no entries we are done.
   ELF_Shdr const& sec = this->SectionHeaders[this->DynamicSectionIndex];
+  if(sec.sh_entsize == 0)
+{
+return false;
+}
+
+  // Allocate the dynamic section entries.
   int n = static_cast(sec.sh_size / sec.sh_entsize);
   this->DynamicSectionEntries.resize(n);
 

---

Summary of changes:
 Source/cmELF.cxx |8 +++-
 1 file changed, 7 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.4.0-1433-gf0b50da

2015-11-19 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  f0b50da14d9f14b1a548784eeddfd16eedc0cfea (commit)
   via  f5cd92a82600067835c05c7e82726161a150a50b (commit)
  from  49e1c1d7819707a52a5acf37dad5457c4ea3061b (commit)

Those revisions listed 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=f0b50da14d9f14b1a548784eeddfd16eedc0cfea
commit f0b50da14d9f14b1a548784eeddfd16eedc0cfea
Merge: 49e1c1d f5cd92a
Author: Brad King 
AuthorDate: Thu Nov 19 13:20:33 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 19 13:20:33 2015 -0500

Merge topic 'avoid-divide-by-zero' into next

f5cd92a8 cmELF: Avoid divide by zero if there are no dynamic section entries


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5cd92a82600067835c05c7e82726161a150a50b
commit f5cd92a82600067835c05c7e82726161a150a50b
Author: Ty Smith 
AuthorDate: Thu Nov 19 11:04:34 2015 -0600
Commit: Brad King 
CommitDate: Thu Nov 19 13:20:21 2015 -0500

cmELF: Avoid divide by zero if there are no dynamic section entries

diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index d062987..37dd328 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -567,8 +567,14 @@ bool cmELFInternalImpl::LoadDynamicSection()
 return true;
 }
 
-  // Allocate the dynamic section entries.
+  // If there are no entries we are done.
   ELF_Shdr const& sec = this->SectionHeaders[this->DynamicSectionIndex];
+  if(sec.sh_entsize == 0)
+{
+return false;
+}
+
+  // Allocate the dynamic section entries.
   int n = static_cast(sec.sh_size / sec.sh_entsize);
   this->DynamicSectionEntries.resize(n);
 

---

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.4.0-1439-ge8f8a08

2015-11-19 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  e8f8a0805ff5cf70cd962c8365dcff47797cb45d (commit)
   via  3477b26ff6c455b64421bf19000d7203acdd6024 (commit)
   via  7d64a0598db5da2c4c1874f9fe8726fd6c9b18a7 (commit)
   via  866c75dedd42fae9dd05be402bdc94d51ffc7713 (commit)
  from  8cebadd7215fb67b9e2f73e341d8a04520840a04 (commit)

Those revisions listed 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=e8f8a0805ff5cf70cd962c8365dcff47797cb45d
commit e8f8a0805ff5cf70cd962c8365dcff47797cb45d
Merge: 8cebadd 3477b26
Author: Brad King 
AuthorDate: Thu Nov 19 15:49:24 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 19 15:49:24 2015 -0500

Merge topic 'ninja-symbolic-custom-command' into next

3477b26f Ninja: Always re-run custom commands that have symbolic 
dependencies
7d64a059 Ninja: Add 'restat' parameter to custom command generation method
866c75de Ninja: Refactor generation of 'restat' on custom commands


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3477b26ff6c455b64421bf19000d7203acdd6024
commit 3477b26ff6c455b64421bf19000d7203acdd6024
Author: Brad King 
AuthorDate: Thu Nov 19 15:13:11 2015 -0500
Commit: Brad King 
CommitDate: Thu Nov 19 15:47:41 2015 -0500

Ninja: Always re-run custom commands that have symbolic dependencies

If a custom command has a SYMBOLIC output (that is never actually
created) then do not mark the custom command build statement as
'restat'.  Otherwise other custom commands that depend on the symbolic
output may not always re-run because after running the first custom
command Ninja 'restat' will detect that the output timestamp did not
change and skip its dependents.

This was observed with the ExternalProject BUILD_ALWAYS option where
Ninja would not re-run the 'install' step each time 'build' re-runs.

diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index d9517d8..b2927a9 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -398,6 +398,16 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
   const std::vector  = ccg.GetByproducts();
   cmNinjaDeps ninjaOutputs(outputs.size()+byproducts.size()), ninjaDeps;
 
+  bool symbolic = false;
+  for (std::vector::const_iterator o = outputs.begin();
+   o != outputs.end(); ++o)
+{
+if (cmSourceFile* sf = this->Makefile->GetSource(*o))
+  {
+  symbolic = sf->GetPropertyAsBool("SYMBOLIC");
+  }
+}
+
 #if 0
 #error TODO: Once CC in an ExternalProject target must provide the \
 file of each imported target that has an add_dependencies pointing \
@@ -434,7 +444,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
   this->ConstructComment(ccg),
   "Custom command for " + ninjaOutputs[0],
   cc->GetUsesTerminal(),
-  /*restat*/true,
+  /*restat*/!symbolic,
   ninjaOutputs,
   ninjaDeps,
   orderOnlyDeps);
diff --git a/Tests/RunCMake/BuildDepends/Custom-Always.cmake 
b/Tests/RunCMake/BuildDepends/Custom-Always.cmake
new file mode 100644
index 000..d412708
--- /dev/null
+++ b/Tests/RunCMake/BuildDepends/Custom-Always.cmake
@@ -0,0 +1,24 @@
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/before-always
+  COMMAND ${CMAKE_COMMAND} -E touch before-always
+  )
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/always
+  COMMAND ${CMAKE_COMMAND} -E touch always-updated
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/before-always
+  )
+set_property(SOURCE always PROPERTY SYMBOLIC 1)
+add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/after-always
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/always
+  COMMAND ${CMAKE_COMMAND} -E touch after-always
+  )
+
+add_custom_target(drive ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/after-always)
+
+file(GENERATE OUTPUT check-$.cmake CONTENT "
+set(check_pairs
+  
\"${CMAKE_CURRENT_BINARY_DIR}/always-updated|${CMAKE_CURRENT_BINARY_DIR}/before-always\"
+  
\"${CMAKE_CURRENT_BINARY_DIR}/after-always|${CMAKE_CURRENT_BINARY_DIR}/always-updated\"
+  )
+")
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake 
b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
index a578408..31c72fb 100644
--- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
@@ -38,3 +38,5 @@ if(NOT RunCMake_GENERATOR MATCHES "Visual Studio [67]|Xcode")
   run_BuildDepends(C-Exe-Manifest)
   unset(run_BuildDepends_skip_step_2)
 endif()
+

[Cmake-commits] CMake branch, next, updated. v3.4.0-1441-gacb550c

2015-11-19 Thread Bill Hoffman

This is an automated email from 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  acb550c33e9b1c6a19fb7fb9d691bd45bd8ec795 (commit)
   via  75004280af22edd22a3efb7b47d5d87f2da65354 (commit)
  from  e8f8a0805ff5cf70cd962c8365dcff47797cb45d (commit)

Those revisions listed 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=acb550c33e9b1c6a19fb7fb9d691bd45bd8ec795
commit acb550c33e9b1c6a19fb7fb9d691bd45bd8ec795
Merge: e8f8a08 7500428
Author: Bill Hoffman 
AuthorDate: Thu Nov 19 17:24:20 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 19 17:24:20 2015 -0500

Merge topic 'fix_bigobj_64_autodef' into next

75004280 Fix auto export symbols for Dlls containing /bigobj for 64bit 
builds.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75004280af22edd22a3efb7b47d5d87f2da65354
commit 75004280af22edd22a3efb7b47d5d87f2da65354
Author: Bill Hoffman 
AuthorDate: Thu Nov 19 17:21:03 2015 -0500
Commit: Bill Hoffman 
CommitDate: Thu Nov 19 17:21:03 2015 -0500

Fix auto export symbols for Dlls containing /bigobj for 64bit builds.

This fixes a bug where 64 bit builds with /bigobj incorrectly determined
that the object files were not 64 bit. This manifested itself with
printf type functions showing up as undefined because the leading
underscore was being removed and should not be removed.

diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index 64621e0..e7263ae 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -422,7 +422,7 @@ DumpFile(const char* filename,
  DumpSymbols
symbolDumper((cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase, symbols,
 dataSymbols,
-(dosHeader->e_magic == IMAGE_FILE_MACHINE_AMD64));
+(h->Machine == IMAGE_FILE_MACHINE_AMD64));
  symbolDumper.DumpObjFile();
   } else {
  printf("unrecognized file format in '%s'\n", filename);
diff --git a/Tests/RunCMake/AutoExportDll/sub/sub.cxx 
b/Tests/RunCMake/AutoExportDll/sub/sub.cxx
index 9766b41..9a3145e 100644
--- a/Tests/RunCMake/AutoExportDll/sub/sub.cxx
+++ b/Tests/RunCMake/AutoExportDll/sub/sub.cxx
@@ -1,4 +1,6 @@
+#include 
 int sub()
 {
+  printf("");
   return 10;
 }

---

Summary of changes:
 Source/bindexplib.cxx|2 +-
 Tests/RunCMake/AutoExportDll/sub/sub.cxx |2 ++
 2 files 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.4.0-1429-g199e3b8

2015-11-19 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  199e3b8d359905d04539712cb67a8d3e2a371735 (commit)
   via  441dba80322ec1579b34dd64e13bcfcf004f7005 (commit)
  from  20de7946aaa8b225cca300ccb2868578eca8623f (commit)

Those revisions listed 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=199e3b8d359905d04539712cb67a8d3e2a371735
commit 199e3b8d359905d04539712cb67a8d3e2a371735
Merge: 20de794 441dba8
Author: Brad King 
AuthorDate: Thu Nov 19 10:23:59 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 19 10:23:59 2015 -0500

Merge topic 'fix-forced-toolchain-dialect' into next

441dba80 Project: Guess default standard dialect if compiler was forced 
(#15852)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=441dba80322ec1579b34dd64e13bcfcf004f7005
commit 441dba80322ec1579b34dd64e13bcfcf004f7005
Author: Brad King 
AuthorDate: Thu Nov 19 10:12:58 2015 -0500
Commit: Brad King 
CommitDate: Thu Nov 19 10:22:35 2015 -0500

Project: Guess default standard dialect if compiler was forced (#15852)

Prior to commit v3.4.0-rc1~71^2 (Project: Determine default language
dialect for the compiler, 2015-09-15) we always guessed the default
language standard dialect based on the compiler version.  This was not
reliable so that commit switched to computing the default language
standard dialect while detecting the compiler id.

When a toolchain file uses CMakeForceCompiler to set the compiler id
then the detection does not occur.  Therefore commit v3.4.0-rc1~54^2
(Project: Don't require computed default dialect if compiler was forced,
2015-09-22) made the lack of detection an error only if the compiler was
not forced.  However, this means that projects using CMakeForceCompiler
no longer even get the guess that we had before so _COMPILER does
not work.

Due to the sophistication of CMake's compiler detection logic projects
should be ported away from using CMakeForceCompiler.  In the meantime,
restore a guess of the default language standard dialect when the
compiler is forced.

diff --git a/Modules/Compiler/AppleClang-C.cmake 
b/Modules/Compiler/AppleClang-C.cmake
index 5908c26..1cc72c0 100644
--- a/Modules/Compiler/AppleClang-C.cmake
+++ b/Modules/Compiler/AppleClang-C.cmake
@@ -18,6 +18,9 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
   message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for 
${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version 
${CMAKE_C_COMPILER_VERSION}")
 endif()
 set(CMAKE_C_STANDARD_DEFAULT ${CMAKE_C_STANDARD_COMPUTED_DEFAULT})
+  elseif(NOT DEFINED CMAKE_C_STANDARD_DEFAULT)
+# Compiler id was forced so just guess the default standard level.
+set(CMAKE_C_STANDARD_DEFAULT 99)
   endif()
 endif()
 
diff --git a/Modules/Compiler/AppleClang-CXX.cmake 
b/Modules/Compiler/AppleClang-CXX.cmake
index c4e342b..95bc79a 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -28,6 +28,9 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
   message(FATAL_ERROR "CMAKE_CXX_STANDARD_COMPUTED_DEFAULT should be set 
for ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) version 
${CMAKE_CXX_COMPILER_VERSION}")
 endif()
 set(CMAKE_CXX_STANDARD_DEFAULT ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT})
+  elseif(NOT DEFINED CMAKE_CXX_STANDARD_DEFAULT)
+# Compiler id was forced so just guess the default standard level.
+set(CMAKE_CXX_STANDARD_DEFAULT 98)
   endif()
 endif()
 
diff --git a/Modules/Compiler/Clang-C.cmake b/Modules/Compiler/Clang-C.cmake
index a2e81c1..d8b7743 100644
--- a/Modules/Compiler/Clang-C.cmake
+++ b/Modules/Compiler/Clang-C.cmake
@@ -23,6 +23,13 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
   message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for 
${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version 
${CMAKE_C_COMPILER_VERSION}")
 endif()
 set(CMAKE_C_STANDARD_DEFAULT ${CMAKE_C_STANDARD_COMPUTED_DEFAULT})
+  elseif(NOT DEFINED CMAKE_C_STANDARD_DEFAULT)
+# Compiler id was forced so just guess the default standard level.
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6)
+  set(CMAKE_C_STANDARD_DEFAULT 11)
+else()
+  set(CMAKE_C_STANDARD_DEFAULT 99)
+endif()
   endif()
 endif()
 
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 055a8ee..6a0a5e2 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@

[Cmake-commits] CMake branch, master, updated. v3.4.0-552-g193987d

2015-11-19 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  193987d34477858470fef68cb8d34764a660acc2 (commit)
  from  e45e503f140f99f4fcf387e5359e7aba4bb1de0e (commit)

Those revisions listed 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=193987d34477858470fef68cb8d34764a660acc2
commit 193987d34477858470fef68cb8d34764a660acc2
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Fri Nov 20 00:01:08 2015 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Nov 20 00:01:08 2015 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 3eb6f2e..bedf0b2 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 4)
-set(CMake_VERSION_PATCH 20151119)
+set(CMake_VERSION_PATCH 20151120)
 #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.4.0-1423-gced9d8a

2015-11-19 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  ced9d8ada2bc6bb3944cac9d4814a75bbce8aa62 (commit)
   via  cdff176f7ee487d306af138fd3e1ede340d406df (commit)
   via  4ba760260b95a1d23b09130df6ec3e7736af7493 (commit)
   via  3aec561aa20847f1e968448f96723d228e520251 (commit)
   via  4e333e3b32ba2b19b5fb07b9764264add34984b7 (commit)
  from  f639bae9e50a9317798a2a583b08dddc24f85f4e (commit)

Those revisions listed 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=ced9d8ada2bc6bb3944cac9d4814a75bbce8aa62
commit ced9d8ada2bc6bb3944cac9d4814a75bbce8aa62
Merge: f639bae cdff176
Author: Brad King 
AuthorDate: Thu Nov 19 08:55:18 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 19 08:55:18 2015 -0500

Merge topic 'restore-android-no-versioned-soname' into next

cdff176f Merge branch 'backport-android-no-versioned-soname' into 
restore-android-no-versioned-soname
4ba76026 Android: Restore generation of non-versioned soname (#15851)
3aec561a Android: Restore generation of non-versioned soname (#15851)
4e333e3b CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdff176f7ee487d306af138fd3e1ede340d406df
commit cdff176f7ee487d306af138fd3e1ede340d406df
Merge: 4ba7602 3aec561
Author: Brad King 
AuthorDate: Thu Nov 19 08:54:54 2015 -0500
Commit: Brad King 
CommitDate: Thu Nov 19 08:54:54 2015 -0500

Merge branch 'backport-android-no-versioned-soname' into 
restore-android-no-versioned-soname


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ba760260b95a1d23b09130df6ec3e7736af7493
commit 4ba760260b95a1d23b09130df6ec3e7736af7493
Author: Brad King 
AuthorDate: Thu Nov 19 08:51:46 2015 -0500
Commit: Brad King 
CommitDate: Thu Nov 19 08:53:55 2015 -0500

Android: Restore generation of non-versioned soname (#15851)

Our check of CMAKE_PLATFORM_NO_VERSIONED_SONAME, originally added by
commit v3.1.0-rc1~416^2 (Add basic Android platform module, 2014-06-06),
was dropped accidentally by commit v3.4.0-rc1~250^2~21
(cmGeneratorTarget: Move GetLibraryNames from cmTarget, 2015-08-04).
Restore the check in the new location of the GetLibraryNames method.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 40afc0e..cc424b4 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3324,6 +3324,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   const char* version = this->GetProperty("VERSION");
   const char* soversion = this->GetProperty("SOVERSION");
   if(!this->HasSOName(config) ||
+ this->Makefile->IsOn("CMAKE_PLATFORM_NO_VERSIONED_SONAME") ||
  this->IsFrameworkOnApple())
 {
 // Versioning is supported only for shared libraries and modules,

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3aec561aa20847f1e968448f96723d228e520251
commit 3aec561aa20847f1e968448f96723d228e520251
Author: Brad King 
AuthorDate: Thu Nov 19 08:51:46 2015 -0500
Commit: Brad King 
CommitDate: Thu Nov 19 08:52:40 2015 -0500

Android: Restore generation of non-versioned soname (#15851)

Our check of CMAKE_PLATFORM_NO_VERSIONED_SONAME, originally added by
commit v3.1.0-rc1~416^2 (Add basic Android platform module, 2014-06-06),
was dropped accidentally by commit v3.4.0-rc1~250^2~21
(cmGeneratorTarget: Move GetLibraryNames from cmTarget, 2015-08-04).
Restore the check in the new location of the GetLibraryNames method.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 62598f4..194cd88 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2747,6 +2747,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
   const char* version = this->GetProperty("VERSION");
   const char* soversion = this->GetProperty("SOVERSION");
   if(!this->HasSOName(config) ||
+ this->Makefile->IsOn("CMAKE_PLATFORM_NO_VERSIONED_SONAME") ||
  this->Target->IsFrameworkOnApple())
 {
 // Versioning is supported only for shared libraries and modules,

---

Summary of changes:
 Source/CMakeVersion.cmake|2 +-
 Source/cmGeneratorTarget.cxx |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org

[Cmake-commits] CMake branch, master, updated. v3.4.0-547-g65b9d1f

2015-11-19 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  65b9d1f228efb1d028c3682ec5637f431cbc3fc5 (commit)
   via  ca263d1d71d953630e31daa7771dde3c6835b9a2 (commit)
  from  4e333e3b32ba2b19b5fb07b9764264add34984b7 (commit)

Those revisions listed 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=65b9d1f228efb1d028c3682ec5637f431cbc3fc5
commit 65b9d1f228efb1d028c3682ec5637f431cbc3fc5
Merge: 4e333e3 ca263d1
Author: Brad King 
AuthorDate: Thu Nov 19 09:10:23 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 19 09:10:23 2015 -0500

Merge topic 'fix-ms-manifest-no-linker'

ca263d1d MSVC: Fix linking with /MANIFEST:NO option


---

Summary of changes:
 Source/cmcmd.cxx   |4 +++-
 Tests/MSManifest/Subdir/CMakeLists.txt |2 ++
 2 files changed, 5 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.4.0-1427-g20de794

2015-11-19 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  20de7946aaa8b225cca300ccb2868578eca8623f (commit)
   via  e45e503f140f99f4fcf387e5359e7aba4bb1de0e (commit)
   via  db952a58178daebfcd821b7a7d9a7f3ee1279bc8 (commit)
   via  65b9d1f228efb1d028c3682ec5637f431cbc3fc5 (commit)
  from  ced9d8ada2bc6bb3944cac9d4814a75bbce8aa62 (commit)

Those revisions listed 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=20de7946aaa8b225cca300ccb2868578eca8623f
commit 20de7946aaa8b225cca300ccb2868578eca8623f
Merge: ced9d8a e45e503
Author: Brad King 
AuthorDate: Thu Nov 19 09:10:43 2015 -0500
Commit: Brad King 
CommitDate: Thu Nov 19 09:10:43 2015 -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.4.0-551-ge45e503

2015-11-19 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  e45e503f140f99f4fcf387e5359e7aba4bb1de0e (commit)
   via  743fcf1e89a5e5172d46a3202b123bc441ec42ba (commit)
  from  db952a58178daebfcd821b7a7d9a7f3ee1279bc8 (commit)

Those revisions listed 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=e45e503f140f99f4fcf387e5359e7aba4bb1de0e
commit e45e503f140f99f4fcf387e5359e7aba4bb1de0e
Merge: db952a5 743fcf1
Author: Brad King 
AuthorDate: Thu Nov 19 09:10:29 2015 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 19 09:10:29 2015 -0500

Merge topic 'add-cray-linux-platform'

743fcf1e Cray: Fix static / dynamic detection logic and parse more driver 
flags


---

Summary of changes:
 Modules/Platform/CrayPrgEnv.cmake |  154 +
 1 file changed, 88 insertions(+), 66 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.4.0-1431-g49e1c1d

[Cmake-commits] CMake branch, next, updated. v3.4.0-1433-gf0b50da

[Cmake-commits] CMake branch, next, updated. v3.4.0-1439-ge8f8a08

[Cmake-commits] CMake branch, next, updated. v3.4.0-1441-gacb550c

[Cmake-commits] CMake branch, next, updated. v3.4.0-1429-g199e3b8

[Cmake-commits] CMake branch, master, updated. v3.4.0-552-g193987d

[Cmake-commits] CMake branch, next, updated. v3.4.0-1423-gced9d8a

[Cmake-commits] CMake branch, master, updated. v3.4.0-547-g65b9d1f

[Cmake-commits] CMake branch, next, updated. v3.4.0-1427-g20de794

[Cmake-commits] CMake branch, master, updated. v3.4.0-551-ge45e503

10 matches

Site Navigation

Mail list logo

Footer information