[Cmake-commits] CMake branch, next, updated. v2.8.7-2066-g8c508d2
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 8c508d230187b6f03a38b53220717989d08f4d82 (commit)
via c43a18e018f15e5cbb8dcddb8726ec76a5c8ace3 (commit)
via 53da978b3cdab4eabc358f8fee0b0ee99ae8d3cf (commit)
from fab6cbf37535b9e253972d075ab66684e26de555 (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=8c508d230187b6f03a38b53220717989d08f4d82
commit 8c508d230187b6f03a38b53220717989d08f4d82
Merge: fab6cbf c43a18e
Author: Eric Noulard eric.noul...@gmail.com
AuthorDate: Wed Jan 11 08:57:49 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 11 08:57:49 2012 -0500
Merge topic 'fixSymlinkInZIP' into next
c43a18e Fix indentation style
53da978 Do not add the content of a file if it's a symlink.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c43a18e018f15e5cbb8dcddb8726ec76a5c8ace3
commit c43a18e018f15e5cbb8dcddb8726ec76a5c8ace3
Author: Eric NOULARD eric.noul...@gmail.com
AuthorDate: Wed Jan 11 14:55:09 2012 +0100
Commit: Eric NOULARD eric.noul...@gmail.com
CommitDate: Wed Jan 11 14:55:09 2012 +0100
Fix indentation style
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index d506760..e3f2299 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -250,11 +250,11 @@ bool cmArchiveWrite::AddFile(const char* file,
// do not copy content of symlink
if (!(archive_entry_filetype(e) AE_IFLNK))
{
- // Content.
- if(size_t size = static_castsize_t(archive_entry_size(e)))
-{
- return this-AddData(file, size);
-}
+// Content.
+if(size_t size = static_castsize_t(archive_entry_size(e)))
+ {
+ return this-AddData(file, size);
+ }
}
return true;
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53da978b3cdab4eabc358f8fee0b0ee99ae8d3cf
commit 53da978b3cdab4eabc358f8fee0b0ee99ae8d3cf
Author: Eric NOULARD eric.noul...@gmail.com
AuthorDate: Tue Jan 10 23:19:41 2012 +0100
Commit: Eric NOULARD eric.noul...@gmail.com
CommitDate: Tue Jan 10 23:19:41 2012 +0100
Do not add the content of a file if it's a symlink.
This wasn't necessary for TAR-like (TGZ, TBZ2, etc...) archive
because for those the size was 0. Either there is an error in
upstream libarchive concerning the size or we should not rely
on size of the entry for adding content.
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index eab8a59..d506760 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -247,10 +247,14 @@ bool cmArchiveWrite::AddFile(const char* file,
return false;
}
- // Content.
- if(size_t size = static_castsize_t(archive_entry_size(e)))
+ // do not copy content of symlink
+ if (!(archive_entry_filetype(e) AE_IFLNK))
{
-return this-AddData(file, size);
+ // Content.
+ if(size_t size = static_castsize_t(archive_entry_size(e)))
+{
+ return this-AddData(file, size);
+}
}
return true;
}
---
Summary of changes:
Source/cmArchiveWrite.cxx | 10 +++---
1 files changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-2070-g12e18cd
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 12e18cda168d748750724947278190963142610e (commit)
via 53fcb0bc665038d947316bbf01fff38f5fd98fb3 (commit)
from 699094b3ceb919095860626784e1f9fc9e1397e2 (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=12e18cda168d748750724947278190963142610e
commit 12e18cda168d748750724947278190963142610e
Merge: 699094b 53fcb0b
Author: Eric Noulard eric.noul...@gmail.com
AuthorDate: Wed Jan 11 16:41:44 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 11 16:41:44 2012 -0500
Merge topic 'fixSymlinkInZIP' into next
53fcb0b Fix wrong test for symlink.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53fcb0bc665038d947316bbf01fff38f5fd98fb3
commit 53fcb0bc665038d947316bbf01fff38f5fd98fb3
Author: Eric NOULARD eric.noul...@gmail.com
AuthorDate: Wed Jan 11 22:37:13 2012 +0100
Commit: Eric NOULARD eric.noul...@gmail.com
CommitDate: Wed Jan 11 22:37:13 2012 +0100
Fix wrong test for symlink.
It seems like:
archive_entry_filetype(e) AE_IFLNK
is not the appropriate test for testing whether if an entryis refering
to a symlink.
archive_entry_symlink(e)
is the good one.
With this test we can skip data for both ZIP and TAR.
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index e8fc45a..dc6b749 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -247,8 +247,8 @@ bool cmArchiveWrite::AddFile(const char* file,
return false;
}
- // do not copy content of symlink for ZIP format
- if ((archive_format(this-Archive)!=ARCHIVE_FORMAT_ZIP) ||
(!(archive_entry_filetype(e) AE_IFLNK)))
+ // do not copy content of symlink
+ if (!archive_entry_symlink(e))
{
// Content.
if(size_t size = static_castsize_t(archive_entry_size(e)))
---
Summary of changes:
Source/cmArchiveWrite.cxx |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.7-2072-g50f851e
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 50f851e67ad2d387f6d1dc183823158e27bae3bd (commit)
via 0c86142cc5e8bbd5e84540ecdc273925806f61fe (commit)
from 12e18cda168d748750724947278190963142610e (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=50f851e67ad2d387f6d1dc183823158e27bae3bd
commit 50f851e67ad2d387f6d1dc183823158e27bae3bd
Merge: 12e18cd 0c86142
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Jan 11 17:14:12 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 11 17:14:12 2012 -0500
Merge topic 'improve-findbzip2' into next
0c86142 FindBZip2: use user-provided libraries first
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c86142cc5e8bbd5e84540ecdc273925806f61fe
commit 0c86142cc5e8bbd5e84540ecdc273925806f61fe
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Wed Jan 11 23:13:42 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Wed Jan 11 23:13:42 2012 +0100
FindBZip2: use user-provided libraries first
diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake
index 5afba46..60b23d5 100644
--- a/Modules/FindBZip2.cmake
+++ b/Modules/FindBZip2.cmake
@@ -24,19 +24,21 @@
FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h )
-FIND_LIBRARY(BZIP2_LIBRARIES_RELEASE NAMES bz2 bzip2 )
-FIND_LIBRARY(BZIP2_LIBRARIES_DEBUG NAMES bzip2d bz2 bzip2 )
-
-IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-SET(BZIP2_LIBRARIES optimized ${BZIP2_LIBRARIES_RELEASE} debug
${BZIP2_LIBRARIES_DEBUG})
-ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-SET(BZIP2_LIBRARIES ${BZIP2_LIBRARIES_RELEASE})
-ENDIF(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-
-IF(BZIP2_INCLUDE_DIR AND EXISTS ${BZIP2_INCLUDE_DIR}/bzlib.h)
-FILE(STRINGS ${BZIP2_INCLUDE_DIR}/bzlib.h BZLIB_H REGEX bzip2/libbzip2
version [0-9]+\\.[^ ]+ of [0-9]+ )
-STRING(REGEX REPLACE .* bzip2/libbzip2 version ([0-9]+\\.[^ ]+) of [0-9]+
.* \\1 BZIP2_VERSION_STRING ${BZLIB_H})
-ENDIF(BZIP2_INCLUDE_DIR AND EXISTS ${BZIP2_INCLUDE_DIR}/bzlib.h)
+IF (NOT BZIP2_LIBRARIES)
+FIND_LIBRARY(BZIP2_LIBRARIES_RELEASE NAMES bz2 bzip2 )
+FIND_LIBRARY(BZIP2_LIBRARIES_DEBUG NAMES bzip2d bz2 bzip2 )
+
+IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+SET(BZIP2_LIBRARIES optimized ${BZIP2_LIBRARIES_RELEASE} debug
${BZIP2_LIBRARIES_DEBUG})
+ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+SET(BZIP2_LIBRARIES ${BZIP2_LIBRARIES_RELEASE})
+ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+
+IF (BZIP2_INCLUDE_DIR AND EXISTS ${BZIP2_INCLUDE_DIR}/bzlib.h)
+FILE(STRINGS ${BZIP2_INCLUDE_DIR}/bzlib.h BZLIB_H REGEX
bzip2/libbzip2 version [0-9]+\\.[^ ]+ of [0-9]+ )
+STRING(REGEX REPLACE .* bzip2/libbzip2 version ([0-9]+\\.[^ ]+) of
[0-9]+ .* \\1 BZIP2_VERSION_STRING ${BZLIB_H})
+ENDIF (BZIP2_INCLUDE_DIR AND EXISTS ${BZIP2_INCLUDE_DIR}/bzlib.h)
+ENDIF (NOT BZIP2_LIBRARIES)
# handle the QUIETLY and REQUIRED arguments and set BZip2_FOUND to TRUE if
# all listed variables are TRUE
@@ -47,7 +49,14 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2
IF (BZIP2_FOUND)
INCLUDE(CheckLibraryExists)
- CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit
BZIP2_NEED_PREFIX)
+ # Make sure there is always a library to do the compile test.
+ # If the user chooses a build configuration without a compatible library
+ # this is a different problem.
+ IF (BZIP2_LIBRARIES_DEBUG AND NOT BZIP2_LIBRARIES_RELEASE)
+ CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES_DEBUG} BZ2_bzCompressInit
BZIP2_NEED_PREFIX)
+ ELSE (BZIP2_LIBRARIES_DEBUG AND NOT BZIP2_LIBRARIES_RELEASE)
+ CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit
BZIP2_NEED_PREFIX)
+ ENDIF (BZIP2_LIBRARIES_DEBUG AND NOT BZIP2_LIBRARIES_RELEASE)
ENDIF (BZIP2_FOUND)
MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES BZIP2_LIBRARIES_DEBUG
BZIP2_LIBRARIES_RELEASE)
---
Summary of changes:
Modules/FindBZip2.cmake | 37 +++--
1 files changed, 23 insertions(+), 14 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.7-93-gc89ee4a
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 c89ee4a10f4de32bdffaa1f08f5455f0fc454731 (commit) from bbed901178852e1fb1a77e4e6fbfe397fb67a20c (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=c89ee4a10f4de32bdffaa1f08f5455f0fc454731 commit c89ee4a10f4de32bdffaa1f08f5455f0fc454731 Author: KWSys Robot kwro...@kitware.com AuthorDate: Thu Jan 12 00:05:10 2012 -0500 Commit: KWSys Robot kwro...@kitware.com CommitDate: Thu Jan 12 00:05:10 2012 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index fed604c..1106367 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2012) SET(KWSYS_DATE_STAMP_MONTH 01) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 11) +SET(KWSYS_DATE_STAMP_DAY 12) --- Summary of changes: Source/kwsys/kwsysDateStamp.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
