summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-cleanups'Brad King2016-10-101-6/+3
|\ | | | | | | | | | | | | cc5e6b82 Ninja: Extract identical code from condition d9fde87d Ninja: Replace array access with local variable d92c160d Ninja: Separate two coupled calls
| * Ninja: Extract identical code from conditionStephen Kelly2016-10-081-3/+1
| |
| * Ninja: Replace array access with local variableStephen Kelly2016-10-071-4/+4
| |
| * Ninja: Separate two coupled callsStephen Kelly2016-10-071-4/+3
| |
* | Merge topic 'minor-cleanups'Brad King2016-10-108-44/+39
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c637e0c5 cmMakefile: Return a string from GetDefineFlags fbc1b75c Test: Remove condition for CMake version no longer supported 3d0e95f6 cmLocalGenerator: Extract definition retrieval out of loop 2a49d86d Makefiles: Inline only use of method b0301db2 Makefiles: Make helper class independent of cmLocalGenerator 267e0209 cmMakefile: Remove pointless condition 009019f2 Makefiles: Extract identical code from condition 378849f4 Makefiles: Replace array access with local variable 4a3c49b4 Makefiles: Separate two coupled calls
| * | cmMakefile: Return a string from GetDefineFlagsStephen Kelly2016-10-102-2/+2
| | | | | | | | | | | | Flip condition in GHS for readability.
| * | Test: Remove condition for CMake version no longer supportedStephen Kelly2016-10-101-10/+3
| | |
| * | cmLocalGenerator: Extract definition retrieval out of loopStephen Kelly2016-10-101-2/+3
| | |
| * | Makefiles: Inline only use of methodStephen Kelly2016-10-092-9/+3
| | |
| * | Makefiles: Make helper class independent of cmLocalGeneratorStephen Kelly2016-10-091-9/+21
| | | | | | | | | | | | It only needs output conversion.
| * | cmMakefile: Remove pointless conditionStephen Kelly2016-10-091-4/+2
| | | | | | | | | | | | This method is never called with an empty string.
| * | Makefiles: Extract identical code from conditionStephen Kelly2016-10-091-5/+2
| | |
| * | Makefiles: Replace array access with local variableStephen Kelly2016-10-091-5/+6
| | |
| * | Makefiles: Separate two coupled callsStephen Kelly2016-10-091-4/+3
| | |
* | | Merge topic 'cmake-cleanup'Brad King2016-10-102-212/+216
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 326d5fa7 Allow custom built libarchive to use custom built expat. 7d45db99 Don't require liblzma when using system libarchive a28b8f95 Don't require libbz2 when using system libarchive 66c6144c CMakeCPack: remove obsolete conditions
| * | | Allow custom built libarchive to use custom built expat.Daniel Pfeifer2016-10-091-18/+20
| | | | | | | | | | | | | | | | Expat is built anyway.
| * | | Don't require liblzma when using system libarchiveDaniel Pfeifer2016-10-091-12/+14
| | | |
| * | | Don't require libbz2 when using system libarchiveDaniel Pfeifer2016-10-091-8/+13
| | | |
| * | | CMakeCPack: remove obsolete conditionsDaniel Pfeifer2016-10-091-175/+170
| | |/ | |/| | | | | | | | | | | | | The file contains some conditions depending on the existence of CMake modules. This basically checks for CMake versions that are no longer supported. Remove the conditions.
* | | Merge topic 'test-cpack-improve-failure-messages'Brad King2016-10-101-2/+4
|\ \ \ | | | | | | | | | | | | | | | | 7f90d5e5 Tests: Improve RunCMake.CPack_* failure message formatting
| * | | Tests: Improve RunCMake.CPack_* failure message formattingBrad King2016-10-071-2/+4
| |/ / | | | | | | | | | | | | | | | Format a `message(FATAL_ERROR)` call with markup to make the generated message more readable so that the difference between the actual and expected results is easier to see.
* | | Merge topic 'update-kwsys'Brad King2016-10-101-11/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | c22f3cf7 Merge branch 'upstream-KWSys' into update-kwsys bf28a387 KWSys 2016-10-07 (dfe9b386)
| * \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-10-081-11/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-10-07 (dfe9b386)
| | * | | KWSys 2016-10-07 (dfe9b386)KWSys Upstream2016-10-081-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit dfe9b38635d80cb5253187c1ddf90923e1b9effd (master). Upstream Shortlog ----------------- Brad King (1): dfe9b386 SystemTools: Re-implement Strucmp
* | | | | Merge topic 'android-export-has-cpp'Brad King2016-10-105-1/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dda6775c Android: Record use of C++ by static libs in exported Android.mk files
| * | | | | Android: Record use of C++ by static libs in exported Android.mk filesBrad King2016-10-075-1/+22
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a `PREBUILT_STATIC_LIBRARY` uses C++ in its sources then the `.a` file will have a link-time dependency on the C++ runtime libraries. Android NDK r14 will add a way to give this information to the NDK build system by adding a `LOCAL_HAS_CPP` setting to the `Android.mk` file. Add this for exported static libraries that use C++.
* | | | | Merge topic 'android-cxxabi'Brad King2016-10-103-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8cdac469 Android: Fix support for cxxabi.h with libc++
| * | | | | Android: Fix support for cxxabi.h with libc++Brad King2016-10-073-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional include directories are needed for this on some STL types. Closes: #16350
* | | | | | Merge topic 'FindProtobuf-fix-subdirs'Brad King2016-10-101-6/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b9dad69 FindProtobuf: Fix protobuf_generate_*() to handle subdirs
| * | | | | | FindProtobuf: Fix protobuf_generate_*() to handle subdirsMartin Joly2016-10-071-6/+10
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.7.0-rc1~513^2 (FindProtobuf: fix protobuf_generate_*() to handle proto files in subdirs, 2016-06-09) incorrectly adds subdirectories to the path of the generated files when `*.proto` files are passed to `protobuf_generate_*` with subdirectories. This behavior is not correct when `PROTOBUF_GENERATE_CPP_APPEND_PATH` is True (default behavior) as `protoc` will generate output file in the current build directory.
* | | | | | CMake Nightly Date StampKitware Robot2016-10-101-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-10-091-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2016-10-081-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release'Brad King2016-10-070-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'FindMatlab-fix-simulink-cache' into releaseBrad King2016-10-051-0/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'FindMatlab-documentation' into releaseBrad King2016-10-052-9/+15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-VS-resources-pri-path' into releaseBrad King2016-10-051-2/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'qtifw-https-cmake.org' into releaseBrad King2016-10-041-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'cmake-server-improve-shutdown' into releaseBrad King2016-10-043-53/+132
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'nmake-encoding'Brad King2016-10-0710-11/+326
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c666f8cb NMake: Use ANSI encoding for NMake Makefiles f00214aa cmGeneratedFileStream: Add optional encoding support bb1d3370 codecvt: Add class for encoding conversion
| * | | | | | | | | | NMake: Use ANSI encoding for NMake MakefilesDāvis Mosāns2016-10-065-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set ANSI encoding to cmGeneratedFileStream for use with NMake Makefile generator.
| * | | | | | | | | | cmGeneratedFileStream: Add optional encoding supportDāvis Mosāns2016-10-062-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to save file stream in different encoding than internal encoding.
| * | | | | | | | | | codecvt: Add class for encoding conversionDāvis Mosāns2016-10-063-0/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `codecvt` class that can be used as facet for locale so that it's possible to convert from internal UTF-8 encoding to other encodings such as Windows ANSI codepage.
* | | | | | | | | | | Merge topic 'cpack-rpm-single-debuginfo'Brad King2016-10-0717-84/+624
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb8cf521 CPack/RPM single debuginfo packaging 758f58b4 CPack/RPM learned defining main component
| * | | | | | | | | | | CPack/RPM single debuginfo packagingDomen Vrankar2016-10-0713-52/+425
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate a single debuginfo package even if components packaging is enabled. This makes issue #15668 resolution feature complete. Closes: #15486
| * | | | | | | | | | | CPack/RPM learned defining main componentDomen Vrankar2016-10-078-33/+200
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main component rpm package is generated without component suffix in filename and package name.
* | | | | | | | | | | Merge topic 'cleanup-Convert'Brad King2016-10-0717-189/+167
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20e62f74 cmLocalGenerator: Simplify ConvertToLinkReference fd93b360 cmOutputConverter: Add a flag for IsUnix 1365e18b Convert: Inline platform-specific methods 1ed5f6b3 Makefiles: Introduce local RelativePath method 8377d9e0 Fortran: Inline conversion to relative path 00173b71 Fortran: Wrap path convert in a call with a more-suitable name d5911ef0 Makefiles: Hardcode the relative location of the CMakeCache file c3264f48 Convert: Extract method to determine if paths are in directory 52168f32 Convert: Remove asserts which are duplicated in delegate method 5213f893 Convert: Remove early return check b61c268b Convert: Extract local variables for readability e278f5a8 Convert: Extract local variables 51bc6bdd cmOutputConverter: remove unused code 8e0c1599 Xcode: Inline ConvertToRelativePath calls
| * | | | | | | | | | | cmLocalGenerator: Simplify ConvertToLinkReferenceStephen Kelly2016-10-065-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make conversion to output format the caller responsibility, so that the method only 'converts to a link reference'.
| * | | | | | | | | | | cmOutputConverter: Add a flag for IsUnixStephen Kelly2016-10-062-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the need for method parameters to represent the distinction.
| * | | | | | | | | | | Convert: Inline platform-specific methodsStephen Kelly2016-10-062-28/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They don't provide real value.
generated by cgit v0.12 at 2025-02-09 03:40:43 (GMT)