summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* UseJava: use CMAKE_COMMAND instead of direct cmake callBrad King2016-04-061-1/+1
| | | | Author: dancing-leaves <dancing-leaves@users.noreply.github.com>
* Merge topic 'fortran-line-directives-no-dirs'Brad King2016-04-061-1/+1
|\ | | | | | | | | f831d752 cmFortranParser: Skip #line directives that do not name files
| * cmFortranParser: Skip #line directives that do not name filesBrad King2016-04-051-1/+1
| | | | | | | | | | | | | | | | | | Since commit v3.5.0-rc1~241^2~1 (cmFortranParser: Parse #line directives, 2015-11-02) our Fortran dependency scanner parses `#line` directives to extract the named files. However, some compilers produce `#line` directives that name directories instead of files. Work around such cases by verifying that the extracted path names a file and not a directory.
* | Merge topic 'FindOpenSSL-names-per-dir'Brad King2016-04-061-0/+10
|\ \ | | | | | | | | | | | | b1484403 FindOpenSSL: Prefer libs early in search path regardless of name (#15887)
| * | FindOpenSSL: Prefer libs early in search path regardless of name (#15887)Hannes Mezger2016-04-051-0/+10
| | | | | | | | | | | | | | | | | | | | | Add NAMES_PER_DIR to all find_library invocations so that we consider all possible names in each search directory before moving on to the next directory. Otherwise we may not find self-built libraries first even if they appear early in the search path.
* | | Merge topic 'mingw-w64-Fortran-platform'Brad King2016-04-061-6/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | 8c4f100a Fortran: Fix platform id detection on mingw-w64 66fa6143 CMakeDetermineFortranCompiler: Modernize conventions
| * | | Fortran: Fix platform id detection on mingw-w64Melven Roehrig-Zoellner2016-04-051-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On mingw-w64 the GNU Fortran compiler does not define `__MINGW32__` or any similar indicator. Fix `CMAKE_Fortran_PLATFORM_ID` detection in this case by falling back to preprocessing a `.c` source file even when the compiler id is already detected.
| * | | CMakeDetermineFortranCompiler: Modernize conventionsMelven Roehrig-Zoellner2016-04-051-6/+5
| | | | | | | | | | | | | | | | Suggested-by: Ben Boeckel <ben.boeckel@kitware.com>
* | | | Merge topic 'FindGSL-doc-typo'Brad King2016-04-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2308764b FindGSL: Fix typo in documentation
| * | | | FindGSL: Fix typo in documentationPierrick Koch2016-04-051-1/+1
| | |_|/ | |/| | | | | | | | | | s/GSL_CLBAS_LIBRARY/GSL_CBLAS_LIBRARY/
* | | | Merge topic 'find-blas-lapack-Fortran-only'Brad King2016-04-062-14/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1694112d Find{BLAS,LAPACK}: Fix when used in pure Fortran projects (#16039)
| * | | | Find{BLAS,LAPACK}: Fix when used in pure Fortran projects (#16039)Melven Roehrig-Zoellner2016-04-052-14/+18
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Use `CMAKE_<LANG>_COMPILER_LOADED` to detect enabled languages because `if( _LANGUAGES_ MATCHES C )` is always true on Windows as the RC language is activated automatically and matches C.
* | | | CMake Nightly Date StampKitware Robot2016-04-061-1/+1
| |_|/ |/| |
* | | Merge branch 'release'Brad King2016-04-050-0/+0
|\ \ \
| * \ \ Merge branch 'fix-target-alias-in-subdir' into releaseBrad King2016-04-018-33/+15
| |\ \ \
* | \ \ \ Merge topic 'ctest-run-submodule-sync'Brad King2016-04-057-4/+67
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c18d91ad Help: add release notes for topic 'ctest-run-submodule-sync' 7f560743 cmCTestGIT: run `git submodule sync` before updating submodules 06b310b5 cmCTestGIT: add an option to initialize submodules on update 56c1ea40 cmCTestGIT: fix git version references
| * | | | | Help: add release notes for topic 'ctest-run-submodule-sync'Ben Boeckel2016-04-011-0/+9
| | | | | |
| * | | | | cmCTestGIT: run `git submodule sync` before updating submodulesBen Boeckel2016-04-011-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the URL of a submodule changes upstream, the commits referenced at the old URL may not be available and will cause an update failure.
| * | | | | cmCTestGIT: add an option to initialize submodules on updateBen Boeckel2016-04-016-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, CTest will not initialize any submodules within the already checked out source tree. Add an option to do so. The use case for not doing so is that some submodules may not be necessary for the current test and keeping network usage down may be important.
| * | | | | cmCTestGIT: fix git version referencesBen Boeckel2016-04-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Git does not use a 4-component version number.
* | | | | | Merge topic 'cobertura_off_by_one'Brad King2016-04-051-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 398b8800 cmParseCoberturaCoverage: Remove extra coverage line
| * | | | | | cmParseCoberturaCoverage: Remove extra coverage lineZack Galbreath2016-03-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix off-by-one error in cmParseCoberturaCoverage that added an extra blank line to the end of source file being covered.
* | | | | | | Merge topic 'ep-tls-verify-git'Brad King2016-04-052-6/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 272779ce ExternalProject: Allow TLS_VERIFY for git clones
| * | | | | | | ExternalProject: Allow TLS_VERIFY for git clonesSamir Benmendil2016-04-012-6/+22
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Use the git config `http.sslVerify=false` to disable strict ssl for git commands.
* | | | | | | Merge topic 'fix-target-alias-in-subdir'Brad King2016-04-058-33/+15
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 0e44f489 Rename local target lookup methods to clarify purpose bc30f8b5 Fix lookup of an ALIAS target outside aliased target's directory (#16044)
| * | | | | | Rename local target lookup methods to clarify purposeBrad King2016-04-017-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename methods: * `cmMakefile::Find{ => LocalNonAlias}Target` * `cmLocalGenerator::Find{ => LocalNonAlias}GeneratorTarget` These names clarify that they are for directory-local target names and do not consider alias targets.
| * | | | | | Fix lookup of an ALIAS target outside aliased target's directory (#16044)Brad King2016-04-014-27/+8
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.5.0-rc1~272^2~11 (cmTarget: Implement ALIAS in terms of name mapping, 2015-10-25) accidentally introduced logic that assumes ALIAS targets always reference targets in their own directory. Fix this and add a test case. The configure-step fix is that `cmMakefile::FindTarget` should not consider aliases. The purpose of this method is just to look up targets local to a directory. Since ALIAS and normal targets share a namespace we know a locally defined target will never collide with an ALIAS target anyway. The method has 3 call sites, and this change is safe for all of them: * `cmInstallCommand::HandleTargetsMode`: Rejects aliases before the call. * `cmFLTKWrapUICommand::FinalPass`: Should never have considered aliases. * `cmMakefile::FindTargetToUse`: Falls back to a global lookup anyway. The generate-step fix is that `cmLocalGenerator::FindGeneratorTarget` should not consider aliases. This method is the generate-step equivalent to the above. The method has 2 call sites, and this change is safe for both of them: * `cmInstallTargetGenerator::Compute`: Never uses an alias target name. * `cmLocalGenerator::FindGeneratorTargetToUse`: Falls back to global lookup. Reported-by: Matteo Settenvini <matteo@member.fsf.org>
* | | | | | CMake Nightly Date StampKitware Robot2016-04-051-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-04-041-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-04-031-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-04-021-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'cpack-rpm-external-symlink-handling'Brad King2016-04-014-7/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eae4eef0 CPack/RPM external symlink handling
| * | | | | CPack/RPM external symlink handlingDomen Vrankar2016-04-014-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbolic links that point to external location no longer cause cmake to fail with string out of bounds error but are instead packaged as non relocatable symlinks and print out a warning message.
* | | | | | Merge topic 'check-compiler-flag-clang-cl'Brad King2016-04-011-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fae80ee2 Check*CompilerFlag: Add another pattern for Clang (#16038)
| * | | | | | Check*CompilerFlag: Add another pattern for Clang (#16038)Brad King2016-03-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match a warning pattern produced by `clang-cl`. Suggested-by: Reid Kleckner <rnk@google.com>
* | | | | | | Merge topic 'add-CMAKE_EXTRA_INCLUDE_FILES-to-CMakePushCheckState'Brad King2016-04-013-11/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fad5d59c PushCheckStateTest: Update test to check CMAKE_EXTRA_INCLUDE_FILES 72a862a5 CMakePushCheckState: Add support for CMAKE_EXTRA_INCLUDE_FILES a3468b78 PushCheckStateTest: Test all variables managed by the module 85b2bb6c PushCheckStateTest: Fix syntax warning
| * | | | | | | PushCheckStateTest: Update test to check CMAKE_EXTRA_INCLUDE_FILESJean-Christophe Fillion-Robin2016-03-311-0/+5
| | | | | | | |
| * | | | | | | CMakePushCheckState: Add support for CMAKE_EXTRA_INCLUDE_FILESJean-Christophe Fillion-Robin2016-03-312-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit teaches the module to push/pop/reset state of variable CMAKE_EXTRA_INCLUDE_FILES used in CheckTypeSize module.
| * | | | | | | PushCheckStateTest: Test all variables managed by the moduleJean-Christophe Fillion-Robin2016-03-311-9/+43
| | | | | | | |
| * | | | | | | PushCheckStateTest: Fix syntax warningJean-Christophe Fillion-Robin2016-03-311-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the following warning originally introduced in 1325260 (Add macros cmake_push/pop_check_state() as discussed on the list.) Argument not separated from preceding token by whitespace.
* | | | | | | Merge topic 'eclipse-source-groups'Brad King2016-04-012-28/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4828a78c Eclipse: Implement traversal of nested source groups (#15701)
| * | | | | | | Eclipse: Implement traversal of nested source groups (#15701)Patrik Lehmann2016-03-312-28/+47
| |/ / / / / /
* | | | | | | Merge topic 'update-kwsys'Brad King2016-04-011-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 168e44e2 Merge branch 'upstream-KWSys' into update-kwsys 731ad172 KWSys 2016-03-31 (3392da1d)
| * \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-03-311-2/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-03-31 (3392da1d)
| | * | | | | | KWSys 2016-03-31 (3392da1d)KWSys Upstream2016-03-311-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 3392da1df3c363d6d1a80fa3f0e49fbd45c9dcf7 (master). Upstream Shortlog ----------------- Ben Boeckel (2): f6867bb7 SystemTools: flip junction deletion around 3392da1d SystemTools: add buffer around preproc conditions
* | | | | | | | CMake Nightly Date StampKitware Robot2016-04-011-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release'Brad King2016-03-310-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'backport-asm-includes' into releaseBrad King2016-03-315-5/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'xcode73-xctest-location' into releaseBrad King2016-03-281-0/+4
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge topic 'backport-asm-includes'Brad King2016-03-310-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | / / / / / | |_|_|/ / / / / |/| | | | | | | 677c091b ASM: Add missing <INCLUDES> placeholder for "compile" rules
generated by cgit v0.12 at 2025-02-04 18:53:16 (GMT)