[Cmake-commits] CMake branch, next, updated. v2.8.7-2082-g4992dfa
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 4992dfa97dadfba618992a4c57270fb6b5d501e9 (commit)
via 8e8672ccdbd6ddc9e0847cbab5b6d1dc6e95c5f7 (commit)
via 50edbf0f224e81cb85a0588d2495676efc3101f2 (commit)
via c89ee4a10f4de32bdffaa1f08f5455f0fc454731 (commit)
from 317fc87718745b28c78df1852b2b04c7b0800544 (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=4992dfa97dadfba618992a4c57270fb6b5d501e9
commit 4992dfa97dadfba618992a4c57270fb6b5d501e9
Merge: 317fc87 8e8672c
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Fri Jan 13 11:25:32 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 13 11:25:32 2012 -0500
Merge topic 'openssl-version' into next
8e8672c FindOpenSSL: improve version number handling
50edbf0 KWSys Nightly Date Stamp
c89ee4a KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e8672ccdbd6ddc9e0847cbab5b6d1dc6e95c5f7
commit 8e8672ccdbd6ddc9e0847cbab5b6d1dc6e95c5f7
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Thu Jan 12 19:29:39 2012 +0100
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Fri Jan 13 17:24:50 2012 +0100
FindOpenSSL: improve version number handling
First this fixes the bug that e.g. version 1.0.0 was shown as 1... When
pkg-config was used to find OpenSSL the header file was parsed for the
version
number even if pkg-config returned it already. Finally we also include the
patch level (i.e. the letter after the version number) in OPENSSL_VERSION.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index af799d6..bff5af6 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -7,7 +7,7 @@
# OPENSSL_FOUND - system has the OpenSSL library
# OPENSSL_INCLUDE_DIR - the OpenSSL include directory
# OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
-# OPENSSL_VERSION - This is set to $major.$minor.$revision (eg. 0.9.8)
+# OPENSSL_VERSION - This is set to $major.$minor.$revision$path (eg. 0.9.8s)
#=
# Copyright 2006-2009 Kitware, Inc.
@@ -216,16 +216,40 @@ ELSE(WIN32 AND NOT CYGWIN)
ENDIF(WIN32 AND NOT CYGWIN)
if (OPENSSL_INCLUDE_DIR)
- file(STRINGS ${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h openssl_version_str
REGEX ^#define[\t ]+OPENSSL_VERSION_NUMBER[\t
]+0x[0-9][0-9][0-9][0-9][0-9][0-9].*)
+ if (_OPENSSL_VERSION)
+set(OPENSSL_VERSION ${_OPENSSL_VERSION})
+ else (_OPENSSL_VERSION)
+file(STRINGS ${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h
openssl_version_str
+ REGEX ^#define[\t ]+OPENSSL_VERSION_NUMBER[\t
]+0x[0-9][0-9][0-9][0-9][0-9][0-9].*)
- string(REGEX REPLACE ^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$ \\1
OPENSSL_VERSION_MAJOR ${openssl_version_str})
- string(REGEX REPLACE ^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$
\\1 OPENSSL_VERSION_MINOR ${openssl_version_str})
- string(REGEX REPLACE ^.*OPENSSL_VERSION_NUMBER[\t
]+0x[0-9][0-9][0-9]([0-9][0-9]).*$ \\1 OPENSSL_VERSION_PATCH
${openssl_version_str})
+# The version number is encoded as 0xMNNFFPPS: major minor fix patch status
+# The status gives if this is a developer or prerelease and is ignored
here.
+# Major, minor, and fix directly translate into the version numbers shown
in
+# the string. The patch field translates to the single character suffix
that
+# indicates the bug fix state, which 00 - nothing, 01 - a, 02 - b and so
+# on.
- string(REGEX REPLACE ^0 OPENSSL_VERSION_MINOR
${OPENSSL_VERSION_MINOR})
- string(REGEX REPLACE ^0 OPENSSL_VERSION_PATCH
${OPENSSL_VERSION_PATCH})
+string(REGEX REPLACE ^.*OPENSSL_VERSION_NUMBER[\t
]+0x([0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f][0-9a-f])([0-9a-f]).*$
+ \\1;\\2;\\3;\\4;\\5 OPENSSL_VERSION_LIST ${openssl_version_str})
+list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
+list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
+list(GET OPENSSL_VERSION_LIST 2 OPENSSL_VERSION_FIX)
+list(GET OPENSSL_VERSION_LIST 3 OPENSSL_VERSION_PATCH)
- set(OPENSSL_VERSION
${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_PATCH})
+string(REGEX REPLACE ^0(.) \\1 OPENSSL_VERSION_MINOR
${OPENSSL_VERSION_MINOR})
+string(REGEX REPLACE ^0(.) \\1 OPENSSL_VERSION_FIX
${OPENSSL_VERSION_FIX})
+
+if (NOT OPENSSL_VERSION_PATCH STREQUAL 00)
+ # 96 is the ASCII code of 'a' minus 1
+ math(EXPR OPENSSL_VERSION_PATCH_ASCII ${OPENSSL_VERSION_PATCH} + 96)
+ # Once anyone knows how
[Cmake-commits] CMake branch, next, updated. v2.8.7-2088-g2ee866a
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 2ee866a2320722c485a1244163f9d7183b5e6d01 (commit) via d4a9e334d3d65b2d65097e7c202db52b4a9c0509 (commit) from 57a091d4475b63f5d8f3478c1f40d1b71a061d59 (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=2ee866a2320722c485a1244163f9d7183b5e6d01 commit 2ee866a2320722c485a1244163f9d7183b5e6d01 Merge: 57a091d d4a9e33 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jan 13 14:13:32 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jan 13 14:13:32 2012 -0500 Merge topic 'cm-bzip2-header-issue-10950' into next d4a9e33 Include bzlib.h consistently across CMake build (#10950) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4a9e334d3d65b2d65097e7c202db52b4a9c0509 commit d4a9e334d3d65b2d65097e7c202db52b4a9c0509 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jan 13 14:05:36 2012 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Jan 13 14:05:36 2012 -0500 Include bzlib.h consistently across CMake build (#10950) Use the approach originally used in commit f91b3c1d (Add options to build with system utility libraries, 2006-10-19) for all other third-party libraries. Create a cm_bzlib.h header wrapper that robustly includes the header from the bzip2 library chosen for the CMake build (either builtin or system version). Include the header wrapper anywhere we need the API provided by bzlib.h. diff --git a/Utilities/cmThirdParty.h.in b/Utilities/cmThirdParty.h.in index daf8114..c824085 100644 --- a/Utilities/cmThirdParty.h.in +++ b/Utilities/cmThirdParty.h.in @@ -16,6 +16,7 @@ #cmakedefine CMAKE_USE_SYSTEM_CURL #cmakedefine CMAKE_USE_SYSTEM_EXPAT #cmakedefine CMAKE_USE_SYSTEM_ZLIB +#cmakedefine CMAKE_USE_SYSTEM_BZIP2 #cmakedefine CMAKE_USE_SYSTEM_LIBARCHIVE #cmakedefine CTEST_USE_XMLRPC diff --git a/Utilities/cmThirdParty.h.in b/Utilities/cm_bzlib.h similarity index 59% copy from Utilities/cmThirdParty.h.in copy to Utilities/cm_bzlib.h index daf8114..d1fffa1 100644 --- a/Utilities/cmThirdParty.h.in +++ b/Utilities/cm_bzlib.h @@ -1,6 +1,6 @@ /* CMake - Cross Platform Makefile Generator - Copyright 2000-2009 Kitware, Inc., Insight Software Consortium + Copyright 2000-2012 Kitware, Inc., Insight Software Consortium Distributed under the OSI-approved BSD License (the License); see accompanying file Copyright.txt for details. @@ -9,14 +9,15 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License for more information. */ -#ifndef __cmThirdParty_h -#define __cmThirdParty_h +#ifndef __cm_bzlib_h +#define __cm_bzlib_h -/* Whether CMake is using its own utility libraries. */ -#cmakedefine CMAKE_USE_SYSTEM_CURL -#cmakedefine CMAKE_USE_SYSTEM_EXPAT -#cmakedefine CMAKE_USE_SYSTEM_ZLIB -#cmakedefine CMAKE_USE_SYSTEM_LIBARCHIVE -#cmakedefine CTEST_USE_XMLRPC +/* Use the bzip2 library configured for CMake. */ +#include cmThirdParty.h +#ifdef CMAKE_USE_SYSTEM_BZIP2 +# include bzlib.h +#else +# include cmbzip2/bzlib.h +#endif #endif diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_bzip2.c b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_bzip2.c index 8d5bd1c..af618b0 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_bzip2.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_bzip2.c @@ -41,7 +41,7 @@ __FBSDID($FreeBSD$); #include unistd.h #endif #ifdef HAVE_BZLIB_H -#include bzlib.h +#include cm_bzlib.h #endif #include archive.h diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c index 1580c92..2be2267 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c @@ -33,7 +33,7 @@ __FBSDID($FreeBSD$); #include stdlib.h #endif #ifdef HAVE_BZLIB_H -#include bzlib.h +#include cm_bzlib.h #endif #ifdef HAVE_LZMA_H #include lzma.h diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c index 00f283d..0834e6f 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c @@ -39,7
[Cmake-commits] CMake branch, next, updated. v2.8.7-2090-g19c85b6
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 19c85b6c73f4274fd890b9c6f072010fb7c8c678 (commit)
via 57da498c3cbc6acdf47a8e3ea1d09e92b2fdf251 (commit)
from 2ee866a2320722c485a1244163f9d7183b5e6d01 (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=19c85b6c73f4274fd890b9c6f072010fb7c8c678
commit 19c85b6c73f4274fd890b9c6f072010fb7c8c678
Merge: 2ee866a 57da498
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jan 13 14:24:08 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 13 14:24:08 2012 -0500
Merge topic 'link-shared-depend-cycle-issue-12647' into next
57da498 Add macro to infrastructure for CMake-only tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57da498c3cbc6acdf47a8e3ea1d09e92b2fdf251
commit 57da498c3cbc6acdf47a8e3ea1d09e92b2fdf251
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jan 13 14:19:50 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jan 13 14:19:50 2012 -0500
Add macro to infrastructure for CMake-only tests
All CMake-only tests will use the same basic form. Create an
add_CMakeOnly_test macro for it.
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index b3bdab8..e4ba53a 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -1,8 +1,12 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Test.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/Test.cmake @ONLY)
-add_test(CMakeOnly.LinkInterfaceLoop ${CMAKE_CMAKE_COMMAND}
- -DTEST=LinkInterfaceLoop
- -P ${CMAKE_CURRENT_BINARY_DIR}/Test.cmake
- )
+macro(add_CMakeOnly_test test)
+ add_test(CMakeOnly.${test} ${CMAKE_CMAKE_COMMAND}
+-DTEST=${test}
+-P ${CMAKE_CURRENT_BINARY_DIR}/Test.cmake
+)
+endmacro()
+
+add_CMakeOnly_test(LinkInterfaceLoop)
set_property(TEST CMakeOnly.LinkInterfaceLoop PROPERTY TIMEOUT 90)
---
Summary of changes:
Tests/CMakeOnly/CMakeLists.txt | 12
1 files changed, 8 insertions(+), 4 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-2093-g3eb4815
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 3eb481524b5c7e4fdbd668431576ff912756e226 (commit)
via 8e756d2b9bb84b182a8402e71fb62d7a28d0a9c6 (commit)
via 9a20abf04a7fc11b53beb545f1555fe9815ae09c (commit)
from 19c85b6c73f4274fd890b9c6f072010fb7c8c678 (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=3eb481524b5c7e4fdbd668431576ff912756e226
commit 3eb481524b5c7e4fdbd668431576ff912756e226
Merge: 19c85b6 8e756d2
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jan 13 14:24:42 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 13 14:24:42 2012 -0500
Merge topic 'link-shared-depend-cycle-issue-12647' into next
8e756d2 Tolerate cycles in shared library link interfaces (#12647)
9a20abf Add infrastructure for CMake-only tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e756d2b9bb84b182a8402e71fb62d7a28d0a9c6
commit 8e756d2b9bb84b182a8402e71fb62d7a28d0a9c6
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Jan 12 10:22:00 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jan 13 14:22:24 2012 -0500
Tolerate cycles in shared library link interfaces (#12647)
Since commit 183b9509 (Follow all dependencies of shared library private
dependencies, 2011-12-14) we honor LINK_INTERFACE_LIBRARIES when
following dependent shared libraries. The link interface properties may
form a cycle if set incorrectly by a project. Furthermore, the property
LINK_DEPENDENT_LIBRARIES may form a cycle if set incorrectly by hand
(though CMake should never generate one). In either case, do not follow
the cycle forever when following the dependent shared library closure.
We only need to add dependency edges to the constraint graph once.
Add LinkInterfaceLoop test to cover this case.
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 802cfcf..9a075bd 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -358,7 +358,7 @@ void cmComputeLinkDepends::FollowLinkEntry(BFSEntry const
qe)
this-AddLinkEntries(depender_index, iface-Libraries);
// Handle dependent shared libraries.
- this-QueueSharedDependencies(depender_index, iface-SharedDeps);
+ this-FollowSharedDeps(depender_index, iface);
// Support for CMP0003.
for(std::vectorstd::string::const_iterator
@@ -379,6 +379,23 @@ void cmComputeLinkDepends::FollowLinkEntry(BFSEntry const
qe)
//
void
cmComputeLinkDepends
+::FollowSharedDeps(int depender_index, cmTarget::LinkInterface const* iface,
+ bool follow_interface)
+{
+ // Follow dependencies if we have not followed them already.
+ if(this-SharedDepFollowed.insert(depender_index).second)
+{
+if(follow_interface)
+ {
+ this-QueueSharedDependencies(depender_index, iface-Libraries);
+ }
+this-QueueSharedDependencies(depender_index, iface-SharedDeps);
+}
+}
+
+//
+void
+cmComputeLinkDepends
::QueueSharedDependencies(int depender_index,
std::vectorstd::string const deps)
{
@@ -430,8 +447,7 @@ void
cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const dep)
entry.Target-GetLinkInterface(this-Config))
{
// Follow public and private dependencies transitively.
- this-QueueSharedDependencies(index, iface-Libraries);
- this-QueueSharedDependencies(index, iface-SharedDeps);
+ this-FollowSharedDeps(index, iface, true);
}
}
}
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index e196e00..80a0454 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -105,6 +105,10 @@ private:
int DependerIndex;
};
std::queueSharedDepEntry SharedDepQueue;
+ std::setint SharedDepFollowed;
+ void FollowSharedDeps(int depender_index,
+cmTarget::LinkInterface const* iface,
+bool follow_interface = false);
void QueueSharedDependencies(int depender_index,
std::vectorstd::string const deps);
void HandleSharedDependency(SharedDepEntry const dep);
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index d32e7be..e4ba53a 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -7,3 +7,6 @@ macro(add_CMakeOnly_test test)
[Cmake-commits] CMake branch, next, updated. v2.8.7-2095-gec9d401
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 ec9d4011a86b18e807aaca65f9a1a93a92ef8c96 (commit)
via ae250d5cfa0daec74935e6aa484fa439f3a6dd23 (commit)
from 3eb481524b5c7e4fdbd668431576ff912756e226 (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=ec9d4011a86b18e807aaca65f9a1a93a92ef8c96
commit ec9d4011a86b18e807aaca65f9a1a93a92ef8c96
Merge: 3eb4815 ae250d5
Author: Eric Noulard eric.noul...@gmail.com
AuthorDate: Fri Jan 13 15:40:26 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jan 13 15:40:26 2012 -0500
Merge topic 'CPackRPM-noFileListedTwice' into next
ae250d5 CPackRPM flag direcories with %dir in the generated spec file
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae250d5cfa0daec74935e6aa484fa439f3a6dd23
commit ae250d5cfa0daec74935e6aa484fa439f3a6dd23
Author: Deborah Pickett deborah.pick...@autodesk.com
AuthorDate: Fri Jan 13 21:35:41 2012 +0100
Commit: Eric NOULARD eric.noul...@gmail.com
CommitDate: Fri Jan 13 21:35:41 2012 +0100
CPackRPM flag direcories with %dir in the generated spec file
This fix bug #12863 whose symptom was a lot of warning: File listed twice
printed out by rpmbuild when processing the spec file.
Signed-off-by: Eric NOULARD eric.noul...@gmail.com
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index bf476ad..e1e76ed 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -714,6 +714,25 @@ else()
set(CPACK_RPM_ABSOLUTE_INSTALL_FILES )
endif(CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL)
+# Prepend directories in ${CPACK_RPM_INSTALL_FILES} with %dir
+# This is necessary to avoid duplicate files since rpmbuild do
+# recursion on its own when encountering a pathname which is a directory
+# which is not flagged as %dir
+string(STRIP ${CPACK_RPM_INSTALL_FILES} CPACK_RPM_INSTALL_FILES_LIST)
+string(REPLACE \n ; CPACK_RPM_INSTALL_FILES_LIST
+${CPACK_RPM_INSTALL_FILES_LIST})
+string(REPLACE \ CPACK_RPM_INSTALL_FILES_LIST
+${CPACK_RPM_INSTALL_FILES_LIST})
+set(CPACK_RPM_INSTALL_FILES )
+foreach(F IN LISTS CPACK_RPM_INSTALL_FILES_LIST)
+ if(IS_DIRECTORY ${WDIR}/${F})
+set(CPACK_RPM_INSTALL_FILES ${CPACK_RPM_INSTALL_FILES}%dir \${F}\\n)
+ else()
+set(CPACK_RPM_INSTALL_FILES ${CPACK_RPM_INSTALL_FILES}\${F}\\n)
+ endif()
+endforeach(F)
+set(CPACK_RPM_INSTALL_FILES_LIST )
+
# The name of the final spec file to be used by rpmbuild
SET(CPACK_RPM_BINARY_SPECFILE
${CPACK_RPM_ROOTDIR}/SPECS/${CPACK_RPM_PACKAGE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_NAME}.spec)
---
Summary of changes:
Modules/CPackRPM.cmake | 19 +++
1 files changed, 19 insertions(+), 0 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-95-gc121f3f
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 c121f3f5c4b874910ab8e5b083827d9e393e1a96 (commit) from 50edbf0f224e81cb85a0588d2495676efc3101f2 (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=c121f3f5c4b874910ab8e5b083827d9e393e1a96 commit c121f3f5c4b874910ab8e5b083827d9e393e1a96 Author: KWSys Robot kwro...@kitware.com AuthorDate: Sat Jan 14 00:05:03 2012 -0500 Commit: KWSys Robot kwro...@kitware.com CommitDate: Sat Jan 14 00:05:03 2012 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 39d8a79..91bf5e7 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 13) +SET(KWSYS_DATE_STAMP_DAY 14) --- 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
