summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake-gui: Add option to specify generator toolsetRobert Dailey2015-11-1721-26/+203
| | | | | | | | | | The -T parameter to CMake may now be specified through cmake-gui via a new text field in the first-time configure wizard (below the generator chooser). The generator factories specify whether or not they support toolsets. This information is propagated to the Qt code and used to determine if the selected generator should also display the optional Toolset widgets.
* Merge topic 'non-xcode-framework-layout'Brad King2015-11-1610-3/+143
|\ | | | | | | | | | | f6f03ed4 Add test for OSX/iOS Framework directory structure (#15833) 9f053763 Fix iOS Framework directory structure (#15833)
| * Add test for OSX/iOS Framework directory structure (#15833)Gregor Jasny2015-11-139-0/+131
| |
| * Fix iOS Framework directory structure (#15833)Bartosz Kosiorek2015-11-131-3/+12
| | | | | | | | Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | Merge topic 'add-cray-linux-platform'Brad King2015-11-164-0/+276
|\ \ | | | | | | | | | | | | | | | 31d52139 Cray: Added documentation for cross compiling on a Cray c54a621b Cray: New platform file for Cray Linux Environment and PrgEnv
| * | Cray: Added documentation for cross compiling on a CrayChuck Atkins2015-11-142-0/+37
| | |
| * | Cray: New platform file for Cray Linux Environment and PrgEnvChuck Atkins2015-11-142-0/+239
| | |
* | | Merge topic 'jacoco_out_of_source'Brad King2015-11-161-4/+21
|\ \ \ | | | | | | | | | | | | | | | | 1db32ffe ctest_coverage: Search for Jacoco files in the binary directory
| * | | ctest_coverage: Search for Jacoco files in the binary directoryZack Galbreath2015-11-161-4/+21
| | | | | | | | | | | | | | | | | | | | Search for Jacoco coverage files in both the source directory and the binary directory.
* | | | CMake Nightly Date StampKitware Robot2015-11-161-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-11-151-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-11-141-1/+1
| | | |
* | | | Merge topic 'better_looking_mac_package'Brad King2015-11-137-26/+172
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bca9401 Improve appearance of CMake .dmg package on OS X c4b9ee18 CPack/DragNDrop: Update documentation to include new variables 167a4655 CPack/DragNDrop: Optionally run an AppleScript when making a package 9c1dfbfd CPack/DragNDrop: Place the background image file in a hidden folder 47302038 CPack/DragNDrop: Use source file extension for background image
| * | | | Improve appearance of CMake .dmg package on OS XAdam Strzelecki2015-11-133-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | Configure our use of the CPack DragNDrop generator to specify a custom background image and script.
| * | | | CPack/DragNDrop: Update documentation to include new variablesRobert Maynard2015-11-132-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Document the new behavior of `CPACK_DMG_BACKGROUND_IMAGE` and the purpose of `CPACK_DMG_DS_STORE_SETUP_SCRIPT`.
| * | | | 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 topic 'cray-fortran-version'Brad King2015-11-131-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | 09f754f0 Cray: Implement Fortran compiler version detection (#15845)
| * | | | Cray: Implement Fortran compiler version detection (#15845)Brad King2015-11-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already recognize the Cray Fortran compiler id. Extract the version number using the same predefined macros we already use for Cray C and C++ compilers.
* | | | | CMake Nightly Date StampKitware Robot2015-11-131-1/+1
| |/ / / |/| | |
* | | | 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
| |/ / / / / |/| | | | |