summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'revert-automoc-src-per-dir'Brad King2016-02-246-59/+4
|\ | | | | | | | | 091b649e Revert "Automoc: Fix support of files with the same name (#12873)"
| * Revert "Automoc: Fix support of files with the same name (#12873)"Brad King2016-02-196-59/+4
| | | | | | | | | | | | | | | | | | | | This reverts commit 9beb2744d7685fca9cd5717308d4457dffdefcdc. Our AUTOMOC documentation states that it should be possible to `#include "moc_foo.cpp"` in `foo.cpp`, and this will not work if the file is placed in a different directory. Another solution will need to be found to the original problem. Reported-by: Stephen Kelly <steveire@gmail.com>
* | CMake Nightly Date StampKitware Robot2016-02-241-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-02-231-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-02-221-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-02-211-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-02-201-1/+1
| |
* | Merge topic 'cpack-deb-autodep-ORIGIN-RPATH'Brad King2016-02-192-0/+12
|\ \ | | | | | | | | | | | | | | | e8daee5b CPack/Deb $ORIGIN handling in rpath b8263a2f CPack/Deb Create DEBIAN directory for dpkg-shlibdeps
| * | CPack/Deb $ORIGIN handling in rpathDomen Vrankar2016-02-191-0/+6
| | | | | | | | | | | | Release not for fix of bug 12431
| * | CPack/Deb Create DEBIAN directory for dpkg-shlibdepsFlorian Apolloner and John Knottenbelt2016-02-191-0/+6
| | | | | | | | | | | | | | | | | | | | | If CMAKE_INSTALL_RPATH is set and contains $ORIGIN then dpkg-shlibdeps searches for the DEBIAN directory in order to resolve $ORIGIN in the rpath to a directory. We need to create the DEBIAN directory for this to work.
* | | Merge topic 'reduce-entropy-consumption'Brad King2016-02-191-4/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | f23f18ab cmSystemTools: Avoid excess entropy consumption by RandomSeed (#15976) b13a74b3 cmSystemTools: Remove unused include <fcntl.h>
| * | | cmSystemTools: Avoid excess entropy consumption by RandomSeed (#15976)Cristian Rodríguez2016-02-191-2/+4
| | | | | | | | | | | | | | | | Read `/dev/urandom` without buffering to avoid taking more than we need.
| * | | cmSystemTools: Remove unused include <fcntl.h>Brad King2016-02-191-2/+1
| | | | | | | | | | | | | | | | | | | | We do not seem to need this header anymore, and including it on AIX causes `#define open open64` which breaks `std::ifstream::open` calls.
* | | | Merge topic 'unix-timestamps'Brad King2016-02-196-9/+101
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6727270b CMake: Extend TIMESTAMP sub-commands with new unix time format specifier
| * | | | CMake: Extend TIMESTAMP sub-commands with new unix time format specifierJose-Luis Blanco-Claraco2016-02-186-9/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new `%s` format specifier is substituted by file()/string() `TIMESTAMP` sub-commands with the number of seconds since unix-epoch (1970-01-01 00:00:00 UTC). Co-Author: Nils Gladitz <nilsgladitz@gmail.com>
* | | | | Merge topic 'fix-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory'Brad King2016-02-191-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 26fdd9c3 CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option
| * | | | | CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) optionDaniel Wirtz2016-02-181-2/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-02-191-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'release'Brad King2016-02-180-0/+0
|\ \ \ \ \
| * | | | | CMake 3.5.0-rc3v3.5.0-rc3Brad King2016-02-181-1/+1
| | | | | |
* | | | | | Merge branch 'release'Brad King2016-02-180-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'FindCUDA-verbatim' into releaseBrad King2016-02-171-3/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-static-private-non-target-depends' into releaseBrad King2016-02-177-5/+40
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-doc-install-component-association' into releaseBrad King2016-02-171-7/+12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'de-deprecate-CMakeForceCompiler' into releaseBrad King2016-02-172-10/+9
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'doc-install-component-association'Brad King2016-02-181-7/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7c6b710 Merge branch 'backport-doc-install-component-association' into doc-install-component-association c978223c Help: Clarify install(TARGETS) INCLUDES DESTINATION option 70f2708f Help: Clarify install(TARGETS) INCLUDES DESTINATION option
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-doc-install-component-association' into ↵Brad King2016-02-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | doc-install-component-association
| | * | | | | | | | | Help: Clarify install(TARGETS) INCLUDES DESTINATION optionBrad King2016-02-171-7/+12
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option does not actually participate in argument groups like the others because it does not actually install anything. Fix the order in the documentation accordingly. Reported-by: Daniel Wirtz <daniel.wirtz@simtech.uni-stuttgart.de>
| * | | | | | | | | Help: Clarify install(TARGETS) INCLUDES DESTINATION optionBrad King2016-02-171-7/+12
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option does not actually participate in argument groups like the others because it does not actually install anything. Fix the order in the documentation accordingly. Reported-by: Daniel Wirtz <daniel.wirtz@simtech.uni-stuttgart.de>
* | | | | | | | | Merge topic 'de-deprecate-CMakeForceCompiler'Brad King2016-02-182-10/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | beaa4fa5 CMakeForceCompiler: De-deprecate until more use cases have alternatives
| * | | | | | | | CMakeForceCompiler: De-deprecate until more use cases have alternativesBrad King2016-02-172-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We deprecated this module in commit v3.5.0-rc1~295^2 (CMakeForceCompiler: Deprecate this module and its macros, 2015-10-19) in order to determine whether anyone still has use cases that require it. Indeed we still need to provide a way to work with toolchains that cannot link binaries without special flags. Remove the deprecation warnings until we can provide an alternative to the module for this use case.
* | | | | | | | | Merge topic 'fix-static-private-non-target-depends'Brad King2016-02-187-5/+40
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 87f44b75 Fix export of STATIC library PRIVATE non-target dependencies
| * | | | | | | | Fix export of STATIC library PRIVATE non-target dependenciesBrad King2016-02-177-5/+40
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~43^2 (Fix export of STATIC library PRIVATE dependencies with CMP0022 NEW, 2016-01-15) we taught target_link_libraries to generate `$<LINK_ONLY:$<TARGET_NAME:dep>>` in INTERFACE_LINK_LIBRARIES instead of `$<LINK_ONLY:dep>` so that `dep` can be recognized as a target name and updated during export. However, this approach does not work when `dep` is just a plain library name and not a target because `$<TARGET_NAME:...>` requires the name of a reachable target. Since we do not know during target_link_libraries whether the name will correspond to a reachable target or not, we cannot inject the `$<TARGET_NAME:...>` expression. Revert this change and solve the original problem instead by teaching the export logic to recognize and update target names directly in `$<LINK_ONLY:...>` expressions. Reported-by: Ben Boeckel <ben.boeckel@kitware.com>
* | | | | | | | Merge topic 'FindCUDA-verbatim'Brad King2016-02-181-3/+13
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | 1911cda0 FindCUDA: Fix regression under Visual Studio generators
| * | | | | | | FindCUDA: Fix regression under Visual Studio generatorsBrad King2016-02-171-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.5.0-rc1~47^2 (FindCUDA: Support special characters in path, 2016-01-15) our add_custom_command calls use VERBATIM so that CMake will automatically quote special characters correctly. However, this breaks the special `$(VCInstallDir)` placeholder used with Visual Studio generators. Since we do not support preservation of such placeholders with VERBATIM (see issue #15001) we must fall back to not using VERBATIM when the placeholder is used. A better fix would be to stop using `$(VCInstallDir)` and use the value of `CMAKE_${CUDA_C_OR_CXX}_COMPILER` instead, but that will require additional semantic and documentation changes. For now simply fix the regression with the above approach. Reported-by: Stephen Sorley <Stephen.Sorley@jhuapl.edu>
* | | | | | | | Merge topic 'automoc-src-per-dir'Brad King2016-02-186-4/+59
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | 9beb2744 Automoc: Fix support of files with the same name (#12873)
| * | | | | | Automoc: Fix support of files with the same name (#12873)Mariusz Pluciński2016-02-166-4/+59
| | |_|_|/ / | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-02-181-1/+1
| | | | | |
* | | | | | Merge topic 'FindwxWidgets-msys2-paths'Brad King2016-02-171-0/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf643286 FindwxWidgets: Resolve Cygwin/MSYS paths to Windows paths
| * | | | | | FindwxWidgets: Resolve Cygwin/MSYS paths to Windows pathsWayne Stambaugh2016-02-171-0/+30
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use `sh wx-config` to launch the `wx-config` tool so that it can run even on Windows. Since it is always a shell script its output may use POSIX paths even on Windows. Use `cygpath` to convert to Windows paths.
* | | | | | Merge topic 'FindProtobuf-version'Brad King2016-02-173-2/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb7a41ab FindProtobuf: check version
| * | | | | | FindProtobuf: check versionAntonio Perez Barrero2016-02-163-2/+64
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check found libraries version to match user required version. Protobuf compiler executable version is checked to be aligned with found libraries, raising a warning message otherwise.
* | | | | | Merge topic 'CodeBlocks-more-compilers'Brad King2016-02-171-6/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 184da3f4 CodeBlocks: improve support for different compilers
| * | | | | | CodeBlocks: improve support for different compilersMelven Roehrig-Zoellner2016-02-161-6/+55
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More elaborate selection of the `compiler` tag in the generated CodeBlocks project file: * Fortran language support * support for several of the predefined compilers recognized by CodeBlocks (16.01)
* | | | | | CMake Nightly Date StampKitware Robot2016-02-171-1/+1
|/ / / / /
* | | | | Merge branch 'release'Brad King2016-02-160-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'fix-cmake_parse_arguments-expansion' into releaseBrad King2016-02-122-2/+29
| |\ \ \ \
| * \ \ \ \ Merge branch 'cmake-gui-reset-generator' into releaseBrad King2016-02-121-0/+7
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'doc-xcode-escaping-fix' into releaseBrad King2016-02-111-0/+6
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'cmake-gui-reset-generator'Brad King2016-02-161-0/+7
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | da490e11 cmake-gui: Fix cmState initialization when changing generators (#15959)
generated by cgit v0.12 at 2024-11-13 22:14:34 (GMT)