[Cmake-commits] CMake branch, master, updated. v3.0.0-1476-gea3e544
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 ea3e544098232edcaddf11c5fee5819256c92936 (commit) via f7d62cac79f856c9c7b634ed7f5d2f6030b7ba76 (commit) from a263cab6c22ecfdd18ed592b9efb2d8a8c505852 (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=ea3e544098232edcaddf11c5fee5819256c92936 commit ea3e544098232edcaddf11c5fee5819256c92936 Merge: a263cab f7d62ca Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 23 09:44:32 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 23 09:44:32 2014 -0400 Merge topic 'fix_sanitizer_test_to_work_with_sanitizer' f7d62cac Fix leak and address sanitizer tests to be able to run with real tools. --- Summary of changes: Tests/CTestTestMemcheck/CMakeLists.txt |4 ++-- Tests/CTestTestMemcheck/testAddressSanitizer.cmake |4 Tests/CTestTestMemcheck/testLeakSanitizer.cmake|4 3 files changed, 10 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.0.0-1478-g91d2151
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 91d21518ae652089dd94a3c9d09e5e800ab0dd6b (commit) via f5c0efdbe4d67a6f262dd670923674b003af1726 (commit) from ea3e544098232edcaddf11c5fee5819256c92936 (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=91d21518ae652089dd94a3c9d09e5e800ab0dd6b commit 91d21518ae652089dd94a3c9d09e5e800ab0dd6b Merge: ea3e544 f5c0efd Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 23 09:44:34 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 23 09:44:34 2014 -0400 Merge topic 'refactor-generator-startup' f5c0efdb cmGlobalGenerator: Create a non-virtual 'DoGenerate' method --- Summary of changes: Source/cmGlobalGenerator.cxx |7 ++- Source/cmGlobalGenerator.h |4 +++- Source/cmGlobalNinjaGenerator.h |6 +++--- Source/cmGlobalVisualStudio10Generator.h |4 ++-- Source/cmGlobalVisualStudio6Generator.h |8 +--- Source/cmGlobalVisualStudio7Generator.h |8 +--- Source/cmGlobalVisualStudio8Generator.h |2 +- Source/cmGlobalVisualStudioGenerator.h |7 ++- Source/cmGlobalXCodeGenerator.h |9 ++--- Source/cmake.cxx |2 +- 10 files changed, 22 insertions(+), 35 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.0.0-1474-ga263cab
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 a263cab6c22ecfdd18ed592b9efb2d8a8c505852 (commit) via fb95f820e06eb1933a7d3b71bc46eed4d5d25ee6 (commit) from 3e3ab2adb4a70352a41b469788a2885b20a86fef (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=a263cab6c22ecfdd18ed592b9efb2d8a8c505852 commit a263cab6c22ecfdd18ed592b9efb2d8a8c505852 Merge: 3e3ab2a fb95f82 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 23 09:44:29 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 23 09:44:29 2014 -0400 Merge topic 'fix-complex-test-policies' fb95f820 Tests: Set policies in 'complex' tests --- Summary of changes: Tests/Complex/CMakeLists.txt | 15 +++ Tests/ComplexOneConfig/CMakeLists.txt | 15 +++ 2 files changed, 30 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.0.0-1483-gfe4e6ed
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 fe4e6ed991b936e147536832bbf7190f05887814 (commit) via 848fab9575271f41c9632086011af4c4560702e3 (commit) via 85cea8a7af77cd482f4d3c7ec15f68bc5adeb0ba (commit) via e7ee892b391992e0e8198917b8ef5cce76da2fd1 (commit) via 9f92a78be21a7f126f1776d481cc4bd2acdf4a1b (commit) from 91d21518ae652089dd94a3c9d09e5e800ab0dd6b (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=fe4e6ed991b936e147536832bbf7190f05887814 commit fe4e6ed991b936e147536832bbf7190f05887814 Merge: 91d2151 848fab9 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 23 09:44:35 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 23 09:44:35 2014 -0400 Merge topic 'refactor-makerule-path-conversion' 848fab95 cmGlobalVisualStudio7Generator: Remove unused variable 85cea8a7 cmDepends: Refactor object file path conversion e7ee892b cmLocalGenerator: Fix AddBuildTargetRule object file path conversion 9f92a78b cmLocalGenerator: Rename 'MAKEFILE' to 'MAKERULE' --- Summary of changes: Source/cmDepends.cxx|7 +- Source/cmDependsC.cxx | 12 ++--- Source/cmDependsFortran.cxx | 35 +++ Source/cmGlobalUnixMakefileGenerator3.cxx |2 +- Source/cmGlobalVisualStudio7Generator.cxx |1 - Source/cmLocalGenerator.cxx |4 +-- Source/cmLocalGenerator.h |2 +- Source/cmLocalUnixMakefileGenerator3.cxx|4 +-- Source/cmMakefileTargetGenerator.cxx|6 ++--- Source/cmMakefileUtilityTargetGenerator.cxx |2 +- 10 files changed, 40 insertions(+), 35 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.0.0-4449-g1b15ba0
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 1b15ba06c301bffb0a1c8ea0bb38618ba7f07f45 (commit) via fe4e6ed991b936e147536832bbf7190f05887814 (commit) via 91d21518ae652089dd94a3c9d09e5e800ab0dd6b (commit) via ea3e544098232edcaddf11c5fee5819256c92936 (commit) via a263cab6c22ecfdd18ed592b9efb2d8a8c505852 (commit) via 3e3ab2adb4a70352a41b469788a2885b20a86fef (commit) from eb4594dca202769dc583ea12579fef626295a572 (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=1b15ba06c301bffb0a1c8ea0bb38618ba7f07f45 commit 1b15ba06c301bffb0a1c8ea0bb38618ba7f07f45 Merge: eb4594d fe4e6ed Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 23 09:46:15 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jul 23 09:46:15 2014 -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, next, updated. v3.0.0-4461-g0bf9d58
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 0bf9d5879e628db98995563428cd3089f4bede3b (commit)
via 57a2df224a4bcf4463937d5e121f917d450c144f (commit)
from c8bae9bacafb95d99f9ebfacf8fdfedbbaf56760 (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=0bf9d5879e628db98995563428cd3089f4bede3b
commit 0bf9d5879e628db98995563428cd3089f4bede3b
Merge: c8bae9b 57a2df2
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Wed Jul 23 11:14:20 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 23 11:14:20 2014 -0400
Merge topic 'fix_tar_leaks' into next
57a2df22 Fix memory leaks in extract tar.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57a2df224a4bcf4463937d5e121f917d450c144f
commit 57a2df224a4bcf4463937d5e121f917d450c144f
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Wed Jul 23 11:13:17 2014 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Wed Jul 23 11:13:17 2014 -0400
Fix memory leaks in extract tar.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 444e143..fbb4416 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1701,6 +1701,8 @@ bool extract_tar(const char* outFileName, bool verbose,
{
cmSystemTools::Error(Problem with archive_read_open_file(): ,
archive_error_string(a));
+archive_write_free(ext);
+archive_read_close(a);
return false;
}
for (;;)
@@ -1776,6 +1778,7 @@ bool extract_tar(const char* outFileName, bool verbose,
}
}
}
+ archive_write_free(ext);
archive_read_close(a);
archive_read_finish(a);
return r == ARCHIVE_EOF || r == ARCHIVE_OK;
---
Summary of changes:
Source/cmSystemTools.cxx |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.0.0-4463-g4d5b9ce
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 4d5b9cedbbfc835801712143fd4b87da729dbdea (commit) via 3119297312e0a512c71863621a137871f405788a (commit) from 0bf9d5879e628db98995563428cd3089f4bede3b (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=4d5b9cedbbfc835801712143fd4b87da729dbdea commit 4d5b9cedbbfc835801712143fd4b87da729dbdea Merge: 0bf9d58 3119297 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 23 11:40:01 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Jul 23 11:40:01 2014 -0400 Merge topic 'add-liblzma' into next 31192973 liblzma: Port to VS 7.0 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3119297312e0a512c71863621a137871f405788a commit 3119297312e0a512c71863621a137871f405788a Author: Brad King brad.k...@kitware.com AuthorDate: Wed Jul 23 11:38:18 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Jul 23 11:38:18 2014 -0400 liblzma: Port to VS 7.0 Use the same UINT64_C suffix as that for VS 6. diff --git a/Utilities/cmliblzma/common/sysdefs.h b/Utilities/cmliblzma/common/sysdefs.h index 81e10c1..7481e3d 100644 --- a/Utilities/cmliblzma/common/sysdefs.h +++ b/Utilities/cmliblzma/common/sysdefs.h @@ -51,7 +51,7 @@ #endif -#if defined(_MSC_VER) (_MSC_VER = 1200) +#if defined(_MSC_VER) (_MSC_VER 1310) # define UINT64_C(n) n ## ui64 #endif --- Summary of changes: Utilities/cmliblzma/common/sysdefs.h |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.0.0-4465-g07a2eb5
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 07a2eb5d4fb3988bf61c71bad00636464a736e4a (commit)
via 96e815146d6b185fcd0d024ee03ced59e6789341 (commit)
from 4d5b9cedbbfc835801712143fd4b87da729dbdea (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=07a2eb5d4fb3988bf61c71bad00636464a736e4a
commit 07a2eb5d4fb3988bf61c71bad00636464a736e4a
Merge: 4d5b9ce 96e8151
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 23 11:55:01 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 23 11:55:01 2014 -0400
Merge topic 'add-liblzma' into next
96e81514 liblzma: Disable warnings to avoid changing 3rd party code
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96e815146d6b185fcd0d024ee03ced59e6789341
commit 96e815146d6b185fcd0d024ee03ced59e6789341
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 23 11:55:25 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 23 11:55:25 2014 -0400
liblzma: Disable warnings to avoid changing 3rd party code
diff --git a/Utilities/cmliblzma/CMakeLists.txt
b/Utilities/cmliblzma/CMakeLists.txt
index 85efa8c..fc50dbe 100644
--- a/Utilities/cmliblzma/CMakeLists.txt
+++ b/Utilities/cmliblzma/CMakeLists.txt
@@ -190,6 +190,16 @@ INCLUDE_DIRECTORIES(
${CMLIBLZMA_BINARY_DIR}
)
+# Disable warnings to avoid changing 3rd party code.
+IF(${CMAKE_C_COMPILER_ID} MATCHES
+^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$)
+ SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -w)
+ELSEIF(${CMAKE_C_COMPILER_ID} MATCHES ^(PathScale)$)
+ SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -woffall)
+ELSEIF(BORLAND)
+ SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -w-)
+ENDIF()
+
ADD_LIBRARY(cmliblzma ${LZMA_SRCS})
INSTALL(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmliblzma)
---
Summary of changes:
Utilities/cmliblzma/CMakeLists.txt | 10 ++
1 file changed, 10 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.0.0-4471-g0afd1b4
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 0afd1b43e011968426a0d8f892f03039334d997c (commit)
via 09164c637b02f964152453bdbe1b1591c39c1f7c (commit)
via 29a0642ba78392ab20037e677d28eae2eea23de7 (commit)
via 8fa087ab38c41e76e502f438eff42d412962108f (commit)
via 1c209ac165cd2c25c632cdd238a9948c1651f907 (commit)
via 91c933546d1eebb6a637f403824d63177c86c11e (commit)
from 07a2eb5d4fb3988bf61c71bad00636464a736e4a (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=0afd1b43e011968426a0d8f892f03039334d997c
commit 0afd1b43e011968426a0d8f892f03039334d997c
Merge: 07a2eb5 09164c6
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 23 16:23:13 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 23 16:23:13 2014 -0400
Merge topic 'vs-escaping' into next
09164c63 VS: Encode more content correctly in vcxproj files (#15031)
29a0642b VS: Encode mapped flag values in XML project files (#15031)
8fa087ab cmVisualStudioGeneratorOptions: Simplify XML escaping API
1c209ac1 cmIDEOption: Store mapped flag values as a vectorstring
91c93354 cmVisualStudio10TargetGenerator: Remove dupilcate line
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09164c637b02f964152453bdbe1b1591c39c1f7c
commit 09164c637b02f964152453bdbe1b1591c39c1f7c
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 23 15:03:28 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 23 15:14:47 2014 -0400
VS: Encode more content correctly in vcxproj files (#15031)
In cmVisualStudio10TargetGenerator, add missing cmVS10EscapeXML
calls around paths to source and object files, custom command
dependencies and outputs, and platform name/version values.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 2429e59..5674317 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -343,19 +343,20 @@ void cmVisualStudio10TargetGenerator::Generate()
}
this-WriteString(Platform, 2);
- (*this-BuildFileStream) this-Platform /Platform\n;
+ (*this-BuildFileStream) cmVS10EscapeXML(this-Platform)
+/Platform\n;
const char* projLabel = this-Target-GetProperty(PROJECT_LABEL);
if(!projLabel)
{
projLabel = this-Name.c_str();
}
this-WriteString(ProjectName, 2);
- (*this-BuildFileStream) projLabel /ProjectName\n;
+ (*this-BuildFileStream) cmVS10EscapeXML(projLabel) /ProjectName\n;
if(const char* targetFrameworkVersion = this-Target-GetProperty(
VS_DOTNET_TARGET_FRAMEWORK_VERSION))
{
this-WriteString(TargetFrameworkVersion, 2);
-(*this-BuildFileStream) targetFrameworkVersion
+(*this-BuildFileStream) cmVS10EscapeXML(targetFrameworkVersion)
/TargetFrameworkVersion\n;
}
this-WriteString(/PropertyGroup\n, 1);
@@ -507,7 +508,8 @@ void
cmVisualStudio10TargetGenerator::WriteProjectConfigurations()
this-WriteString(Configuration, 3);
(*this-BuildFileStream ) *i /Configuration\n;
this-WriteString(Platform, 3);
-(*this-BuildFileStream) this-Platform /Platform\n;
+(*this-BuildFileStream) cmVS10EscapeXML(this-Platform)
+ /Platform\n;
this-WriteString(/ProjectConfiguration\n, 2);
}
this-WriteString(/ItemGroup\n, 1);
@@ -700,7 +702,7 @@
cmVisualStudio10TargetGenerator::WriteCustomRule(cmSourceFile const* source,
(*this-BuildFileStream ) script /Command\n;
this-WritePlatformConfigTag(AdditionalInputs, i-c_str(), 3);
-(*this-BuildFileStream ) source-GetFullPath();
+(*this-BuildFileStream ) cmVS10EscapeXML(source-GetFullPath());
for(std::vectorstd::string::const_iterator d =
ccg.GetDepends().begin();
d != ccg.GetDepends().end();
@@ -710,7 +712,7 @@
cmVisualStudio10TargetGenerator::WriteCustomRule(cmSourceFile const* source,
if(this-LocalGenerator-GetRealDependency(d-c_str(), i-c_str(), dep))
{
this-ConvertToWindowsSlash(dep);
-(*this-BuildFileStream ) ; dep;
+(*this-BuildFileStream ) ; cmVS10EscapeXML(dep);
}
}
(*this-BuildFileStream ) ;%(AdditionalInputs)/AdditionalInputs\n;
@@ -723,7 +725,7 @@
cmVisualStudio10TargetGenerator::WriteCustomRule(cmSourceFile const* source,
{
std::string out = *o;
this-ConvertToWindowsSlash(out);
- (*this-BuildFileStream ) sep out;
+
[Cmake-commits] CMake branch, next, updated. v3.0.0-4474-g8f819c4
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 8f819c4968965da6864b39446885e6ee51eb5d54 (commit)
via a943d41d5c275fc30803909defd2d9adb557b518 (commit)
via a9006316315bd4f0d091bdb2a5cb2f8de3e08e63 (commit)
from 0afd1b43e011968426a0d8f892f03039334d997c (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=8f819c4968965da6864b39446885e6ee51eb5d54
commit 8f819c4968965da6864b39446885e6ee51eb5d54
Merge: 0afd1b4 a943d41
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 23 16:35:08 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 23 16:35:08 2014 -0400
Merge topic 'cpack-ifw-generator' into next
a943d41d CPackIFW: Replace use of strftime with cmTimestamp
a9006316 CPack: Add an IFW generator for Qt Framework Installer
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a943d41d5c275fc30803909defd2d9adb557b518
commit a943d41d5c275fc30803909defd2d9adb557b518
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Jul 23 16:31:15 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 23 16:35:51 2014 -0400
CPackIFW: Replace use of strftime with cmTimestamp
The latter is more portable.
diff --git a/Source/CPack/cmCPackIFWGenerator.cxx
b/Source/CPack/cmCPackIFWGenerator.cxx
index a4f33b4..51c0f2e 100644
--- a/Source/CPack/cmCPackIFWGenerator.cxx
+++ b/Source/CPack/cmCPackIFWGenerator.cxx
@@ -19,6 +19,7 @@
#include cmGeneratedFileStream.h
#include cmCPackLog.h
#include cmCPackComponentGroup.h
+#include cmTimestamp.h
#include cmsys/SystemTools.hxx
#include cmsys/Glob.hxx
@@ -809,16 +810,8 @@ int cmCPackIFWGenerator::IfwCreatePackageFile()
//--
std::string cmCPackIFWGenerator::IfwCreateCurrentDate()
{
- time_t rawtime;
- struct tm * timeinfo;
- char buffer[80];
-
- time (rawtime);
- timeinfo = localtime(rawtime);
-
- strftime(buffer, 80, %Y-%m-%d, timeinfo);
-
- return buffer;
+ cmTimestamp timestamp;
+ return timestamp.CurrentTime(%Y-%m-%d, false);
}
//--
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9006316315bd4f0d091bdb2a5cb2f8de3e08e63
commit a9006316315bd4f0d091bdb2a5cb2f8de3e08e63
Author: Konstantin Podsvirov konstan...@podsvirov.pro
AuthorDate: Wed Jul 23 11:01:59 2014 +0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Jul 23 16:35:45 2014 -0400
CPack: Add an IFW generator for Qt Framework Installer
Add support for packaging with the Qt Framework Installer tools:
http://qt-project.org/doc/qtinstallerframework/index.html
Reviewed-by: Nils Gladitz nilsglad...@gmail.com
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index fb55bfc..9d56779 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -59,11 +59,39 @@ if(EXISTS ${CMAKE_ROOT}/Modules/CPack.cmake)
if(${CPACK_SYSTEM_NAME} MATCHES Windows)
if(CMAKE_CL_64)
set(CPACK_SYSTEM_NAME win64-x64)
+ set(CPACK_IFW_TARGET_DIRECTORY @RootDir@/Program
Files/${CMAKE_PROJECT_NAME})
else()
set(CPACK_SYSTEM_NAME win32-x86)
endif()
endif()
+ # default component for IFW
+ set(_CPACK_IFW_COMPONENT_NAME ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
+ string(TOUPPER ${_CPACK_IFW_COMPONENT_NAME} _CPACK_IFW_COMPONENT_UNAME)
+
+ if(${CMAKE_SYSTEM_NAME} MATCHES Windows)
+if(BUILD_QtDialog)
+ set(_CPACK_IFW_SHORTCUT_OPTIONAL
${_CPACK_IFW_SHORTCUT_OPTIONAL}component.addOperation(\CreateShortcut\,
\@TargetDir@/bin/cmake-gui.exe\, \@StartMenuDir@/CMake
(cmake-gui).lnk\);\n)
+endif()
+if(SPHINX_HTML)
+ set(_CPACK_IFW_SHORTCUT_OPTIONAL
${_CPACK_IFW_SHORTCUT_OPTIONAL}component.addOperation(\CreateShortcut\,
\@TargetDir@/doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}/html/index.html\,
\@StartMenuDir@/CMake Documentation.lnk\);\n)
+endif()
+configure_file(${CMake_SOURCE_DIR}/Source/QtIFW/installscript.qs.in
+ ${CMake_BINARY_DIR}/installscript.qs @ONLY
+)
+install(FILES ${CMake_SOURCE_DIR}/Source/QtIFW/cmake.org.html
+ DESTINATION .
+)
+set(_CPACK_IFW_COMPONENT_SCRIPT
set(CPACK_IFW_COMPONENT_${_CPACK_IFW_COMPONENT_UNAME}_SCRIPT
\${CMake_BINARY_DIR}/installscript.qs\))
+ endif()
+
+ if(${CMAKE_SYSTEM_NAME} MATCHES Linux)
+set(CPACK_IFW_TARGET_DIRECTORY @HomeDir@/${CMAKE_PROJECT_NAME})
+set(CPACK_IFW_ADMIN_TARGET_DIRECTORY
@ApplicationsDir@/${CMAKE_PROJECT_NAME})
+ endif()
+
+ set(_CPACK_IFW_PACKAGE_VERSION
[Cmake-commits] CMake branch, master, updated. v3.0.0-1484-gafe21fc
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 afe21fc3c43af0c031a77b3b48041d35f248f481 (commit) from fe4e6ed991b936e147536832bbf7190f05887814 (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=afe21fc3c43af0c031a77b3b48041d35f248f481 commit afe21fc3c43af0c031a77b3b48041d35f248f481 Author: Kitware Robot kwro...@kitware.com AuthorDate: Thu Jul 24 00:01:10 2014 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Thu Jul 24 00:01:10 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 2d17cbe..054cf09 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 0) -set(CMake_VERSION_PATCH 20140723) +set(CMake_VERSION_PATCH 20140724) #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
