summaryrefslogtreecommitdiff
path: root/Source/CPack
Commit message (Collapse)AuthorAgeFilesLines
* Remove use of include <cmsys/ios/*> and cmsys_ios::*Brad King2015-08-202-7/+7
| | | | We no longer need this compatibility layer for the compilers we support.
* CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSIONKonstantin Podsvirov2015-07-081-2/+4
| | | | | | This setting was added to support QtIFW 2.0 in commit v3.3.0-rc1~70^2~1 (CPackIFW: Add QtIFW 2.0 support, 2015-04-27). We need to load the CPackIFW module to initialize it if it is not set.
* cmGlobalGenerator: Require a cmake instance in ctor.Stephen Kelly2015-05-272-4/+2
| | | | It is required anyway, so this makes it explicit.
* Use cmSystemTools::GetCMakeCommand() to get path to cmake internallyBrad King2015-05-201-6/+4
| | | | | This is much simpler than finding a way to lookup "CMAKE_COMMAND" everywhere.
* Merge topic 'refactor-cmLocalGenerator'Brad King2015-05-192-0/+4
|\ | | | | | | | | | | | | | | | | fa9eb814 cmLocalGenerator: Remove redundant path access. 1933f3d1 cmLocalGenerator: Remove redundant path conversions. 9e4b6cc2 cmState: Store computed relative paths to to current directories. 991f5e49 cmState::Snapshot: Store components for current directories. 57bdc1a2 cmState: Compute and store directory components.
| * cmState: Compute and store directory components.Stephen Kelly2015-05-162-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to duplicate these in all cmLocalGenerators. Rename the symbols according to current conventions. Add explicit calls to Set{Source,Binary}Directory with empty strings in order to trigger the population of the components containers with the current working directory in cmLocalGenerator. Having directories set to empty is a special case in CMake, which is relied on for the `if(CMAKE_BINARY_DIR)` condition at the end of CMakeDetermineSystem.cmake.
* | Merge topic 'clean-up-makefile-generators'Brad King2015-05-192-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 036372c4 Remove obsolete overrides of CreateLocalGenerator. 684e5cef cmGlobalGenerator: Host the MakeSilentFlag. 2047144f cmLocalGenerator: Remove unused IgnoreLibPrefix. 333c1fa8 cmGlobalUnixMakefileGenerator3: Host the UnixCD. a97df5e1 cmGlobalUnixMakefileGenerator3: Host the PassMakeflags. 14f171c3 Remove method calls just repeating the default. cf7f03e5 cmGlobalUnixMakefileGenerator3: Host the DefineWindowsNULL. e9b134b9 cmGlobalUnixMakefileGenerator3: Host the include directive. 24613d8b cmLocalGenerator: Remove unused method. b659d161 cmGlobalGenerator: Add NVI wrapper to create local generator.
| * | cmGlobalGenerator: Add NVI wrapper to create local generator.Stephen Kelly2015-05-162-2/+2
| |/
* | CPackIFW: Add QtIFW 2.0 supportKonstantin Podsvirov2015-05-156-11/+299
|/ | | | | | | | | | | | | Add variables: - CPACK_IFW_FRAMEWORK_VERSION - CPACK_IFW_PACKAGE_ALLOW_NON_ASCII_CHARACTERS - CPACK_IFW_PACKAGE_ALLOW_SPACE_IN_PATH - CPACK_IFW_PACKAGE_CONTROL_SCRIPT - CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_INI_FILE - CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_NAME - CPACK_IFW_PACKAGE_START_MENU_DIRECTORY - CPACK_IFW_VERBOSE
* CPackDeb: Fix lintian md5sum file warningRaffi Enficiaud2015-04-231-0/+6
| | | | Lintian warned about invalid md5sum file permissions.
* Merge topic 'disable-cmMakefile-copy'Brad King2015-04-211-2/+2
|\ | | | | | | | | | | 80909041 cmMakefile: Disable copy constructor. f3af9517 CPack: Don't copy cmMakefile. Just push a scope instead.
| * CPack: Don't copy cmMakefile. Just push a scope instead.Stephen Kelly2015-04-211-2/+2
| |
* | CPackDeb: Refactor package variable lookup by generatorDomen Vrankar2015-04-211-39/+36
| | | | | | | | | | | | | | | | Preparation for per component variables. Patch makes sure we know which variables will be set for per component generator and also prevents accidental overflows of variable values between components.
* | cmSystemTools: Teach RunSingleCommand to separate stdout and stderrBrad King2015-04-208-23/+28
|/ | | | | | | Extend the RunSingleCommand signature to capture stdout and stderr separately. Allow both to be captured to the same std::string to preserve existing behavior. Update all call sites to do this so that this refactoring does not introduce functional changes.
* cmMakefile: Remove always-null first parameter to ReadListFile.Stephen Kelly2015-04-182-7/+7
|
* CPack: Read the config listfile in the normal way.Stephen Kelly2015-04-181-1/+1
| | | | | | | | | | | | | This is a unique function call in CMake, and it was likely a programming error when introduced. All other similar calls to ReadListFile use a null first paramter. The effect of this patch is to no-longer define CMAKE_PARENT_LIST_FILE to the config file itself while evaluating it. The ReadListFile method also no longer hits a condition that it uses CollapseFullPath on the input file. However, as cpack does not set the StartDirectory anyway, this has no effect. See bug 15522.
* Merge topic 'cpack-one-component-only'Brad King2015-04-171-2/+2
|\ | | | | | | | | ed0b0630 CPack: Fix single component packaging
| * CPack: Fix single component packagingRaffi Enficiaud2015-04-161-2/+2
| | | | | | | | | | | | Refine logic added in commit 0ffd3534 (CPack single component packaging, 2015-04-02). Component packaging should be enabled if either at least one component or one group is set and should not require both.
* | Port cmCommand consumers to cmState.Stephen Kelly2015-04-151-1/+1
| |
* | cmake: Teach "-E tar" command a "--format=" optionNils Gladitz2015-04-108-11/+11
| | | | | | | | | | | | | | Allows specifying a libarchive defined archive format currently restricted to 7zip, gnutar, pax, paxr and zip. The default is "paxr" (pax restricted).
* | Merge topic 'cpack-one-component-only'Brad King2015-04-061-1/+4
|\ \ | |/ | | | | | | 0ffd3534 CPack single component packaging
| * CPack single component packagingDomen Vrankar2015-04-051-1/+4
| | | | | | | | | | | | | | | | RPM, DEB and archive packages were not created in cases when CPACK_<generator>_COMPONENT_INSTALL was set to ON and a single component existed. Patch also changes CPackRPM test to implicitly test for this case.
* | Merge topic 'test_cpack_symlinks'Brad King2015-04-061-0/+3
|\ \ | |/ |/| | | | | | | 5f686b8a Tests: Add case for CPack source package with symlinks aca1d93b cpack: Disable CMake Cygwin legacy warning while packaging
| * cpack: Disable CMake Cygwin legacy warning while packagingBrad King2015-04-011-0/+3
| | | | | | | | | | | | | | | | In cpack we load the platform information modules to give the configuration scripts access to the host system information. CYGWIN.cmake warns unless we explicitly tell it not to warn since there is no chance for a cmake_minimum_required(VERSION) to be called.
* | Merge topic 'cpack-deb-format-cast'Brad King2015-04-011-2/+4
|\ \ | | | | | | | | | | | | e86f44b7 cmCPackDebGenerator: Cast file mode to proper type for %o formatter
| * | cmCPackDebGenerator: Cast file mode to proper type for %o formatterBrad King2015-03-311-2/+4
| |/
* | CPack: Fix make tool selection during preinstall (#15483)Brad King2015-03-311-15/+8
|/ | | | | | | | The CMAKE_MAKE_PROGRAM selected by CMake while configuring the project should also be used to drive the "preinstall" target during packaging. Teach CPack to use "cmake --build" instead of constructing the build command line itself. The "cmake --build" command already knows how to select the proper make tool.
* Merge topic 'cpack-archive-prefix'Brad King2015-03-301-0/+8
|\ | | | | | | | | e3f84fc5 cpack: Fix CPACK_PACKAGING_INSTALL_PREFIX handling for archives (#14677)
| * cpack: Fix CPACK_PACKAGING_INSTALL_PREFIX handling for archives (#14677)Clinton Stimpson2015-03-301-0/+8
| | | | | | | | | | Fix the case when the archive generator is used to package components with an install prefix.
* | Merge topic 'wix-fix-utf8'Brad King2015-03-303-4/+10
|\ \ | | | | | | | | | | | | 98a3b2e2 CPackWIX: Omit codepage conversion when internal encoding is already UTF-8.
| * | CPackWIX: Omit codepage conversion when internal encoding is already UTF-8.Nils Gladitz2015-03-273-4/+10
| |/
* | Merge topic 'clean-scanbuild-warnings'Brad King2015-03-301-0/+5
|\ \ | | | | | | | | | | | | | | | e680d43d Fix an unused variable warning from scanbuild. a4a1b729 Fix warnings from clang scanbuild.
| * | Fix warnings from clang scanbuild.Bill Hoffman2015-03-251-0/+5
| |/
* | CPackWIX: Add static_casts for XML_Parser.Nils Gladitz2015-03-261-2/+2
|/ | | | | | | "XML_Parser" in cmexpat is a typedef for void* while newer releases of expat seem to use struct XML_ParserStruct *XML_Parser. Add static_casts so that the build works with either variant.
* CPack: Add support to overwrite or pass additional parameter to codesignAndré Klitzing2015-03-231-3/+11
|
* CPackWIX: Fix .wixobj output locations and filenames.Nils Gladitz2015-03-061-1/+18
| | | | | | | | Preserve all but the last extension when generating .wixobj output filenames from source files and make sure they are unique. Output .wixobj files in cpack staging area instead of the current working directory.
* CPackWIX: Support patching of root <Feature> elements.Nils Gladitz2015-03-061-0/+1
|
* cmake: Teach --build to honor CMAKE_VERBOSE_MAKEFILE for NinjaGregor Jasny2015-02-261-1/+1
| | | | | | | | | The Ninja build system does not support a in-file verbositiy switch. Instead teach 'cmake --build' to extract the CMAKE_VERBOSE_MAKEFILE setting and pass it as an optional '-v' argument to Ninja. This can serve as a reasonable fallback. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* Merge topic 'wix-shortcut-properties'Brad King2015-02-238-152/+343
|\ | | | | | | | | | | | | | | | | | | 6cc01c14 CPackWIX: Add release notes for the wix-shortcut-properties topic. 135febf0 CPackWIX: Enhance CMake CPack WIX generated installer. e6731f48 CPackWIX: Add new CPACK_STARTUP_SHORTCUTS property. 279605f5 CPackWIX: Add installed file properties for the creation of shortcuts. 53d7daff CPackWIX: Refactor start menu and desktop shortcut creation. dc0f3fb4 CPackWIX: Explicitly list CPack WIX headers for IDE convenience.
| * CPackWIX: Add new CPACK_STARTUP_SHORTCUTS property.Nils Gladitz2015-02-215-1/+39
| |
| * CPackWIX: Add installed file properties for the creation of shortcuts.Nils Gladitz2015-02-216-12/+67
| |
| * CPackWIX: Refactor start menu and desktop shortcut creation.Nils Gladitz2015-02-216-150/+248
| |
* | CPack: Print output from codesign if signing failsAndré Klitzing2015-02-201-6/+7
|/
* CPackWIX: Extend the patching mechanism to allow adding content to <Product>.Nils Gladitz2015-02-132-2/+16
|
* Split cmAlgorithms into a separate header file.Stephen Kelly2015-02-101-0/+1
|
* Merge topic 'cmStandardIncludes-cleanup'Brad King2015-02-101-0/+1
|\ | | | | | | | | | | | | af65da0a cmStandardIncludes: Remove list include. e848cc50 cmStandardIncludes: Remove deque include. 5fea6898 cmStandardIncludes: Remove some VS6 workarounds.
| * cmStandardIncludes: Remove list include.Stephen Kelly2015-02-061-0/+1
| | | | | | | | Include it only where used.
* | Merge topic 'use-algorithms'Brad King2015-02-102-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8639733 cmSystemTools: Remove unnecessary comparison. 803317aa cmSystemTools: Early return if size makes later comparison false. 11093a03 Replace temporary bool by inlining warning condition. 6cd2ee95 Replace loop with member algorithm. 94e993a0 cmComputeLinkDepends: Remove temporary iterator copy. 69dbe51b Replace loop with algorithm. 683fafea Replace a loop with std::transform. 63f584b6 Replace while loop with member insert. 74c4d9d2 Take a size check outside of an inner loop. 71d47115 Use insert member instead of back_inserter. 39622c99 Convert while loop to member insert. a7fcc148 Convert loop to algorithm. d46c4f07 Extract a prefix variable from loop. d59913f0 Take computation out of loop. 3f3db744 cmMakefile: Remove ExpandSourceListArguments. bd990c80 Remove use of ExpandSourceListArguments. ...
| * | Remove use of cmsys_stl.Stephen Kelly2015-02-052-5/+5
| |/ | | | | | | It is not needed.
* | Merge branch 'backport-no-global-setlocale' into no-global-setlocaleBrad King2015-02-061-2/+0
|\ \ | |/ |/| | | Resolve conflict in Source/CMakeLists.txt by taking both changes.
View Lorry Controller Status