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 d43aa3f5f438c407995fcb9c7f1702666ad1f04d (commit)
via 2eaf208bba50cf120ddcdd0fc5bb078b5996b840 (commit)
from 8f819c4968965da6864b39446885e6ee51eb5d54 (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=d43aa3f5f438c407995fcb9c7f1702666ad1f04d
commit d43aa3f5f438c407995fcb9c7f1702666ad1f04d
Merge: 8f819c4 2eaf208
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 24 09:05:07 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jul 24 09:05:07 2014 -0400
Merge topic 'cpack-ifw-generator' into next
2eaf208b CMakeCPack: Fix for CMake < 2.8.9
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2eaf208bba50cf120ddcdd0fc5bb078b5996b840
commit 2eaf208bba50cf120ddcdd0fc5bb078b5996b840
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 24 09:02:32 2014 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jul 24 09:04:35 2014 -0400
CMakeCPack: Fix for CMake < 2.8.9
The CMAKE_INSTALL_DEFAULT_COMPONENT_NAME is not defined prior
to CMake 2.8.9.
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index 9d56779..5b096ad 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -66,7 +66,11 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
endif()
# default component for IFW
- set(_CPACK_IFW_COMPONENT_NAME ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
+ if(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
+ set(_CPACK_IFW_COMPONENT_NAME ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
+ else()
+ set(_CPACK_IFW_COMPONENT_NAME Unspecified)
+ endif()
string(TOUPPER ${_CPACK_IFW_COMPONENT_NAME} _CPACK_IFW_COMPONENT_UNAME)
if(${CMAKE_SYSTEM_NAME} MATCHES Windows)
-----------------------------------------------------------------------
Summary of changes:
CMakeCPack.cmake | 6 +++++-
1 file 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
