summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | CPack/RPM single debuginfo packagingDomen Vrankar2016-10-071-1/+87
| | | | | | | | | | | | | | | | | | 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-071-28/+131
| | | | | | | | | | | | 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.
| * | Makefiles: Introduce local RelativePath methodStephen Kelly2016-10-066-55/+73
| | | | | | | | | | | | | | | | | | | | | This makes it easier to remove directory-specific state from cmOutputConverter where it doesn't belong. Of course, this just relocates the problem to the makefiles generator for now, but that's better than affecting the core.
| * | Fortran: Inline conversion to relative pathStephen Kelly2016-10-061-1/+5
| | | | | | | | | | | | | | | Don't use cmOutputConverter method which relies on directory-specific state.
| * | Fortran: Wrap path convert in a call with a more-suitable nameStephen Kelly2016-10-062-20/+24
| | |
| * | Makefiles: Hardcode the relative location of the CMakeCache fileStephen Kelly2016-10-061-5/+1
| | | | | | | | | | | | | | | | | | In this context, currentBinDir refers to the CMAKE_BINARY_DIR because it comes from the first local generator. GetHomeOutputDirectory is the same as CMAKE_BINARY_DIR, so the computation here is unnecessary.
| * | Convert: Extract method to determine if paths are in directoryStephen Kelly2016-10-062-5/+17
| | | | | | | | | | | | | | | | | | The conditional early return can be moved to clients, which would have many benefits, notably making cmOutputConverter independent of directory-specific state.
| * | Convert: Remove asserts which are duplicated in delegate methodStephen Kelly2016-10-061-7/+0
| | | | | | | | | | | | | | | This means that we don't encounter the asserts in the case where we early-return from here.
| * | Convert: Remove early return checkStephen Kelly2016-10-061-5/+0
| | | | | | | | | | | | This function delegates to another function which does the same check.
| * | Convert: Extract local variables for readabilityStephen Kelly2016-10-061-12/+13
| | |
| * | Convert: Extract local variablesStephen Kelly2016-10-061-14/+17
| | | | | | | | | | | | Remove comment made obsolete by them.
| * | cmOutputConverter: remove unused codeDaniel Pfeifer2016-10-062-20/+0
| | | | | | | | | | | | | | | Remove old ConvertToRelativePath function now that all clients have migrated to the new signature.
| * | Xcode: Inline ConvertToRelativePath callsStephen Kelly2016-10-061-3/+3
| | | | | | | | | | | | | | | Avoid violations of Interface Segregation Principle. These two calls now simply call different methods.
* | | Merge topic 'CMP0065-LINK_FLAGS'Brad King2016-10-073-46/+67
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0f1fedbd CMP0065: Put computed flags into LINK_FLAGS not LINK_LIBRARIES 7f1cd328 cmLocalGenerator: Rename local variable to be more appropriate 2597bcf8 cmLocalGenerator: Extract policy handling into a method
| * | | CMP0065: Put computed flags into LINK_FLAGS not LINK_LIBRARIESStephen Kelly2016-10-072-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These flags are redundant anyway in the NEW case of the policy, and could be merged with CMAKE_EXE_EXPORTS_${lang}_FLAG content for that case. That is deferred to the future, but now at least the similar code is located close to each other.
| * | | cmLocalGenerator: Rename local variable to be more appropriateStephen Kelly2016-10-061-4/+3
| | | |
| * | | cmLocalGenerator: Extract policy handling into a methodStephen Kelly2016-10-062-46/+55
| |/ /
* | | Merge topic 'codelite-global-setting'Brad King2016-10-073-3/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | 80574a38 Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globally f59e8779 cmGlobalGenerator: Add API to get settings from top-level cmMakefile
| * | | Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globallyStephen Kelly2016-10-071-3/+1
| | | |
| * | | cmGlobalGenerator: Add API to get settings from top-level cmMakefileStephen Kelly2016-10-062-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At generate-time, definitions are sometimes read from a nearby cmMakefile, making the value directory-specific because they are read once per directory. Often however, the intention is more often to create a 'global' setting, such that the user writes for example: set(CMAKE_IMPORT_LIBRARY_SUFFIX something) once at the top level of their project. Many of these are also set by internal platform files, such as CMAKE_EXTRA_LINK_EXTENSIONS. The set() definitions are not really suitable for 'global' settings because they can be different for each directory, and code consuming the settings must assume they are different for each directory, and read it freshly each time with new allocations. CMake has other variable types which are global in scope, such as global properties, and cache variables. These are less convenient to populate for users, so establish a convention and API using the value as it is at the end of the top-level CMakeLists file.
* | | | Merge topic 'vs-15-preview-5'Brad King2016-10-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 02b7d278 VS: Update VS 15 generator for Preview 5
| * | | | VS: Update VS 15 generator for Preview 5Brad King2016-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `PlatformToolset` is now `v141` instead of `v140`. Closes: #16347
* | | | | Merge topic 'mips-rld-map-rel'Brad King2016-10-073-184/+135
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15762b72 elf: Remove GetDynamicEntryCount and ReadBytes methods cd4f573a cmSystemTools, elf: handle DT_MIPS_RLD_REL_MAP in RemoveRPath b8b1d151 cmSystemTools: rewrite RemoveRPath using DyanmicEntryList methods 72eb6a37 elf: add DynamicEntryList methods and rpath tag constants 66c4d082 elf: remove tag switch from ELF_Dyn ByteSwap function
| * | | | | elf: Remove GetDynamicEntryCount and ReadBytes methodsJames Cowgill2016-10-072-47/+1
| | | | | | | | | | | | | | | | | | | | | | | | These are no longer used after the DynamicEntryList changes.
| * | | | | cmSystemTools, elf: handle DT_MIPS_RLD_REL_MAP in RemoveRPathJames Cowgill2016-10-073-1/+31
| | | | | |
| * | | | | cmSystemTools: rewrite RemoveRPath using DyanmicEntryList methodsJames Cowgill2016-10-071-35/+17
| | | | | |
| * | | | | elf: add DynamicEntryList methods and rpath tag constantsJames Cowgill2016-10-062-0/+95
| | | | | |
| * | | | | elf: remove tag switch from ELF_Dyn ByteSwap functionJames Cowgill2016-10-061-115/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | sizeof(dyn.d_un.d_val) always equals sizeof(dyn.d_un.d_ptr) so every byte swap call in this function is identical.
* | | | | CMake Nightly Date StampKitware Robot2016-10-071-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'cmake-server-improve-shutdown'Brad King2016-10-063-53/+132
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 68277e16 server-mode: Improve shutdown behavior
| * | | | server-mode: Improve shutdown behaviorTobias Hunger2016-10-043-53/+132
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Add a signal handler to trigger shutdown and be more paranoid about libuv doing things asynchronously. This should fix test cases not shutting down properly.
* | | | Merge topic 'fix-VS-resources-pri-path'Brad King2016-10-061-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 646d01da VS: Use absolute target-specific directory for `resources.pri`
| * | | | VS: Use absolute target-specific directory for `resources.pri`Roman Wüger2016-10-051-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.7.0-rc1~219^2 (VS: Use target-specific directory for `resources.pri`, 2016-08-25) incorrectly specifies a relative path for the `ProjectPriFullPath` value. Fix it to use an absolute path. Issue: #16106
* | | | Merge topic 'no-define-cout-cerr'Brad King2016-10-067-39/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 53858177 Do not define cout/cerr preprocessor symbols
| * | | | Do not define cout/cerr preprocessor symbolsBrad King2016-10-047-39/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the change from commit bd3d0eaf (cmCTest: don't redefine cout and cerr, 2016-09-01) to the rest of ctest and cpack. These definitions are no longer needed because our conventions are well established.
* | | | | CMake Nightly Date StampKitware Robot2016-10-061-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2016-10-051-1/+1
| | | |
* | | | Merge topic 'qtifw-https-cmake.org'Brad King2016-10-041-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | eb1a57d7 QtIFW: Reference cmake.org via https in cmake.org.html
| * | | QtIFW: Reference cmake.org via https in cmake.org.htmlBrad King2016-10-041-1/+1
| |/ /
* | | Merge topic 'add-BUILD_RPATH'Brad King2016-10-043-0/+10
|\ \ \ | | | | | | | | | | | | | | | | dc6d8066 Add a BUILD_RPATH target property specifying build-tree RPATH entries
| * | | Add a BUILD_RPATH target property specifying build-tree RPATH entriesRuslan Baratov2016-10-033-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Users may need to add custom `RPATH` entries to be able to run binaries from their build tree without setting `LD_LIBRARY_PATH`. Provide a way to do this that does not affect the install-tree `RPATH`.
* | | | CMake Nightly Date StampKitware Robot2016-10-041-1/+1
|/ / /