summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CPack/DragNDrop: Optionally run an AppleScript when making a packageRobert Maynard2015-11-132-11/+100
| | | | | | | | | | | | | | | | While the DragNDropGenerator supports custom DS_Store and backgrounds, it is still very hard to automatically setup nice looking packages. The primary issue is that the DS_Store embeds the name of the volume in the path to backgrounds, which means that if a package embeds the version in its volume name a new DS_Store must generated for each release. Instead one now can use applescript to setup the DS_Store. This change also ensures that temporary RW image has enough space for these changes, creating 1 MB dummy padding file, that is later removed from the image. Co-Author: Adam Strzelecki <adam.strzelecki@java.pl>
* CPack/DragNDrop: Place the background image file in a hidden folderRobert Maynard2015-11-131-16/+2
| | | | | | By using a hidden folder we avoid the need to mark the file as hidden from finder, and it makes it easier for future work to refer to the background image file.
* CPack/DragNDrop: Use source file extension for background imageRobert Maynard2015-11-131-1/+5
| | | | | | | Instead of blindly copying the `CPACK_DMG_BACKGROUND_IMAGE` file to `background.png`, we instead use the same file extension as the source image. This is needed for proper support of multi resolution `tif` backgrounds.
* Merge branch 'release'Brad King2015-11-120-0/+0
|\
| * CMake 3.4.0v3.4.0Brad King2015-11-121-1/+1
| |
* | Merge branch 'release'Brad King2015-11-120-0/+0
|\ \ | |/
| * Merge branch 'fix-install-rules' into releaseBrad King2015-11-091-6/+1
| |\
* | \ Merge topic 'fix-clang-Wdouble-promotion'Brad King2015-11-122-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 710d8bab Fix trivial clang -Wdouble-promotion warnings
| * | | Fix trivial clang -Wdouble-promotion warningsSean McBride2015-11-112-2/+2
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-11-121-1/+1
|/ / /
* | | CMake Nightly Date StampKitware Robot2015-11-111-1/+1
| | |
* | | Merge topic 'wix-toplevel-feature-required'Brad King2015-11-101-0/+1
|\ \ \ | | | | | | | | | | | | | | | | d3625b72 CPackWIX: Don't allow users to deselect the top-level feature (#15838)
| * | | CPackWIX: Don't allow users to deselect the top-level feature (#15838)Nils Gladitz2015-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The top-level WiX feature implicitly created by the WIX generator represents the package as a whole. As such it does not make sense to allow installer users to deselect it from the installation. Suggested-by: Mark Stijnman
* | | | Merge topic 'fix-install-rules'Brad King2015-11-101-6/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | 9103d8ac Install: Move SetHaveInstallRule to a more-obvious place
| * | | Install: Move SetHaveInstallRule to a more-obvious placeStephen Kelly2015-11-081-6/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The moved-from location checks for the existence of whether certain generators are needed for any target in a loop, rather than whether the current target has an install rule. This was introduced in commit v3.4.0-rc1~275^2~3 (cmInstallCommand: Move the SetHaveInstallRule invocation., 2015-07-28). Move the SetHaveInstallRule call to a more-obvious place where the cmInstallTargetGenerator is constructed.
* | | CMake Nightly Date StampKitware Robot2015-11-101-1/+1
| |/ |/|
* | Merge topic 'cpack-dmg-multilanguage-sla'Brad King2015-11-095-39/+356
|\ \ | | | | | | | | | | | | f88533cc CPackDMG: Add support for multilingual SLAs
| * | CPackDMG: Add support for multilingual SLAsSimon Levermann2015-11-065-39/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple languages for SLAs and the SLA UI can be added via the CPack variables CPACK_DMG_SLA_DIR and CPACK_DMG_SLA_LANGUAGES. For each language defined in the languages variable, CPack will search for <language>.menu.txt and <language>.license.txt in CPACK_DMG_SLA_DIR. If the sla directory variable is not defined, the old behaviour using CPACK_RESOURCE_FILE_LICENSE is retained.
* | | Merge topic 'cpack-deb-new-component-vars'Brad King2015-11-092-14/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 04a2a923 Help: Add notes for topic 'cpack-deb-new-component-vars' 57672e72 CPackDeb: CPACK_DEBIAN_PACKAGE_NAME documentation improvement a45a4b2d CPackDeb: set package control field per component a60574f1 CPackDeb: set priority control field per component 24012e3c CPackDeb: additional CPACK_DEBIAN_PACKAGE_SECTION documentation 47182ab8 CPackDeb: set section control field per component
| * | | Help: Add notes for topic 'cpack-deb-new-component-vars'Domen Vrankar2015-11-091-0/+7
| | | |
| * | | CPackDeb: CPACK_DEBIAN_PACKAGE_NAME documentation improvementDomen Vrankar2015-11-091-2/+10
| | | |
| * | | CPackDeb: set package control field per componentMarkus Rickert2015-11-091-5/+7
| | | |
| * | | CPackDeb: set priority control field per componentDomen Vrankar2015-11-091-2/+6
| | | |
| * | | CPackDeb: additional CPACK_DEBIAN_PACKAGE_SECTION documentationDomen Vrankar2015-11-081-0/+5
| | | |
| * | | CPackDeb: set section control field per componentMarkus Rickert2015-11-081-7/+8
| | | |
* | | | Merge topic 'fix-alias-target-access'Brad King2015-11-094-1/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4ce9742a Alias: Fix access at generate-time (#15832)
| * | | | Alias: Fix access at generate-time (#15832)Stephen Kelly2015-11-084-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit c389f8bb (cmLocalGenerator: Port Find method away from GetGeneratorTarget, 2015-10-25) ported the implementation of FindGeneratorTargetToUse away from the FindTargetToUse method, but neglected to handle alias targets. The latter method has a parameter to determine whether to include alias targets in the search, but as that is only needed at configure time, this generate-time equivalent does not need the condition.
* | | | | Merge topic 'FindGTK2_GTK2_TARGETS'Brad King2015-11-092-0/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5d79b956 FindGTK2: Use targets in GTK2_LIBRARIES if GTK2_USE_IMPORTED_TARGETS is ON
| * | | | | FindGTK2: Use targets in GTK2_LIBRARIES if GTK2_USE_IMPORTED_TARGETS is ONDaniele E. Domenichelli2015-11-092-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add GTK2_TARGETS variable containing all imported targets. Previously, the GTK2_LIBRARIES variable was filled with the paths to the libraries, and only the GTK2_XXX_LIBRARY variables contained the imported targets.
* | | | | | CMake Nightly Date StampKitware Robot2015-11-091-1/+1
| |_|/ / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2015-11-081-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-11-071-1/+1
| |/ / / |/| | |
* | | | Merge topic 'cpack-deb-config-file-source-field'Brad King2015-11-066-15/+170
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e5b70ed0 CPackDEB: added config file optional Source field f2d98e2d CPackDEB: minor documentation and debug logging fixes
| * | | | CPackDEB: added config file optional Source fieldRaffi Enficiaud2015-11-046-2/+157
| | | | |
| * | | | CPackDEB: minor documentation and debug logging fixesRaffi Enficiaud2015-11-041-13/+13
| | | | |
* | | | | Merge topic 'ninja-version-refactor'Brad King2015-11-062-19/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3c5ca96 cmGlobalNinjaGenerator: Save 'ninja' version very early ed67f405 cmGlobalNinjaGenerator: Save path to 'ninja' tool very early
| * | | | | cmGlobalNinjaGenerator: Save 'ninja' version very earlyBrad King2015-11-022-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep it in a member variable for convenient reference. Store the value as soon as it is known.
| * | | | | cmGlobalNinjaGenerator: Save path to 'ninja' tool very earlyBrad King2015-11-022-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep it in a member variable for convenient reference. Set the value as soon as it is known.
* | | | | | Merge topic 'fortran-line-directives'Brad King2015-11-068-574/+656
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 73f255e2 cmFortranLexer: Populate empty doxygen @param comments ba819f49 cmFortranParser: Parse #line directives
| * | | | | cmFortranLexer: Populate empty doxygen @param commentsBrad King2015-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply the change from commit v3.0.0-rc1~554^2~2 (cm*Lexer: Populate empty doxygen @param comment, 2013-09-19) after recent lexer generation.
| * | | | | cmFortranParser: Parse #line directivesBrad King2015-11-028-576/+658
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the lexer to extract the #line directive prefix and line number as a new token type. Teach the parser to recognize this token followed by a string as the file name (plus possibly other content). Report the named file as included by the source file.
* | | | | CMake Nightly Date StampKitware Robot2015-11-061-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-11-051-1/+1
| | | | |
* | | | | Merge topic 'cpack-deb-compression-scheme-test'Brad King2015-11-044-2/+72
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 341cd934 CPackDeb: ctest tests for compression scheme leak
| * | | | | CPackDeb: ctest tests for compression scheme leakRaffi Enficiaud2015-11-034-2/+72
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Test that changing compression of debian package content does not affect DEBIAN/ files which must be gzipped
* | | | | Merge topic 'find-cuda-dl'Brad King2015-11-041-8/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b1efb023 FindCUDA: drop CUDA_dl_LIBRARY
| * | | | | FindCUDA: drop CUDA_dl_LIBRARYRolf Eike Beer2015-11-031-8/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is the global CMAKE_DL_LIBS setting which can be used instead. There are even platforms where this is either empty because those functions are part of the libc or is called entirely different, so this code wouldn't work reliable anyway.
* | | | | Merge topic 'vs-show-def-files'Brad King2015-11-047-16/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7e713cc VS: Add module definition `.def` files to .vcxproj files (#15313) 247c168b Refactor `.def` file lookup adfc8a67 cmGeneratorTarget: Fix IMPLEMENT_VISIT_IMPL for template data types
| * | | | | VS: Add module definition `.def` files to .vcxproj files (#15313)Tim Grothe2015-11-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Make them appear in the IDE project tree for reference by developers.
| * | | | | Refactor `.def` file lookupTim Grothe2015-11-047-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a `cmSourceFile const*` from GetModuleDefinitionFile so that callers can get more information than just the path to the file.