summaryrefslogtreecommitdiff
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2014-11-151-1/+1
|
* Merge topic 'vs-nsight-tegra-version'Brad King2014-11-141-2/+2
|\ | | | | | | | | bb3c87f1 VS: Change Nsight Tegra 2.0 Project Revision Number from 8 to 9
| * VS: Change Nsight Tegra 2.0 Project Revision Number from 8 to 9Dmitry Polyanitsa2014-11-131-2/+2
| | | | | | | | | | A hotfix to Nsight Tegra 2.0 needed to increase the project number. Teach CMake to generate the newer number for this version.
* | Merge topic 'no-cmake-self-install-when-cross-compiling'Brad King2014-11-141-1/+2
|\ \ | | | | | | | | | | | | 15f55cca Do not use just-built CMake to install itself when cross-compiling (#15248)
| * | Do not use just-built CMake to install itself when cross-compiling (#15248)Brad King2014-11-131-1/+2
| |/ | | | | | | | | | | The special case added by commit v2.4.0~3051 (When building CMake itself, use the new cmake to install so that the current cmake can be overwritten, 2004-06-09) does not make sense when cross-compiling.
* | CMake Nightly Date StampKitware Robot2014-11-141-1/+1
| |
* | Merge topic 'file-GENERATE-source'Brad King2014-11-1310-3/+92
|\ \ | | | | | | | | | | | | | | | b80557c7 file(GENERATE): Evaluate early to allow generating source files 0019d54b Genex: Fix whitespace issue.
| * | file(GENERATE): Evaluate early to allow generating source filesStephen Kelly2014-11-1210-2/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The evaluation files must be known before cmTargetTraceDependencies attempts to find them, but we must actually generate the files after cmTargetTraceDependencies, as that can add to target SOURCES. The limitation is that the generated output name must not depend on the SOURCES of a target if the generated file is used by that target. Mark the output files as GENERATED so that trace dependencies does not expect them to already exist in the filesystem. Move the invokation of ForceLinkerLanguage in the Generate logic to after the generated file names are known. ForceLinkerLanguage tries to determine the sources of a target (in order to determine an already-known language) and otherwise fails to get information about the generated file. Test that the output of file(GENERATE) can be used as a target source file and that accessing the target SOURCES in the name of the output file is an error. Accessing the TARGET_OBJECTS would be a similar error if it was legal to use that generator expression in this context. That is not currently possible and is a different error condition, so test the current error output as a reminder to change the expected output if that becomes possible in the future. Test that generated rule files resulting from cmTargetTraceDependencies appear in the SOURCES generated in the output file.
| * | Genex: Fix whitespace issue.Stephen Kelly2014-11-111-1/+1
| | |
* | | Merge topic 'refactor-search-path-construction'Brad King2014-11-1312-455/+831
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1abd7cd9 Use containers of labeled search paths instead of individual members 2a9ac4bd Encapsulate search path manipulation functions into a seperate class. 32922840 Refactor and seperate search path construction for find commands
| * | | Use containers of labeled search paths instead of individual membersChuck Atkins2014-11-1210-106/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Manage classes of search paths in labeled containers. This removes the need to have a seperate member variable for each type of search path, but also allows path types to be grouped togethor in various different ways and manipulated as subsets of the full set of search paths.
| * | | Encapsulate search path manipulation functions into a seperate class.Chuck Atkins2014-11-119-345/+414
| | | | | | | | | | | | | | | | | | | | | | | | The functions for adding the various different types of paths have been factored out into a new class, cmSearchPath. It is to be used as a helper container class for the various find_* commands.
| * | | Refactor and seperate search path construction for find commandsChuck Atkins2014-11-117-321/+395
| |/ / | | | | | | | | | | | | | | | | | | Prior to this commit, the set of search paths to traverse for find commands was incrementally constructed. This change allows each group of paths, i.e. CMakeVariablePaths, UserHintsPaths, SystemEnvironmentPaths, etc. to be constructed and manipulated independently, and then all combined togethor.
* | | CMake Nightly Date StampKitware Robot2014-11-131-1/+1
| | |
* | | Merge topic 'fix-vs12-GetVersionEx-warning'Brad King2014-11-121-0/+10
|\ \ \ | | | | | | | | | | | | | | | | 3a6c3599 Suppress deprecation warnings for GetVersionEx
| * | | Suppress deprecation warnings for GetVersionExBrad King2014-11-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio 12 (2013) deprecated GetVersionEx: warning C4996: 'GetVersionExW': was declared deprecated in favor of either "versionhelpers.h" or VerifyVersionInfo, neither of which exist in some of the older compilers we support. Rather than try to port conditionally to VerifyVersionInfo, simply suppress the warning for now.
* | | | Merge topic 'update-kwsys'Brad King2014-11-123-156/+156
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 75009e4b Merge branch 'upstream-kwsys' into update-kwsys 35ecc355 KWSys 2014-11-12 (5843f590)
| * | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-11-123-156/+156
| | |/ / | |/| |
* | | | CMake Nightly Date StampKitware Robot2014-11-121-1/+1
|/ / /
* | | Merge topic 'fix_link-line-dedup_regression'Brad King2014-11-111-4/+9
|\ \ \ | |/ / |/| | | | | | | | 4db31095 Fix link line order when shared libraries are de-duplicated
| * | Fix link line order when shared libraries are de-duplicatedDaniele E. Domenichelli2014-11-101-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~227^2~1 (De-duplicate shared library targets in generated link lines, 2014-07-30) we de-duplicate shared library targets on the link line. However, some toolchains will fail linking if an executable is linking to a shared library that is not used directly and a static library that depends on the shared one. The linker may not keep the reference to the shared library the first time and then the symbols needed by the static library may not be found. Fix this by reversing the direction of the for loop that removes the duplicate shared libraries, in order to ensure that the last occurrence of the library is left instead of the first one. Extend Tests/Dependency with a case covering this behavior. Create an executable that links to a shared library and a static library but only needs the shared library as a dependency of the static library. Co-Author: Brad King <brad.king@kitware.com>
* | | CMake Nightly Date StampKitware Robot2014-11-111-1/+1
| | |
* | | 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.