date:20160924

[Cmake-commits] CMake branch, next, updated. v3.6.2-2458-g7ee381d

2016-09-24 Thread Daniel Pfeifer

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  7ee381d0f5f46674cab4e9554236d6249010655d (commit)
   via  05e6d18bebfa01059ebb43505c0eba6f6c56af73 (commit)
  from  ac947c5134adb8bf9a100843082b45c4a7ed7097 (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=7ee381d0f5f46674cab4e9554236d6249010655d
commit 7ee381d0f5f46674cab4e9554236d6249010655d
Merge: ac947c5 05e6d18
Author: Daniel Pfeifer 
AuthorDate: Sun Sep 25 01:52:46 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sun Sep 25 01:52:46 2016 -0400

Merge topic 'auto-ptr' into next

05e6d18b fixup! Add a feature check to test availability of auto_ptr


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05e6d18bebfa01059ebb43505c0eba6f6c56af73
commit 05e6d18bebfa01059ebb43505c0eba6f6c56af73
Author: Daniel Pfeifer 
AuthorDate: Sun Sep 25 07:52:23 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Sun Sep 25 07:52:23 2016 +0200

fixup! Add a feature check to test availability of auto_ptr

diff --git a/Source/Checks/cm_cxx_features.cmake 
b/Source/Checks/cm_cxx_features.cmake
index 83bcff5..80c9f3b 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -32,11 +32,11 @@ function(cm_check_cxx_feature name)
 endfunction()
 
 if(CMAKE_CXX_STANDARD)
+  cm_check_cxx_feature(auto_ptr)
   cm_check_cxx_feature(make_unique)
   if(CMake_HAVE_CXX_MAKE_UNIQUE)
 set(CMake_HAVE_CXX_UNIQUE_PTR 1)
   endif()
-  cm_check_cxx_feature(auto_ptr)
   cm_check_cxx_feature(nullptr)
   cm_check_cxx_feature(override)
   cm_check_cxx_feature(unique_ptr)

---

Summary of changes:
 Source/Checks/cm_cxx_features.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.6.2-2454-g9f79eb5

2016-09-24 Thread Domen Vrankar

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  9f79eb5caa5e25b987df8a9ff53b5fc4d84f5e74 (commit)
   via  1ef45a30aae240a89893e86e2509d5400da9753f (commit)
   via  08147a7feabba4113c29f8e898ebe3047180e4bf (commit)
  from  767ee352d0d06913b0a4d013bbdd07a28ba9200e (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=9f79eb5caa5e25b987df8a9ff53b5fc4d84f5e74
commit 9f79eb5caa5e25b987df8a9ff53b5fc4d84f5e74
Merge: 767ee35 1ef45a3
Author: Domen Vrankar 
AuthorDate: Sat Sep 24 06:13:43 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Sep 24 06:13:43 2016 -0400

Merge topic 'revert-cpack-deb-package-description-fallback' into next

1ef45a30 Revert "CPack/DEB: Make package description variable precedence 
match RPM"
08147a7f CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ef45a30aae240a89893e86e2509d5400da9753f
commit 1ef45a30aae240a89893e86e2509d5400da9753f
Author: Domen Vrankar 
AuthorDate: Sat Sep 24 12:05:06 2016 +0200
Commit: Domen Vrankar 
CommitDate: Sat Sep 24 12:05:06 2016 +0200

Revert "CPack/DEB: Make package description variable precedence match RPM"

This reverts commit 332b089ad213a1aa89658fffd8f68c9064c6d3db as multiline
descriptions require special formatting.

diff --git a/Help/release/dev/cpack-deb-package-description-fallback.rst 
b/Help/release/dev/cpack-deb-package-description-fallback.rst
deleted file mode 100644
index 71ca821..000
--- a/Help/release/dev/cpack-deb-package-description-fallback.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-cpack-deb-package-description-fallback
---
-
-* The :module:`CPackDeb` module gained a new
-  :variable:`CPACK_DEBIAN__PACKAGE_DESCRIPTION`
-  variable for component-specific package descriptions.
-
-* The :module:`CPackDeb` module changed its package description
-  override rules to match :module:`CPackRPM` module behavior.
-  If the :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` variable is set to
-  a non-default location then it is preferred to the
-  :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` variable.
-  This is a behavior change from previous versions but produces
-  more consistent and expected behavior.
-  See :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION`.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 423bb00..1a7b923 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -156,18 +156,16 @@
 #  * Default   : :code:`CPACK_PACKAGE_CONTACT`
 #
 # .. variable:: CPACK_DEBIAN_PACKAGE_DESCRIPTION
-#   CPACK_DEBIAN__PACKAGE_DESCRIPTION
+#   CPACK_COMPONENT__DESCRIPTION
 #
 #  The Debian package description
 #
 #  * Mandatory : YES
 #  * Default   :
 #
-#- :variable:`CPACK_COMPONENT__DESCRIPTION` (component based 
installers only) if set,
-#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` if set to non default 
location,
-#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` if set,
-#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default value if set,
-#- or "no package description available"
+#- :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION` if set or
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY`
+#
 #
 # .. variable:: CPACK_DEBIAN_PACKAGE_SECTION
 #   CPACK_DEBIAN__PACKAGE_SECTION
@@ -831,23 +829,24 @@ function(cpack_deb_prepare_package_vars)
   endif()
 
   # Description: (mandatory)
-  if(CPACK_DEB_PACKAGE_COMPONENT)
-if(CPACK_DEBIAN_${_local_component_name}_PACKAGE_DESCRIPTION)
-  set(CPACK_DEBIAN_PACKAGE_DESCRIPTION 
"${CPACK_DEBIAN_${_local_component_name}_PACKAGE_DESCRIPTION}")
-elseif(CPACK_COMPONENT_${_local_component_name}_DESCRIPTION)
-  set(CPACK_DEBIAN_PACKAGE_DESCRIPTION 
"${CPACK_COMPONENT_${_local_component_name}_DESCRIPTION}")
+  if(NOT CPACK_DEB_PACKAGE_COMPONENT)
+if(NOT CPACK_DEBIAN_PACKAGE_DESCRIPTION)
+  if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
+message(FATAL_ERROR "CPackDeb: Debian package requires a summary for a 
package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or 
CPACK_DEBIAN_PACKAGE_DESCRIPTION")
+  endif()
+  set(CPACK_DEBIAN_PACKAGE_DESCRIPTION 
${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
 endif()
-  endif()
-
-  if(NOT CPACK_DEBIAN_PACKAGE_DESCRIPTION)
-if(CPACK_PACKAGE_DESCRIPTION_FILE AND NOT 
"${CPACK_PACKAGE_DESCRIPTION_FILE}" STREQUAL 
"${CMAKE_ROOT}/Templates/CPack.GenericDescription.txt")
-  file(READ "${CPACK_PACKAGE_DESCRIPTION_FILE}" 
CPACK_DEBIAN_PACKAGE_DESCRIPTION)
-

[Cmake-commits] CMake branch, next, updated. v3.6.2-2451-g767ee35

2016-09-24 Thread Domen Vrankar

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  767ee352d0d06913b0a4d013bbdd07a28ba9200e (commit)
   via  d706b72896951ceaeca3696e4269f72259666fc3 (commit)
   via  9b1ea67715caba54f89de2d3b5acaa9628d2dee1 (commit)
   via  9a417c2f68666a8002ef0116bdd2a4ae398d72cc (commit)
   via  18840638560e6826e01e00a88b6949e137f04dfc (commit)
  from  6294b8bf002dfc7e2ae4edb671c3a87c8affae80 (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=767ee352d0d06913b0a4d013bbdd07a28ba9200e
commit 767ee352d0d06913b0a4d013bbdd07a28ba9200e
Merge: 6294b8b d706b72
Author: Domen Vrankar 
AuthorDate: Sat Sep 24 05:59:44 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Sep 24 05:59:44 2016 -0400

Merge topic 'cpack-rpm-debuginfo-sources' into next

d706b728 fixup! CPack/RPM debuginfo packages must contain sources
9b1ea677 CPack/RPM debuginfo packaging documentation
9a417c2f CPack/RPM debuginfo directories to sources
18840638 CPack/RPM debuginfo packages must contain sources


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d706b72896951ceaeca3696e4269f72259666fc3
commit d706b72896951ceaeca3696e4269f72259666fc3
Author: Domen Vrankar 
AuthorDate: Sat Sep 24 10:09:15 2016 +0200
Commit: Domen Vrankar 
CommitDate: Sat Sep 24 11:58:55 2016 +0200

fixup! CPack/RPM debuginfo packages must contain sources

diff --git a/Tests/RunCMake/CPack/DEBUGINFO.cmake 
b/Tests/RunCMake/CPack/DEBUGINFO.cmake
index ead7ad1..e8d1c85 100644
--- a/Tests/RunCMake/CPack/DEBUGINFO.cmake
+++ b/Tests/RunCMake/CPack/DEBUGINFO.cmake
@@ -1,5 +1,11 @@
 set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
 
+# PGI compiler doesn't add build id to binaries by default
+if(CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
+  string(APPEND CMAKE_EXE_LINKER_FLAGS "--build-id")
+  string(APPEND CMAKE_SHARED_LINKER_FLAGS "--build-id")
+endif()
+
 set(CPACK_RPM_COMPONENT_INSTALL "ON")
 
 set(CMAKE_BUILD_TYPE Debug)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b1ea67715caba54f89de2d3b5acaa9628d2dee1
commit 9b1ea67715caba54f89de2d3b5acaa9628d2dee1
Author: Domen Vrankar 
AuthorDate: Thu Sep 22 19:24:25 2016 +0200
Commit: Domen Vrankar 
CommitDate: Sat Sep 24 11:58:43 2016 +0200

CPack/RPM debuginfo packaging documentation

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index ac2ddc0..9ed60d3 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -60,14 +60,6 @@
 #  * Mandatory : YES
 #  * Default   : :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY`
 #
-# .. variable:: CPACK_RPM_DEBUGINFO_PACKAGE
-#   CPACK_RPM__DEBUGINFO_PACKAGE
-#
-#  Option to additionally generate debuginfo RPM package(s).
-#
-#  * Mandatory : NO
-#  * Default   : OFF
-#
 # .. variable:: CPACK_RPM_PACKAGE_NAME
 #   CPACK_RPM__PACKAGE_NAME
 #
@@ -707,6 +699,96 @@
 #   package installation may cause initial symbolic link to point to an
 #   invalid location.
 #
+# Packaging of debug information
+# ^^
+#
+# Debuginfo packages contain debug symbols and sources for debugging packaged
+# binaries.
+#
+# .. note::
+#
+#  Currently multiple debuginfo packages are generated if component based
+#  packaging is used - one debuginfo package per component. This duplicates
+#  sources if multiple binaries are using them. This is a side effect of
+#  how CPackRPM currently generates component packages and will be addressed
+#  in later versions of the generator.
+#
+# Debuginfo RPM packaging has it's own set of variables:
+#
+# .. variable:: CPACK_RPM_DEBUGINFO_PACKAGE
+#   CPACK_RPM__DEBUGINFO_PACKAGE
+#
+#  Enable generation of debuginfo RPM package(s).
+#
+#  * Mandatory : NO
+#  * Default   : OFF
+#
+# .. note::
+#
+#  Binaries must contain debug symbols before packaging so use either ``Debug``
+#  or ``RelWithDebInfo`` for :variable:`CMAKE_BUILD_TYPE` variable value.
+#
+# .. note::
+#
+#  Packages generated from packages without binary files, with binary files but
+#  without execute permissions or without debug symbols will be empty.
+#
+# .. variable:: CPACK_BUILD_SOURCE_DIRS
+#
+#  Provides locations of root directories of source files from which binaries
+#  were built.
+#
+#  * Mandatory : YES if :variable:`CPACK_RPM_DEBUGINFO_PACKAGE` is set
+#  * Default   : -
+#
+# .. note::
+#
+#  For CMake project :variable:`CPACK_BUILD_SOURCE_DIRS` is set by default to
+#  point to :variable:`CMAKE_SOURCE_DIR` and

[Cmake-commits] CMake branch, next, updated. v3.6.2-2446-g6294b8b

2016-09-24 Thread Domen Vrankar

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  6294b8bf002dfc7e2ae4edb671c3a87c8affae80 (commit)
   via  784abda5e5995c4e29c6ded3d3f72619d3510a14 (commit)
   via  afb7f17e888484cdd3db4e16c7a473a557fbe53a (commit)
   via  b4b740b6003f25d36799af6de429151c65f7b49b (commit)
  from  9041fb2470a9df8ce922bb0c8e591e99b98fd5fd (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=6294b8bf002dfc7e2ae4edb671c3a87c8affae80
commit 6294b8bf002dfc7e2ae4edb671c3a87c8affae80
Merge: 9041fb2 784abda
Author: Domen Vrankar 
AuthorDate: Sat Sep 24 05:57:11 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Sep 24 05:57:11 2016 -0400

Merge topic 'cpack-rpm-debuginfo-sources' into next

784abda5 fixup! CPack/RPM debuginfo packaging documentation
afb7f17e fixup! CPack/RPM debuginfo packages must contain sources
b4b740b6 fixup! CPack/RPM debuginfo packages must contain sources


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=784abda5e5995c4e29c6ded3d3f72619d3510a14
commit 784abda5e5995c4e29c6ded3d3f72619d3510a14
Author: Domen Vrankar 
AuthorDate: Sat Sep 24 11:01:11 2016 +0200
Commit: Domen Vrankar 
CommitDate: Sat Sep 24 11:56:13 2016 +0200

fixup! CPack/RPM debuginfo packaging documentation

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 8e4aeaf..9ed60d3 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -752,11 +752,13 @@
 #  :variable:`CPACK_BUILD_SOURCE_DIRS` will not be present in debuginfo 
package.
 #
 # .. variable:: CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX
+#   CPACK_RPM__BUILD_SOURCE_DIRS_PREFIX
 #
 #  Prefix of location where sources will be placed during package installation.
 #
 #  * Mandatory : YES if :variable:`CPACK_RPM_DEBUGINFO_PACKAGE` is set
-#  * Default   : "/usr/src/debug/${CPACK_PACKAGE_FILE_NAME}"
+#  * Default   : "/usr/src/debug/" and
+#for component packaging 
"/usr/src/debug/-"
 #
 # .. note::
 #

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afb7f17e888484cdd3db4e16c7a473a557fbe53a
commit afb7f17e888484cdd3db4e16c7a473a557fbe53a
Author: Domen Vrankar 
AuthorDate: Sat Sep 24 10:26:59 2016 +0200
Commit: Domen Vrankar 
CommitDate: Sat Sep 24 11:56:08 2016 +0200

fixup! CPack/RPM debuginfo packages must contain sources

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index d880b24..8e4aeaf 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2056,8 +2056,12 @@ function(cpack_rpm_generate_package)
 "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_DEBUGINFO_PACKAGE"
 "CPACK_RPM_DEBUGINFO_PACKAGE")
   if(CPACK_RPM_DEBUGINFO_PACKAGE)
+cpack_rpm_variable_fallback("CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX"
+  "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_BUILD_SOURCE_DIRS_PREFIX"
+  "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_BUILD_SOURCE_DIRS_PREFIX"
+  "CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX")
 if(NOT CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX)
-  set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX 
"/usr/src/debug/${CPACK_PACKAGE_FILE_NAME}")
+  set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX 
"/usr/src/debug/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}")
 endif()
 cpack_rpm_debugsymbol_check("${CPACK_RPM_INSTALL_FILES}" "${WDIR}")
 
@@ -2373,7 +2377,7 @@ mv %_topdir/tmpBBroot $RPM_BUILD_ROOT
 execute_process(
   COMMAND "${RPMBUILD_EXECUTABLE}" ${RPMBUILD_FLAGS}
   --define "_topdir ${CPACK_RPM_DIRECTORY}"
-  --buildroot 
"%_topdir/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}" # 
TODO should I remove this variable? or change the path?
+  --buildroot 
"%_topdir/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"
   --target "${CPACK_RPM_PACKAGE_ARCHITECTURE}"
   "${CPACK_RPM_BINARY_SPECFILE}"
   WORKING_DIRECTORY 
"${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4b740b6003f25d36799af6de429151c65f7b49b
commit b4b740b6003f25d36799af6de429151c65f7b49b
Author: Domen Vrankar 
AuthorDate: Sat Sep 24 10:09:15 2016 +0200
Commit: Domen Vrankar 
CommitDate: Sat Sep 24 11:56:01 2016 +0200

fixup! CPack/RPM debuginfo packages must contain sources

diff --git a/Tests/RunCMake/CPack/DEBUGINFO.cmake

[Cmake-commits] CMake branch, next, updated. v3.6.2-2458-g7ee381d

[Cmake-commits] CMake branch, next, updated. v3.6.2-2454-g9f79eb5

[Cmake-commits] CMake branch, next, updated. v3.6.2-2451-g767ee35

[Cmake-commits] CMake branch, next, updated. v3.6.2-2446-g6294b8b

4 matches

Site Navigation

Mail list logo

Footer information