summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'make-fortran-preprocessor-assembly-targets'Brad King2014-11-102-22/+36
|\ | | | | | | | | | | b6b37e30 Makefile: Add assembly and preprocessed targets for Fortran 0842b084 Makefile: Refactor checks for lang-specific targets and export compile cmds
| * Makefile: Add assembly and preprocessed targets for FortranTim Gallagher2014-11-102-4/+6
| | | | | | | | Extend the FortranOnly test to cover "make <src>.i" targets.
| * Makefile: Refactor checks for lang-specific targets and export compile cmdsTim Gallagher2014-11-052-22/+34
| | | | | | | | | | | | The checks are now split into languages that are able to generate assembly listings, languages that are able to generate preprocessed listings, and languages that are able to export the compile commands.
* | Merge topic 'encoding-curl'Brad King2014-11-101-0/+38
|\ \ | | | | | | | | | | | | e63dcb13 Encoding: Use encoding libcurl expects with file: urls.
| * | Encoding: Use encoding libcurl expects with file: urls.Clinton Stimpson2014-11-051-0/+38
| |/ | | | | | | | | | | | | | | For unescaped file: URLs on Windows, libcurl expects the ANSI code page. This fixes the CMake.FileUpload test when CMake is configured to use UTF-8 internally with a non-ascii build directory name.
* | Merge topic 'file-GENERATE-permissions'Brad King2014-11-102-3/+9
|\ \ | | | | | | | | | | | | 81afbbc0 file(GENERATE): Use permissions of input file if present.
| * | file(GENERATE): Use permissions of input file if present.Stephen Kelly2014-11-042-3/+9
| | |
* | | Merge topic 'genex-target-objects-ordering'Brad King2014-11-101-4/+8
|\ \ \ | | | | | | | | | | | | | | | | caa4b7b8 genex: Preserve order while evaluating TARGET_OBJECTS
| * | | genex: Preserve order while evaluating TARGET_OBJECTSClinton Stimpson2014-11-071-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic introduced in commit v3.1.0-rc1~688^2~9 (Genex: Evaluate TARGET_OBJECTS as a normal expression, 2014-02-26) ordered a map by pointer value and then constructed a list of object files by iterating over the map. This is not deterministic. Since commit v3.1.0-rc1~688^2~5 (cmTarget: Allow any generator expression in SOURCES property, 2014-03-18) the order produced by the above-mentioned logic started being used for the actual list of object files on the link line. Since it is not deterministic, spurious re-links occur after re-running CMake simply because the order of objects changed on the link line. Fix this by iterating over the original vector of source files instead of the map. This has a deterministic order.
| * | | Merge branch 'fix-configure_file-COPYONLY' into releaseBrad King2014-11-031-1/+1
| |\ \ \
| * \ \ \ Merge branch 'revert-definition-map-lookup' into releasev3.1.0-rc1Brad King2014-10-243-24/+10
| |\ \ \ \
* | | | | | CMake Nightly Date StampKitware Robot2014-11-101-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-11-091-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-11-081-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-11-071-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-11-061-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2014-11-051-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'update-kwsys'Brad King2014-11-049-134/+249
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 5868b4e2 Merge branch 'upstream-kwsys' into update-kwsys 72b5b480 KWSys 2014-10-31 (88c8cc7f)
| * | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-10-319-135/+250
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-11-041-1/+1
| | | | |
* | | | | Merge topic 'fix-configure_file-COPYONLY'Brad King2014-11-032-1/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1531df2b configure_file: Warn about unknown arguments 4abbb140 Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLY bd7ba8e2 KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLY e9282782 Help: Fix configure_file call to use COPYONLY, not COPY_ONLY
| * | | | | configure_file: Warn about unknown argumentsBrad King2014-10-311-0/+13
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the RunCMake.configure_file test with a case covering possible common typos of the COPYONLY option. Reported-by: Iosif Neitzke <iosif.neitzke@gmail.com>
| * | | | KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLYBrad King2014-10-311-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-11-031-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-11-021-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-11-011-1/+1
| |/ / / |/| | |
* | | | Merge topic 'VERSION_no_sscanf'Brad King2014-10-311-13/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | ef09df64 cmSystemTools: reimplement verson comparison without sscanf() 667560c8 extend the testing for version comparison
| * | | | cmSystemTools: reimplement verson comparison without sscanf()Rolf Eike Beer2014-10-311-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | This now has the advantage that it works with version strings with any number of components.
* | | | | Merge topic 'xcode-inherit-warning-flags'Brad King2014-10-311-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 820e95d0 Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)
| * | | | | Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)Brad King2014-10-311-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Allow projects to use CMAKE_CODE_ATTRIBUTE_WARNING_CFLAGS to add their own warning flags and have them used by the targets.
* | | | | CMake Nightly Date StampKitware Robot2014-10-311-1/+1
| | | | |
* | | | | Merge topic 'unix-icon-install'Brad King2014-10-302-3/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb13502f QtDialog: install the 128x128 icon fcb4541a QtDialog: don't install desktop file bits on Apple
| * | | | | QtDialog: install the 128x128 iconBen Boeckel2014-10-292-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Also only install the icons to the icons directory.
| * | | | | QtDialog: don't install desktop file bits on AppleBen Boeckel2014-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Apple uses the dmg file which doesn't have .desktop support.
* | | | | | Merge topic 'cpack-bundle-codesign'Brad King2014-10-302-1/+127
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd3fbf36 CPack: Add support for code signing of bundles on MacOS
| * | | | | | CPack: Add support for code signing of bundles on MacOSAndré Klitzing2014-10-282-1/+127
| | | | | | |
* | | | | | | Merge topic 'fix--D-command-line-parsing'Brad King2014-10-301-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aee7e4a0 cmCacheManager: parse -D flags more strictly 368e8de4 Tests: test -D parsing on the command line
| * | | | | | | cmCacheManager: parse -D flags more strictlyBen Boeckel2014-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of: -DCACHE_VARS=-DEXTERNAL_PROJECT_CMAKE_ARG:BOOL=TRUE the variable is parsed out as: CACHE_VARS=-DEXTERNAL_PROJECT_CMAKE_ARG because the parser allows '=' in the variable name. Disallow such a name on the command line.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-10-301-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge topic 'add_javascript_coverage_parser'Brad King2014-10-295-0/+258
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | 220e8134 CTest: Add Javascript coverage parser
| * | | | | | CTest: Add Javascript coverage parserJoseph Snyder2014-10-295-0/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a coverage parser for the Blanket.js library using the JSON output of the mocha.js test runner. Add a test for the new parser.
* | | | | | | CMake Nightly Date StampKitware Robot2014-10-291-1/+1
| |_|/ / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-10-281-1/+1
|/ / / / /
* | | | | Merge topic 'autorcc-depends'Brad King2014-10-272-24/+317
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e1c359f QtAutogen: Regenerate qrc files if their input changes (#15074) a2995318 QtAutogen: Expand rccfiles into a vector early in the autogen process. 506151af QtAutogen: Extract a GetRccExecutable method.
| * | | | | QtAutogen: Regenerate qrc files if their input changes (#15074)Stephen Kelly2014-10-242-8/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get dependencies from the output of ``rcc --list`` if using Qt 5. Otherwise process the file in the same way as the qt4_add_resources macro. This does not work for RCC files which are generated. The cmake_autogen build step is implemented as a PRE_BUILD step of the target currently if possible, rather than a standalone custom target. This is to keep the number of (synthesized) custom targets that appear in the UI low, but in some cases it is necessary to fall back to a full custom target. Fall back to a full custom target for the VS builds if autorcc is used.
| * | | | | QtAutogen: Expand rccfiles into a vector early in the autogen process.Stephen Kelly2014-10-232-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | This can be re-used as a vector.
| * | | | | QtAutogen: Extract a GetRccExecutable method.Stephen Kelly2014-10-232-9/+33
| | | | | |
* | | | | | Merge topic 'revert-definition-map-lookup'Brad King2014-10-273-24/+10
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1b62185 Merge branch 'parent-scope-tests' into variable-pull-failure 5f414cef Revert "cmDefinitions: Don't store parent lookups" e0c0b1ac test: add a test for PARENT_SCOPE with multiple scopes 064c415d test: add test for PARENT_SCOPE behavior
| * | | | | Revert "cmDefinitions: Don't store parent lookups"Ben Boeckel2014-10-243-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49. The behaviors associated with implicit pulldown on variable lookup seriously conflict with the optimizations made in these commits. Basically, since values were copied upon variable lookup, not just on PARENT_SCOPE, coupled with PARENT_SCOPE's behavior based on whether the variable is in the current scope or not causes serious problems with not storing a value for every variable at every scope. The commit changed behavior of the following example, among other cases: function(test_set) set(blah "value2") message("before PARENT_SCOPE blah=${blah}") set(blah ${blah} PARENT_SCOPE) message("after PARENT_SCOPE blah=${blah}") endfunction() set(blah value1) test_set() message("in parent scope, blah=${blah}") Reported-by: Alex Merry <alex.merry@kde.org> Reported-by: Ben Cooksley <bcooksley@kde.org>
* | | | | | CMake Nightly Date StampKitware Robot2014-10-271-1/+1
| | | | | |