summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmSourceFile: Add IsGenerated methodSebastian Holtermann2019-02-012-4/+17
| | | | | | | All cmSourceFiles are checked at least once whether they're `GENERATED` or not. This adds a convenience method `GetIsGenerated` that returns a private boolean cache variable `IsGenerated`. `IsGenerated` is updated every time the `GENERATED` property is written.
* cmSourceFile: Additional static property stringsSebastian Holtermann2019-02-012-3/+7
|
* Merge branch 'release-3.13'Brad King2019-02-010-0/+0
|\
| * CMake 3.13.4v3.13.4Brad King2019-02-011-1/+1
| |
* | Merge branch 'release-3.13'Brad King2019-02-010-0/+0
|\ \ | |/
| * Merge branch 'backport-FindLAPACK-typo' into release-3.13Brad King2019-01-311-2/+2
| |\ | | | | | | | | | Merge-request: !2897
| * \ Merge branch 'backport-autogen-qt-version-from-dirprops' into release-3.13Brad King2019-01-307-1/+84
| |\ \ | | | | | | | | | | | | Merge-request: !2883
| * \ \ Merge branch 'backport-restore-install-late-framework' into release-3.13Brad King2019-01-293-2/+30
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2878
* | \ \ \ Merge topic 'implicit-incs-cleanup'Brad King2019-02-0138-179/+409
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1293ed8507 ParseImplicitIncludeInfo: keep implicit incl. consistent when rerunning cmake eaf53158f4 CrayPrgEnv/ParseImplicitIncludes: simplify for new implict include parser ef8f237686 ParseImplicitIncludeInfo: add SunPro Fortran and PGI compiler, Cray fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2894
| * | | | | ParseImplicitIncludeInfo: keep implicit incl. consistent when rerunning cmakeChuck Cranor2019-01-302-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first time you run cmake, it sets the implicit include path to the value reported by the parser (and this value gets saved in CMake${lang}Compiler.cmake). But if you re-run cmake, UnixPaths.cmake blindly appends an extra /usr/include to the value saved in CMake${lang}Compiler.cmake. That should not be harmful in most cases, but we want later runs of cmake to be consistent with the initial one. Resolve using a solution suggested by Brad King: - UnixPaths now sets the default implicit include path in a new variable named _CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES_INIT This value is only used the first time cmake is run (by CMakeDetermineCompilerABI.cmake when it calls the implicit include parser). - if CMakeDetermineCompilerABI.cmake successfully calls the implicit include parser, it overwrites the value in _CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES_INIT with the value returned by the parser - CMakeDetermineCompilerABI.cmake always sets CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES to the above value of _CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES_INIT - the final value of CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES gets saved to CMake${lang}Compiler.cmake when it is regenerated after the compiler tests are done. - CMakeDetermineCompilerABI.cmake is only executed the first time cmake is run. Additional runs of cmake directly load the implicit include path from the value saved in CMake${lang}Compiler.cmake (the parser and _INIT variable are not used). The above depends on UnixPaths.cmake being loaded to set the _INIT value before CMakeDetermineCompilerABI.cmake runs the implicit include parser.
| * | | | | CrayPrgEnv/ParseImplicitIncludes: simplify for new implict include parserChuck Cranor2019-01-2916-155/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove now redundant implicit parser code from CrayPrgEnv.cmake, as this function is now supported in the general cmake code (e.g. Modules/CMakeParseImplicit{Include,Link}Info.cmake). This simplifies __CrayPrgEnv_setup() to take only one arg (${lang}) and allows us to remove a level of inclusion as CrayPrgEnv-${lang}.cmake is now compiler independent we do not need the CrayPrgEnv-${compiler}-${lang} files any more.
| * | | | | ParseImplicitIncludeInfo: add SunPro Fortran and PGI compiler, Cray fixChuck Cranor2019-01-2920-17/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add implicit include parser for PGI compiler ID. PGI verbose output for CXX differs from C and Fortran, so CXX is broken out into its own case. The C and Fortran compilers take "-YI,path" and "-Mnostdinc" to change or disable the builtin include path. The last arg on the command line appears to override previous args (e.g. "-YI,path1 -YI,path2" will set the path to "path2" ... the previous "-YI,path1" gets undone). The CXX compiler verbose output reports with "-I" rather than "-stdinc" for the built in path. In addition with CXX "-Mnostdinc" does not completely zero the include path (e.g. "#include <stdio.h>" still works with "-Mnostdinc"... "-I/usr/include" still shows up in the verbose output). Minor adjustments to get the SunPro parser to handle Fortran as well. Fixes for Cray compiler support (Modules/Compiler/Cray-{C,CXX}.cmake): The *_COMPILE_OPTION flags contain options like "-h c99,gnu" ... these options need to be in double quotes (they are currently not). Otherwise, cmake treats them as lists and tries to run the compiler with "-h;c99,gnu" and fails when it is "Detecting C compile features"... Also, the Cray-CXX.cmake contains "__compiler_cray(C)" instead of "__compiler_cray(CXX)" -- this error prevents the correct VERBOSE flags for CXX from being defined which prevents the implicit include parser from running. Add additional test cases for PGI and SunPro Fortran to the Tests/RunCMake/ParseImplicitIncludeInfo area.
* | | | | | Merge topic 'document-list'Brad King2019-02-012-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f45d8b2f23 Help: improve details on `CMAKE_LANG_CREATE_SHARED_*` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2899
| * | | | | | Help: improve details on `CMAKE_LANG_CREATE_SHARED_*`Saleem Abdulrasool2019-01-312-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note that the `CMAKE_<LANG>_CREATE_SHARED_*` rule variables are semicolon delimited lists that can run multiple commands.
* | | | | | | Merge topic 'server-normalize-paths'Brad King2019-02-011-2/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c6c2bae28 cmake-server: Normalize build and source directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2898
| * | | | | | | cmake-server: Normalize build and source directoriesGregor Jasny2019-01-311-2/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #18862
* | | | | | | CMake Nightly Date StampKitware Robot2019-02-011-1/+1
|/ / / / / /
* | | | | | Merge topic 'ninja-intel-depfile'Brad King2019-01-315-6/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a624a3e1b3 Ninja: Use deps=gcc for Intel Compiler on Windows f4f3b6b9af Ninja: Detect when ninja is new enough to support a multi-line depfile 699cd03212 Ninja: Drop unnecessary deptype customization infrastructure Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2893
| * | | | | | Ninja: Use deps=gcc for Intel Compiler on WindowsBrad King2019-01-303-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja 1.9 supports the depfile format generated by this compiler. Use `deps = gcc` when the version of Ninja is new enough. Unfortunately the Intel Compiler for Windows does not properly escape spaces in paths written to a depfile so if there is a space in the path we must still fall back to `deps = msvc`. Fixes: #18855
| * | | | | | Ninja: Detect when ninja is new enough to support a multi-line depfileBrad King2019-01-302-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja 1.9 supports the multi-line depfile format generated by the Intel Compiler for Windows. Teach the global generator to detect when the version is new enough to support this.
| * | | | | | Ninja: Drop unnecessary deptype customization infrastructureBrad King2019-01-301-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not pass `CMAKE_NINJA_DEPTYPE_<LANG>` in place of `deps = gcc`. If Ninja ever introduces a new dependency type we will likely need to update CMake for it anyway.
* | | | | | | Merge topic 'install-strip-macos'Brad King2019-01-311-1/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20291e8e72 install: Fix stripping on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2892
| * | | | | | | install: Fix stripping on macOSHarry Mallon2019-01-301-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On macOS the `strip` tool requires special arguments depending on the type of binary to be stripped. Fixes: #11367 Fixes: #16499
* | | | | | | | Merge topic 'xcode-object-dir'Brad King2019-01-313-15/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a7f93d000 Xcode: Fix object library builds with sanitizers enabled eff9c69740 Xcode: Place object library artifacts outside Objects-normal directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2885
| * | | | | | | | Xcode: Fix object library builds with sanitizers enabledBrad King2019-01-302-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `xcodebuild -enableAddressSanitizer YES ...` causes object files to be placed in a different directory name. Xcode provides a placeholder for this that we can use in `OTHER_LDFLAGS` to reference object files for linking the dependents of object libraries. However, CMake's features for installing and exporting object libraries depend on knowing the real path with no placeholders. For these cases, use the default object directory. Users will then have to choose between sanitizers and the installation and export features, but both will work individually. Fixes: #16289
| * | | | | | | | Xcode: Place object library artifacts outside Objects-normal directoryBrad King2019-01-302-15/+18
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CONFIGURATION_BUILD_DIR` value in the Xcode project file specifies where to place the library artifact. For object libraries we've used the `Objects-normal` directory to hide away the `.a` that we otherwise cannot stop Xcode from producing. The parent of this directory is also specific to the target and does not vary with Xcode's sanitizer features, so move the artifact there. Issue: #16289
* | | | | | | | Merge topic 'set-validate-cache-type'Brad King2019-01-316-3/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 198650ae73 set: warn if CACHE type is not recognized Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2874
| * | | | | | | | set: warn if CACHE type is not recognizedTaylor Holberton2019-01-306-3/+30
| | | | | | | | |
* | | | | | | | | Merge topic 'xerces-xalan-header-checking'Brad King2019-01-312-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c68465f790 FindXercesC, FindXalanC: Don't examine non-existent version headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2884
| * | | | | | | | | FindXercesC, FindXalanC: Don't examine non-existent version headersRoger Leigh2019-01-302-2/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'autogen-std-bind-to-lambdas'Brad King2019-01-312-6/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6fbd438c4 Autogen: Refactor std::bind calls to lambdas Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2766
| * | | | | | | | | Autogen: Refactor std::bind calls to lambdasArtur Ryt2019-01-292-6/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'tidy-use-equals-default-fix'Brad King2019-01-312-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f9822ff6d clang-tidy: Silence use-equals-default warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2887
| * | | | | | | | | clang-tidy: Silence use-equals-default warningRegina Pfeifer2019-01-302-1/+3
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clang-tidy 7 has an option to suppress this warning in macros which defaults to '1'. Set the option to '0' and silence the warning explicitly.
* | | | | | | | | Merge topic 'std-string-callback'Brad King2019-01-315-16/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1180fc8780 OutputCallback: Accept std::string argument Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: vvs31415 <vstakhovsky@fastmail.com> Merge-request: !2891
| * | | | | | | | | OutputCallback: Accept std::string argumentRegina Pfeifer2019-01-305-16/+13
| |/ / / / / / / /
* | | | | | | | | Merge topic 'update-kwsys'Brad King2019-01-313-10/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a37614667d Configure KWSys to honor CMake_NO_CXX_STANDARD e3b26f0004 Merge branch 'upstream-KWSys' into update-kwsys c22e373a30 KWSys 2019-01-30 (ce89cada) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2886
| * | | | | | | | | Configure KWSys to honor CMake_NO_CXX_STANDARDBrad King2019-01-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KWSys now computes a default `CMAKE_CXX_STANDARD` value if it is not told what standard to use. When `CMake_NO_CXX_STANDARD` is enabled, tell KWSys not to do that.
| * | | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-01-302-10/+20
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-01-30 (ce89cada)
| | * | | | | | | | KWSys 2019-01-30 (ce89cada)KWSys Upstream2019-01-302-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit ce89cada1c48be31e6294a984b15c2c75b66eab0 (master). Upstream Shortlog ----------------- Brad King (2): 5d92e8d9 Require CMake 3.1 or higher for KWSys 6db3c607 Require C++11 or higher to compile KWSys
* | | | | | | | | | Merge topic 'variables1'Brad King2019-01-312-10/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d20fe014f Help: moved 7 variables to "internal" section dfb2d6178e Help: "internal variables" instead of "obsolete", with some explanatory prose 9c4cdc43f6 Help: declare CMAKE_HOME_DIRECTORY obsolete Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2881
| * | | | | | | | | | Help: moved 7 variables to "internal" sectionJoachim Wuttke (o)2019-01-301-7/+7
| | | | | | | | | | |
| * | | | | | | | | | Help: "internal variables" instead of "obsolete", with some explanatory proseJoachim Wuttke (o)2019-01-301-1/+6
| | | | | | | | | | |
| * | | | | | | | | | Help: declare CMAKE_HOME_DIRECTORY obsoleteJoachim Wuttke (o)2019-01-302-3/+13
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'msys_docs'Brad King2019-01-312-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec027aa64a Help: Add documentation for MSYS variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2882
| * | | | | | | | | | | Help: Add documentation for MSYS variableHarry Mallon2019-01-302-0/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'lapack-docs'Brad King2019-01-312-82/+123
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be7b30f67e Find{BLAS,LAPACK}: Add note and example for using Intel MKL b323407235 Find{BLAS,LAPACK}: Update docs to use modern conventions ba30b94435 FindLAPACK: Remove extra indentation from a line Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2880
| * | | | | | | | | | | | Find{BLAS,LAPACK}: Add note and example for using Intel MKLMichael Hirsch, Ph.D2019-01-302-0/+22
| | | | | | | | | | | | |
| * | | | | | | | | | | | Find{BLAS,LAPACK}: Update docs to use modern conventionsMichael Hirsch, Ph.D2019-01-302-85/+104
| | | | | | | | | | | | |
| * | | | | | | | | | | | FindLAPACK: Remove extra indentation from a lineMichael Hirsch, Ph.D2019-01-301-1/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
generated by cgit v0.12 at 2025-02-01 10:40:08 (GMT)