summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-refactor-xml'Brad King2018-04-262-50/+71
|\ | | | | | | | | | | | | | | dfff12c808 VS: Add Elem::Content() helper and usage demo 1f29777798 cmVisualStudio10TargetGenerator: refactoring (continued) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2005
| * VS: Add Elem::Content() helper and usage demoVitaly Stakhovsky2018-04-262-18/+21
| |
| * cmVisualStudio10TargetGenerator: refactoring (continued)Vitaly Stakhovsky2018-04-242-32/+50
| |
* | Merge topic 'numeric-indent'Brad King2018-04-265-68/+68
|\ \ | | | | | | | | | | | | | | | | | | 7d407b438d cmVisualStudioGeneratorOptions: specify indentation with integer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2008
| * | cmVisualStudioGeneratorOptions: specify indentation with integerVitaly Stakhovsky2018-04-255-68/+68
| | |
* | | Merge branch 'release-3.11'Brad King2018-04-260-0/+0
|\ \ \
| * \ \ Merge branch 'backport-java-new-packaging' into release-3.11Brad King2018-04-253-23/+91
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2007
* | \ \ \ Merge topic 'java-new-packaging'Brad King2018-04-263-23/+91
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea54a9c666 Merge branch 'backport-java-new-packaging' into java-new-packaging 5482f485b8 FindJava, FindJNI, UseJava: update for version 10 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2007
| * \ \ \ \ Merge branch 'backport-java-new-packaging' into java-new-packagingBrad King2018-04-253-23/+91
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | | Fix conflicts by combining the changes from both sides.
| | * | | FindJava, FindJNI, UseJava: update for version 10 supportMarc Chevrier2018-04-253-23/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * new version format * new registry layout on Windows Fixes: #17938
* | | | | CMake Nightly Date StampKitware Robot2018-04-261-1/+1
|/ / / /
* | | | Merge branch 'release-3.11'Brad King2018-04-250-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'BLAS-no-target-in-libs' into release-3.11Brad King2018-04-242-2/+5
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2006
| * \ \ \ Merge branch 'fix-CMAKE_DISABLE_SOURCE_CHANGES-top-dir' into release-3.11Brad King2018-04-241-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2001
* | \ \ \ \ Merge topic 'BLAS-no-target-in-libs'Brad King2018-04-252-2/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d756f37cc FindBLAS: do not write an imported target name into BLAS_LIBRARIES 946846aaf5 FindPkgConfig: do not unset unused variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2006
| * | | | | FindBLAS: do not write an imported target name into BLAS_LIBRARIESRolf Eike Beer2018-04-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.11.0-rc1~177^2 (FindBLAS: optionally query pkg-config for a library, 2017-12-15) the `BLAS_LIBRARIES` result variable may incorrectly contain the name of an imported target. Instead store the list of libraries in the variable. Unfortunately pkg_check_modules does not provide a way to get this so we need to use a (temporary) hack of reading `INTERFACE_LINK_LIBRARIES` from the interface library target. Fixes: #17934
| * | | | | FindPkgConfig: do not unset unused variableRolf Eike Beer2018-04-241-1/+0
| | |_|/ / | |/| | | | | | | | | | | | | _props is never used, it was a leftover from a development step.
* | | | | Merge topic 'fix-CMAKE_DISABLE_SOURCE_CHANGES-top-dir'Brad King2018-04-251-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 60cb75e4a1 Fix CMAKE_DISABLE_SOURCE_CHANGES recognition of top of build tree Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2001
| * | | | Fix CMAKE_DISABLE_SOURCE_CHANGES recognition of top of build treeMarc Chevrier2018-04-241-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.11.0-rc1~480^2 (UseJava: add_jar OUTPUT_DIR option used only for jar generation, 2017-10-12) added code of the form `file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR})`. This exposed an existing bug in `CMAKE_DISABLE_SOURCE_CHANGES` in which it does not recognize that the top of the build tree itself is in the build tree. Fix that now. Fixes: #17933
* | | | Merge topic 'vs-dedup-custom-commands'Brad King2018-04-258-20/+87
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f59c33a763 VS: Generate a custom command only in the least dependent target d58d4daa6b cmVisualStudio10TargetGenerator: Use cmLocalVisualStudio10Generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1889
| * | | | VS: Generate a custom command only in the least dependent targetFujii Hironori2018-04-238-16/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a custom command is assigned to multiple targets, generate the build rule only in the least-dependent `.vcxproj` file. Otherwise MSBuild will run the command on the first build of a dependent target even if its dependencies already brought the command up to date (in order to populates its build log). Generate targets in least-to-most-dependent order, and assign a custom command to the least dependent target. Added cmLocalVisualStudio10Generator::GenerateTargetsDepthFirst to call cmVisualStudio10TargetGenerator::Generate in least-dependent order. Moved SourcesVisited from cmVisualStudio10TargetGenerator to cmLocalVisualStudio10Generator to avoid attaching a custom command to multiple targets among the local generator. Fixes: #16767
| * | | | cmVisualStudio10TargetGenerator: Use cmLocalVisualStudio10GeneratorFujii Hironori2018-04-172-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change the type of a member variable `LocalGenerator` from `cmLocalVisualStudio7Generator` to `cmLocalVisualStudio10Generator`.
* | | | | Merge topic 'vs-hlsl-object-name'Brad King2018-04-254-0/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d1ccbc693 VS: Add VS_SHADER_OBJECT_FILE_NAME source file property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1997
| * | | | | VS: Add VS_SHADER_OBJECT_FILE_NAME source file propertyJeremiah van Oosten2018-04-244-0/+21
| | | | | |
* | | | | | Merge topic 'testbigendian-cache-check-fix'Brad King2018-04-251-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b1c5f9f05 TestBigEndian: Include CheckTypeSize outside macro Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1999
| * | | | | | TestBigEndian: Include CheckTypeSize outside macroCristian Adam2018-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using https://github.com/cristianadam/cmake-checks-cache I have noticed that CheckTypeSize would in certain cases have an empty `__check_type_size_dir` variable. The errors would point to `TestBigEndian`. By moving `include(CheckTypeSize)` outside the macro, the errors go away. Including dependencies of a module when the module is first included is simpler and cleaner anyway.
* | | | | | | Merge topic 'file_install_always_out_of_date_fix'Brad King2018-04-251-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6dcd1bfa39 file(INSTALL): Preserve file time when writing NTFS alternate stream Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1992
| * | | | | | | file(INSTALL): Preserve file time when writing NTFS alternate streamYves Frederix2018-04-231-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cross-compiling on a Windows host, we use a `:cmake_mode_t` NTFS alternate stream to store the file mode for use during packaging. Writing to this stream changes the file modification time, so save and restore the original modification time since we are not modifying the real file content. Fixes: #17922
* | | | | | | | Merge topic 'cuda-no-cache-host-compiler'Brad King2018-04-251-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bff4651f2e CUDA: Do not create CMAKE_CUDA_HOST_COMPILER cache entry Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2003
| * | | | | | | | CUDA: Do not create CMAKE_CUDA_HOST_COMPILER cache entryBrad King2018-04-241-1/+0
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users can create it through an explicit command-line option if desired. Initializing the variable as an empty cache entry can wipe out a normal variable of the same name that may have been set by a toolchain file. Since commit v3.8.0-rc1~261^2~11 (CUDA: Use the host compiler for linking CUDA executables and shared libs, 2016-09-19) we save the value of `CMAKE_CUDA_HOST_COMPILER` persistently in the compiler information file as a normal variable. Fixes: #17935
* | | | | | | | CMake Nightly Date StampKitware Robot2018-04-251-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge topic 'doc-tidy-example'Brad King2018-04-241-2/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae09bc774b Help: Add example to CMAKE_<LANG>_CLANG_TIDY Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2002
| * | | | | | | Help: Add example to CMAKE_<LANG>_CLANG_TIDYBrad King2018-04-241-2/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #16869
* | | | | | | Merge topic 'Genex-TARGET_GENEX_PROPERTY'Brad King2018-04-2431-1/+390
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d15046edd Genex: Add $<TARGET_GENEX_EVAL:...> and $<GENEX_EVAL:...> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1984
| * | | | | | | Genex: Add $<TARGET_GENEX_EVAL:...> and $<GENEX_EVAL:...>Marc Chevrier2018-04-2331-1/+390
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Fixes: #17884
* | | | | | | Merge topic 'reorder-sys-includes'Brad King2018-04-247-1/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76ad2ecb50 Order SYSTEM include directories after non-system directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1968
| * | | | | | | Order SYSTEM include directories after non-system directoriesEphi Sinowitz2018-04-237-1/+40
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An effect of the `-isystem` flag is to search the directory after those specified via `-I` flags. Make behavior more consistent on compilers that do not have any `-isystem` flag by explicitly moving system include directories to the end.
* | | | | | | Merge topic 'FindPython-stabilization'Brad King2018-04-241-5/+74
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d02a9bacf6 FindPython: ensure correct architecture (i.e. 32/64bit) is used Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1991
| * | | | | | | FindPython: ensure correct architecture (i.e. 32/64bit) is usedMarc Chevrier2018-04-201-5/+74
| |/ / / / / /
* | | | | | | Merge topic 'CUDA7'Brad King2018-04-242-3/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fb2812d5b CUDA: Add compiler detection for CUDA < 7.5 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1993
| * | | | | | | CUDA: Add compiler detection for CUDA < 7.5Henry Schreiner2018-04-232-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the CUDA version macros are not defined, run `nvcc --version` and extract the version from its output. Fixes: #17920
* | | | | | | | Merge topic 'cpack-doc-defaults'Brad King2018-04-241-1/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30c8c9f55d CPack: Add CPACK_PACKAGE_HOMEPAGE_URL setting c9fa8f9442 CPack: Fix documented CPACK_PACKAGE_DESCRIPTION_SUMMARY default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1998
| * | | | | | | | CPack: Add CPACK_PACKAGE_HOMEPAGE_URL settingAlex Turbov2018-04-231-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize it from `CMAKE_PROJECT_HOMEPAGE_URL`.
| * | | | | | | | CPack: Fix documented CPACK_PACKAGE_DESCRIPTION_SUMMARY defaultAlex Turbov2018-04-231-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'FindMatlab/mcr-compatibility'Brad King2018-04-2410-280/+523
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59fb9e89b2 FindMatlab: Matlab Runtime Compiler support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1970
| * | | | | | | | FindMatlab: Matlab Runtime Compiler supportRaffi Enficiaud2018-04-2310-280/+523
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Determining automatically the MCR version on OSX and Windows * Distinguishing between MCR and Matlab * Specific tests for the MCR * mexext on windows does not work properly: the mexext is hardcoded * Doc updates for the MCR Fixes: #16487
* | | | | | | | CMake Nightly Date StampKitware Robot2018-04-241-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'fortran-submodule-depends'Brad King2018-04-2315-90/+207
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1f95e5b14 Fortran: Extend submodule test with great-grandchild 402735314e Fortran: Add support for submodule dependencies 62538b2c4c Fortran: Refactor to treat .mod extension as part of module name Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Izaak Beekman <contact@izaakbeekman.com> Merge-request: !1989
| * | | | | | | Fortran: Extend submodule test with great-grandchildBrad King2018-04-205-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Name the module using CamelCase to test lower-case file name conversion. Also add coverage of existing "sibling" module.
| * | | | | | | Fortran: Add support for submodule dependenciesBrad King2018-04-2012-64/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.7.0-rc1~73^2~1 (Fortran: Add support for submodule syntax in dependency scanning, 2016-09-05) we support parsing Fortran sources that use submodule syntax, but it left addition of `.smod` dependencies to future work. Add it now. The syntax submodule (module_name) submodule_name means the current source requires `module_name.mod` and provides `module_name@submodule_name.smod`. The syntax submodule (module_name:submodule_name) nested_submodule_name means the current source requires `module_name@submodule_name.smod` provides `module_name@nested_submodule_name.smod`. Fixes: #17017
generated by cgit v0.12 at 2025-09-09 08:34:59 (GMT)