summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ExternalProject-SOURCE_SUBDIR'Brad King2016-08-164-5/+47
|\ | | | | | | | | a8345d65 ExternalProject: Add SOURCE_SUBDIR option
| * ExternalProject: Add SOURCE_SUBDIR optionMatthew Woehlke2016-08-164-5/+47
| | | | | | | | | | | | | | | | | | | | | | | | Add a new SOURCE_SUBDIR option to ExternalProject_Add that allows specifying the location of the CMakeLists.txt to use as the project root relative to the SOURCE_DIR. This is helpful for projects that have unusual layouts, or projects that provide both a superbuild and project-only build depending on which CMakeLists.txt is used. Fixes: #15118
* | Merge topic 'FindMatlab-mingw'Brad King2016-08-161-1/+5
|\ \ | | | | | | | | | | | | 8ba204a6 FindMatlab: Use pre-built libraries for MinGW if needed
| * | FindMatlab: Use pre-built libraries for MinGW if neededSebastian Niemann2016-08-151-1/+5
| | |
* | | Merge topic 'issue-tracker-urls'Brad King2016-08-1612-17/+18
|\ \ \ | | | | | | | | | | | | | | | | 2bdba83e issues: update references to the CMake issue tracker
| * | | issues: update references to the CMake issue trackerBen Boeckel2016-08-1512-17/+18
| |/ / | | | | | | | | | | | | References to specific comments are left as-is since comments were not migrated.
* | | CMake Nightly Date StampKitware Robot2016-08-161-1/+1
| | |
* | | Merge topic 'FindCUDA-fixes'Brad King2016-08-151-9/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | 1aa5c1be FindCUDA: Fix missing librt on Linux when using static cuda runtime. aab1f6e9 FindCUDA: Restore default behavior of CUDA_USE_STATIC_CUDA_RUNTIME
| * | | FindCUDA: Fix missing librt on Linux when using static cuda runtime.Stephen Sorley2016-08-121-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Commit 7229ae72 (FindCUDA: Refactor Android(Tegra) support, 2016-04-19) changed the logic to only add librt to the link line for CUDA versions 6.5 and older. However, newer versions of CUDA still require librt.
| * | | FindCUDA: Restore default behavior of CUDA_USE_STATIC_CUDA_RUNTIMEStephen Sorley2016-08-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug introduced by commit 7229ae72 (FindCUDA: Refactor Android(Tegra) support, 2016-04-19). `CUDA_USE_STATIC_CUDA_RUNTIME` should be enabled by default if `cudart_static` is available, and silently disabled if it is not.
* | | | Merge topic 'autogen-same-name'Brad King2016-08-1528-61/+562
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61a607e8 Help: Document AUTORCC behavior for same .qrc name case e4f508e4 Tests/QtAutogen: Test same moc/qrc source names in different directories 4e9b97d7 QtAutogen: Allow multiple qrc files with the same name 41c9e14a QtAutogen: Allow multiple moc files with the same name 3c3b37b0 QtAutogen: Use std:: instead of ::std:: 0a5dd3c7 cmFilePathUuid: Add class to generate deterministic unique file names
| * | | | Help: Document AUTORCC behavior for same .qrc name caseSebastian Holtermann2016-08-151-0/+5
| | | | |
| * | | | Tests/QtAutogen: Test same moc/qrc source names in different directoriesSebastian Holtermann2016-08-1021-0/+237
| | | | |
| * | | | QtAutogen: Allow multiple qrc files with the same nameSebastian Holtermann2016-08-103-48/+93
| | | | | | | | | | | | | | | | | | | | Use cmFilePathUuid for qrc files.
| * | | | QtAutogen: Allow multiple moc files with the same nameSebastian Holtermann2016-08-102-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use cmFilePathUuid for moc files. Closes: #12873
| * | | | QtAutogen: Use std:: instead of ::std::Sebastian Holtermann2016-08-101-2/+2
| | | | |
| * | | | cmFilePathUuid: Add class to generate deterministic unique file namesSebastian Holtermann2016-08-103-0/+211
| | | | | | | | | | | | | | | | | | | | | | | | | The class generates a semi-unique (checksum based) pathless file name from a full source file path.
* | | | | Merge topic 'GetPrerequisites-fix-regression'Brad King2016-08-151-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a2d5c25a GetPrerequisites: Fix regression in gp_resolved_file_type
| * | | | | GetPrerequisites: Fix regression in gp_resolved_file_typeBrad King2016-08-121-2/+6
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.6.0-rc1~287^2 (GetPrerequisites: Fix gp_resolved_file_type on non-canonical paths, 2016-03-08) we accidentally convert relative paths (e.g. system dll file names) to absolute paths even when we do not know the base directory. Fix this by canonicalizing only paths that are already absolute. Closes: #16240
* | | | | CMake Nightly Date StampKitware Robot2016-08-151-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-08-141-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-08-131-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2016-08-121-1/+1
| |_|/ |/| |
* | | Merge topic 'cmCryptoHash-raw-digest'Brad King2016-08-112-36/+117
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 3a5f609c cmCryptoHash: New ByteHash methods that return a byte vector f582dba6 cmCryptoHash: Return byte vector from internal Finalize method 74f0d4ab cmCryptoHash: New byte hash to string function 94c29976 cmCryptoHash: Documentation comments
| * | cmCryptoHash: New ByteHash methods that return a byte vectorSebastian Holtermann2016-08-102-26/+55
| | |
| * | cmCryptoHash: Return byte vector from internal Finalize methodSebastian Holtermann2016-08-102-13/+13
| | | | | | | | | | | | | | | | | | Some callers may want the raw byte vector instead of the hex character string. Convert the internal implementation to use this so that we can later add public APIs to get it.
| * | cmCryptoHash: New byte hash to string functionSebastian Holtermann2016-08-102-0/+38
| | |
| * | cmCryptoHash: Documentation commentsSebastian Holtermann2016-08-101-0/+14
| | |
* | | CMake Nightly Date StampKitware Robot2016-08-111-1/+1
| | |
* | | Merge topic '15687-xcode-support-system-include'Brad King2016-08-104-19/+49
|\ \ \ | | | | | | | | | | | | | | | | 93ac2a78 Xcode: Obey SYSTEM keyword for includes (#15687)
| * | | Xcode: Obey SYSTEM keyword for includes (#15687)Gregor Jasny2016-08-094-19/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake used to put all header search paths into HEADER_SEARCH_PATHS attribute. Unfortunately this attribute does not support to declare a search path as a system include. As a hack one could add a -isystem /path to the cflags but then include ordering is not deterministic. A better approach was chosen with this patch by not filling HEADER_SEARCH_PATHS at all and to populate the C, C++, and Fortran flags directly. The include paths used by Xcode should be now identical to the ones used by Unix Makefiles and Ninja generator.
* | | | Merge topic 'fix-test-macOS-case-sensitive'Brad King2016-08-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 677e73cb Tests: Fix RunCMake.Framework on case sensitive file systems.
| * | | | Tests: Fix RunCMake.Framework on case sensitive file systems.Chaoren Lin2016-08-091-1/+1
| |/ / / | | | | | | | | | | | | The file is lowercase: Tests/RunCMake/Framework/osx.cmake
* | | | Merge topic 'ninja-directory-targets'Brad King2016-08-1010-29/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 02789894 Ninja: Add `$subdir/{test,install,package}` targets a88c99f1 Ninja: Simplify computation of GLOBAL_TARGET outputs
| * | | | Ninja: Add `$subdir/{test,install,package}` targetsBrad King2016-08-0910-23/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the Makefile generator one can use `cd $subdir; make install` to build and install targets associated with a given subdirectory. This is not possible to do with the Ninja generator since there is only one `build.ninja` file at the top of the build tree. However, we can approximate it by allowing one to run `ninja $subdir/install` at the top of the tree to build the targets in the corresponding subdirectory and install them. This also makes sense for `test`, `package`, and other GLOBAL_TARGET targets. It was already done for `all` by commit v3.6.0-rc1~240^2~2 (Ninja: Add `$subdir/all` targets, 2016-03-11).
| * | | | Ninja: Simplify computation of GLOBAL_TARGET outputsBrad King2016-08-091-6/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmGlobalNinjaGenerator::AppendTargetOutputs we previously handled GLOBAL_TARGET outputs specially in order to avoid adding directory components to the output. However, this is not necessary because cmNinjaTargetGenerator::New already filters out copies of these targets that are not at the top level. Instead we can simply follow the same output computation code path as UTILITY targets.
* | | | Merge topic 'NAG-Fortran-no-fPIE'Brad King2016-08-101-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e9c98426 NAG: Use -PIC for Fortran position-independent executable code
| * | | | NAG: Use -PIC for Fortran position-independent executable codeNeil Carlson2016-08-091-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Numerical Algorithms Group (NAG) Fortran compiler documents -PIC for position-independent code and does not have a separate option for PIE. We added `-PIC` for PIC in commit v2.8.11~174^2 (NAG: Use -PIC for Fortran position-independent code, 2013-02-18). Follow up for PIE. Closes: #16236
* | | | Merge topic 'install-export-staging-dir'Brad King2016-08-102-2/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c7a319ab install(EXPORT): Fix support for mid-length install destinations on Windows
| * | | | install(EXPORT): Fix support for mid-length install destinations on WindowsBrad King2016-08-092-2/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of `install(EXPORT)` generates files into a staging directory for later installation. We use the full install destination in the path to the staging directory to avoid collisions. In order to avoid exceeding maximum path lengths (especially on Windows) we compute a hash of the install destination when it is too long. Fix this logic to account for the length of the file name(s) when deciding whether to switch to the hashed name. Reported-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
* | | | Merge topic 'add-extra-boolean-comparisons'Brad King2016-08-1018-79/+693
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 02d177c9 Add additional <= and >= comparison operators
| * | | | Add additional <= and >= comparison operatorsChuck Atkins2016-08-0918-79/+693
| | | | | | | | | | | | | | | | | | | | | | | | | This adds the LESS_EQUAL, GREATER_EQUAL, and associated STR and VERSION equivalents to use the combined <= and >= functionality.
* | | | | CMake Nightly Date StampKitware Robot2016-08-101-1/+1
| |/ / / |/| | |
* | | | Merge topic 'fix-string-append'Brad King2016-08-098-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 551b4c90 Revert the use of string(APPEND) in .cmake.in files 3a7be4f3 prefer list(APPEND) over string(APPEND) where appropriate
| * | | | Revert the use of string(APPEND) in .cmake.in filesDaniel Pfeifer2016-08-083-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The generated files may be consumed by older cmake versions which do not support string(APPEND).
| * | | | prefer list(APPEND) over string(APPEND) where appropriateDaniel Pfeifer2016-08-085-8/+8
| | |/ / | |/| |
* | | | Merge topic 'GetPrerequisites-grep-a'Brad King2016-08-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5f3c8f6a GetPrerequisites: Always filter objdump output as text
| * | | | GetPrerequisites: Always filter objdump output as textAlexander Shishenko2016-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `grep` to filter the output, add the `-a` flag to tell it never to treat the output as binary. Otherwise when LANG != C in the environment the non-ascii text may break the filter.
* | | | | Merge topic 'ninja-full-path'Brad King2016-08-091-3/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | 955c2a63 Ninja: Use full path for all source files
| * | | | Ninja: Use full path for all source filesChaoren Lin2016-08-081-3/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | This is consistent with the behavior of the Makefile generators. Relative paths are difficult for an IDE to parse the output of a build error.