kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,556 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

624 Commits

Author SHA1 Message Date
Daniel Pfeifer 7f97a6c94b CPack: don't use else after return 2016-08-18 19:47:32 +02:00
Daniel Pfeifer e7b842e189 Make sure unnused parameters are /*named*/ 2016-08-17 01:49:57 +02:00
Michael Stürmer 17bbf6af1e CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER feature 
The new variable allows setting of a custom absolute installation prefix
outside of the ProgramFiles folders.
 2016-08-08 13:42:23 +02:00
Michael Stürmer e29bfbf272 CPackWIX: Support custom title and description for the root feature 
These can now be specified through the WIX generator specific
CPack variables CPACK_WIX_ROOT_FEATURE_TITLE and
CPACK_WIX_ROOT_FEATURE_DESCRIPTION.
 2016-08-02 14:05:08 +02:00
Brad King 5ec03c93fc Merge topic 'wix-disabled-components' 
ad453f05 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED
6f108f84 CPackComponent: Document the *_HIDDEN and *_DISABLED variables
 2016-08-01 14:59:53 -04:00
Brad King 624b72159b Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overrides 2016-07-22 10:42:37 -04:00
Michael Stürmer ad453f0502 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED 
Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
 2016-07-22 08:49:29 +02:00
Brad King 6a98785d8f Merge topic 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' 
57534990 CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value
 2016-07-20 09:03:22 -04:00
Brad King 57534990d8 CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value 
Since commit v3.6.0-rc1~339^2 (CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS
SubDirectory (4th) option, 2016-02-18) we now honor the "Directory"
option of this variable.  Prior to that commit the value was not used
so projects may have used a placeholder value like `.` instead of `/`.
Treat `.` the same as `/` to restore compatibility with such projects.

Fixes #16205.
 2016-07-19 10:07:12 -04:00
Dāvis Mosāns b1f87a50b3 Use better KWSys SystemTools::GetEnv and HasEnv signatures 2016-07-18 09:51:01 -04:00
Brad King 0219743a01 Merge topic 'cpack-ifw-fix-repo-attributes' 
7a30fa1a CPackIFW: Fix attributes for Promoting Updates repository replacement
 2016-07-06 09:35:19 -04:00
Konstantin Podsvirov 7a30fa1a41 CPackIFW: Fix attributes for Promoting Updates repository replacement 
Fix spelling of attributes added by commit v3.6.0-rc1~52^2 (CPackIFW:
Add support for Promoting Updates, 2016-05-17).
 2016-07-05 15:55:42 -04:00
Brad King b5ec5b0901 Avoid using KWSys auto_ptr by adopting it ourselves 
Replace use of cmsys::auto_ptr with a CM_AUTO_PTR macro that maps to
our own implementation adopted from the KWSys auto_ptr implementation.
Later we may be able to map CM_AUTO_PTR to std::auto_ptr on compilers
that do not warn about it.

Automate the client site conversions:

    git grep -l auto_ptr -- Source/ | grep -v Source/kwsys/ | xargs sed -i \
      's|cmsys::auto_ptr|CM_AUTO_PTR|;s|cmsys/auto_ptr.hxx|cm_auto_ptr.hxx|'
 2016-06-29 09:47:58 -04:00
Daniel Pfeifer 1d6909a287 use CM_NULLPTR 2016-06-28 09:02:26 -04:00
Daniel Pfeifer a7a9239096 mark functions with CM_OVERRIDE 2016-06-27 23:24:38 +02:00
Daniel Pfeifer 7647f6afa4 Add CM_OVERRIDE to some functions 
Run clang-tidy's modernize-use-override checker.  This checker must have
issues in version 3.8.  It has way too little matches.  And it adds
override to destructors.  Revert the changes on the destructors and
change override to CM_OVERRIDE.
 2016-06-27 10:37:41 -04:00
Daniel Pfeifer 24ab29b882 Prefer istringstream and ostringstream over stringstream. 
Use istringsream for parsing, ostringstream for generation.
 2016-06-14 22:37:36 +02:00
Daniel Pfeifer eb79fa7260 Access std::ios_base with std::ios 
Just because it is shorter.
 2016-06-14 22:23:08 +02:00
Daniel Pfeifer a16bf141bc Add missing braces around statements. 
Apply fixits of clang-tidy's readability-braces-around-statements
checker.
 2016-06-10 18:36:24 +02:00
Brad King 065bb0ffeb Merge topic 'small-cleanups' 
9f25fc4d Prefer std::ostream& over derivatives as parameters
f9cc43ea cmake: remove unnused member Verbose
6e658085 cmake: Fix constness of methods
87ffd76d cmake: Make internal method file static
fa169fe8 Parser: Merge identical conditions
 2016-06-09 09:18:23 -04:00
Daniel Pfeifer e9da5192e5 CPack/PackageMaker: port to cmXMLWriter 2016-06-09 09:16:34 -04:00
Daniel Pfeifer 9f25fc4dbb Prefer std::ostream& over derivatives as parameters 2016-06-08 23:08:40 +02:00
Brad King ff08a80af1 Source/CPack: Run clang-format to fix style 2016-06-07 08:41:16 -04:00
Daniel Pfeifer fa277b29e4 Remove c_str() calls from stream arguments. 
Mostly automated:

git grep -l '.c_str() <<' | xargs sed -i 's|\.c_str() <<| <<|g'
 2016-06-06 23:53:32 +02:00
Brad King d546456765 Merge topic 'productbuild' 
63e5eb5f Help: Add notes for 'productbuild' topic
2e3c67d1 productbuild: Add new productbuild cpack generator.
50a3d340 PackageMaker: factor out common code for creating pkg files.
 2016-06-06 11:19:20 -04:00
Clinton Stimpson 2e3c67d1b6 productbuild: Add new productbuild cpack generator. 
This cpack generator basically replaces the obsolete PackageMaker generator.
 2016-06-03 14:41:57 -06:00
Daniel Pfeifer 7f6b8d3399 Simplify boolean expressions 
Use clang-tidy's readability-simplify-boolean-expr checker.
After applying the fix-its, revise all changes *very* carefully.
Be aware of false positives and invalid changes.
 2016-06-02 08:24:04 -04:00
Clinton Stimpson 50a3d34005 PackageMaker: factor out common code for creating pkg files. 2016-06-01 21:56:50 -06:00
Brad King fb1f5d50af Merge topic 'remove-needless-copies' 
27ead963 Remove unnecessary local copies.
618fb23f Pass arguments that are not modified as const&.
 2016-05-27 09:08:21 -04:00
Daniel Pfeifer 1b2bb93302 Remove redundant c_str() calls. 
Run clang-tidy's readability-redundant-string-cstr checker.
Ignore findings in kwsys.
 2016-05-26 22:52:22 +02:00
Daniel Pfeifer 618fb23fc9 Pass arguments that are not modified as const&. 
Use clang-tidy's performance-unnecessary-value-param checker to find
value parameter declarations of expensive to copy types that are not
modified inside the function.  Ignore findings in kwsys.
After applying the fix-its, manually change `const T&` to `T const&`.
 2016-05-26 21:58:51 +02:00
Harry Mallon 3acc29fca9 CPack/DragNDrop: Optionally disable `/Applications` symlink 2016-05-25 09:51:04 -04:00
Daniel Pfeifer 5784747d1b Improve string find: prefer character overloads. 
Apply fix-its from clang-tidy's performance-faster-string-find checker.
Ignore findings in kwsys.
 2016-05-24 23:22:24 +02:00
Daniel Pfeifer 5cec953e6a Use std::replace for replacing chars in strings. 
Find uses of `cmSystemTools::ReplaceString` where both `replace` and
`with` are string literals with a size of one.

Automate with:

git grep -l ReplaceString | xargs sed -i "s|cmSystemTools::ReplaceString(\([^,]*\), \"\(.\)\", \"\(.\)\");|std::replace(\1.begin(), \1.end(), '\2', '\3');|g"
git grep -l ReplaceString | xargs sed -i "s|cmSystemTools::ReplaceString(\([^,]*\), \"\(.\)\", \"\\\\\\\\\");|std::replace(\1.begin(), \1.end(), '\2', '\\\\\\\\');|g"
git grep -l ReplaceString | xargs sed -i "s|cmSystemTools::ReplaceString(\([^,]*\), \"\\\\\\\\\", \"\(.\)\");|std::replace(\1.begin(), \1.end(), '\\\\\\\\', '\2');|g"
 2016-05-24 23:22:20 +02:00
Brad King a98a699987 Merge topic 'cpack-deb-different-package-names' 
adbd3985 CPack/Deb possibility to change package name
 2016-05-24 13:54:03 -04:00
Domen Vrankar adbd3985f8 CPack/Deb possibility to change package name 
This patch preserves backward compatibility of
deb package names with previous CMake versions
but similarly to CPack/RPM allows to change
package name format and supports DEB-DEFAULT
setting that produces proper Debian package names.
 2016-05-23 19:55:46 +02:00
Konstantin Podsvirov 06ca7795f4 CPackIFW: Command cpack_ifw_configure_component learned ESSENTIAL option 2016-05-23 19:09:03 +03:00
Brad King acd039ae0e Merge topic 'minor-cleanup' 
40bee43a cmCPackDragNDropGenerator: Replace std::{ostringstream => string}
 2016-05-20 09:15:52 -04:00
Konstantin Podsvirov 41199f8c1e CPackIFW: Add support for Promoting Updates 
Add support for this feature added by QtIFW 2.0.3:

  http://doc.qt.io/qtinstallerframework/ifw-updates.html

Add a `cpack_ifw_update_repository` command as porcelain.
 2016-05-18 09:49:14 -04:00
Brad King 40bee43a58 cmCPackDragNDropGenerator: Replace std::{ostringstream => string} 2016-05-17 13:47:21 -04:00
Kitware Robot d9fd2f5402 Revise C++ coding style using clang-format 
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.

* If you reached this commit for a line in `git blame`, re-run the blame
  operation starting at the parent of this commit to see older history
  for the content.

* See the parent commit for instructions to rebase a change across this
  style transition commit.
 2016-05-16 16:05:19 -04:00
Brad King bc7598fde0 Merge topic 'cpack-rpm-different-package-names' 
44ee2d71 CPack/RPM different package names
 2016-05-16 10:11:32 -04:00
Domen Vrankar 44ee2d717a CPack/RPM different package names 
Packagers may now set their own rpm package
file names or request that rpmbuild tool
chooses one for them. It also supports handing
of situations where one spec file may produce
multiple rpm packages.
 2016-05-15 03:01:34 +02:00
Domen Vrankar 316dd61367 CPack/Deb proper package file naming 
Proper Debian packages file naming for single package
setup (breaks compatibility with previous versions)
 2016-05-13 10:46:04 -04:00
Alexander Smorkalov 3a55a0e72c CPack/Deb proper component packages file naming 
Proper Debian packages file naming for multi-component setup
(breaks compatibility with previous versions)
 2016-05-13 10:46:03 -04:00
Alexander Smorkalov c7f388e723 CPack/Deb generation of postinst and postrm ldconfig files 
DEBIAN/postinst and DEBAIN/postrm files generation if
the package installs libraries in ldconfig controlled
location (/lib/, /usr/lib/)
 2016-05-13 10:46:03 -04:00
Alexander Smorkalov 2d5896530b CPack/Deb generation of DEBIAN/shlibs control file 
DEBIAN/shlibs control file generation if the package
contains libraries
 2016-05-13 10:46:02 -04:00
Brad King 0ac18d40c8 Remove `//------...` horizontal separator comments 
Modern editors provide plenty of ways to visually separate functions.
Drop the explicit comments that previously served this purpose.
Use the following command to automate the change:

    $ git ls-files -z -- \
        "*.c" "*.cc" "*.cpp" "*.cxx" "*.h" "*.hh" "*.hpp" "*.hxx" |
      egrep -z -v "^Source/cmCommandArgumentLexer\." |
      egrep -z -v "^Source/cmCommandArgumentParser(\.y|\.cxx|Tokens\.h)" |
      egrep -z -v "^Source/cmDependsJavaLexer\." |
      egrep -z -v "^Source/cmDependsJavaParser(\.y|\.cxx|Tokens\.h)" |
      egrep -z -v "^Source/cmExprLexer\." |
      egrep -z -v "^Source/cmExprParser(\.y|\.cxx|Tokens\.h)" |
      egrep -z -v "^Source/cmFortranLexer\." |
      egrep -z -v "^Source/cmFortranParser(\.y|\.cxx|Tokens\.h)" |
      egrep -z -v "^Source/cmListFileLexer\." |
      egrep -z -v "^Source/cm_sha2" |
      egrep -z -v "^Source/(kwsys|CursesDialog/form)/" |
      egrep -z -v "^Utilities/(KW|cm).*/" |
      xargs -0 sed -i '/^\(\/\/---*\|\/\*---*\*\/\)$/ {d;}'

This avoids modifying third-party sources and generated sources.
 2016-05-09 09:41:43 -04:00
Brad King afca373510 Help clang-format wrap after braces on long initializer lists 
Add a long comment inside a few braced initializer lists in order to
convince clang-format to break after the opening brace and format the
list without indenting every value past the opening brace.
 2016-05-06 15:54:32 -04:00
Brad King 85425a3e6c Move comments off of class access specifier lines 
The clang-format tool may turn this:

   public: // comment about access specifier

     // unrelated comment indented with code
     ...

Into:

   public: // comment about access specifier

           // unrelated comment indented with code
     ...

Avoid this by moving comments off of access specifier lines.
 2016-05-06 14:51:26 -04:00