summaryrefslogtreecommitdiff
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-nasm'Brad King2017-02-109-1/+184
|\ | | | | | | | | 5ba2c9e5 VS: Add support for ASM_NASM language
| * VS: Add support for ASM_NASM languageEvgeny Fimochkin2017-02-079-1/+184
| | | | | | | | Fixes: #16469
* | CMake Nightly Date StampKitware Robot2017-02-101-1/+1
| |
* | CMake Nightly Date StampKitware Robot2017-02-091-1/+1
| |
* | CMake Nightly Date StampKitware Robot2017-02-081-1/+1
| |
* | Merge topic 'wix-custom-root-id'Brad King2017-02-072-6/+16
|\ \ | | | | | | | | | | | | 558a69fc CPackWIX: Introduce new CPACK_WIX_ROOT_FOLDER_ID variable
| * | CPackWIX: Introduce new CPACK_WIX_ROOT_FOLDER_ID variableNils Gladitz2017-02-062-6/+16
| |/ | | | | | | | | | | | | | | | | | | The new variable allows specification of a custom root folder ID. The implicit default is "ProgramFiles<64>Folder". The "<64>" token is replaced by "" for 32-bit and "64" for 64-bit builds. Inspired-By: Eric Backus Fixes: #16573
* | Merge topic 'update-kwsys'Brad King2017-02-073-1/+28
|\ \ | | | | | | | | | | | | | | | c2645e19 Merge branch 'upstream-KWSys' into update-kwsys 95983ed8 KWSys 2017-02-06 (ef673998)
| * | Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-02-063-1/+28
| |/ | | | | | | | | * upstream-KWSys: KWSys 2017-02-06 (ef673998)
* | CMake Nightly Date StampKitware Robot2017-02-071-1/+1
|/
* Begin post-3.8 developmentBrad King2017-02-061-2/+2
|
* CMake 3.8.0-rc1 version updateBrad King2017-02-061-3/+3
|
* Merge topic 'vs-quote-rerun-paths'Brad King2017-02-062-6/+6
|\ | | | | | | | | f8f3cb8d VS: Fix quoting of special characters in cmake re-run check commands
| * VS: Fix quoting of special characters in cmake re-run check commandsBrad King2017-02-062-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix our calls to `AddCustomCommandToOutput` for adding cmake re-run check commands to disable old-style quoting in favor of the full quoting logic. This is necessary when paths contain special characters like `&` that old-style quoting logic does not handle. This also requires us to expand the `$(SolutionPath)` placeholder explicitly because otherwise its expanded value will no longer be quoted correctly. As a side effect, this fixes the value in VS 10 and above where the placeholder may be undefined when driving the build through MSBuild without the `.sln` file. Reported-by: Steven Cook <sc@harshbutfair.org> Fixes: #16585
* | Merge topic 'productbuild_signing'Brad King2017-02-061-0/+22
|\ \ | | | | | | | | | | | | 48aad9cd CPackProductBuild: Add options to sign packages
| * | CPackProductBuild: Add options to sign packagesRoman Wüger2017-02-041-0/+22
| |/
* | CMake Nightly Date StampKitware Robot2017-02-061-1/+1
| |
* | CMake Nightly Date StampKitware Robot2017-02-051-1/+1
| |
* | CMake Nightly Date StampKitware Robot2017-02-041-1/+1
|/
* CMake Nightly Date StampKitware Robot2017-02-031-1/+1
|
* CMake Nightly Date StampKitware Robot2017-02-021-1/+1
|
* CMake Nightly Date StampKitware Robot2017-02-011-1/+1
|
* Merge topic 'vs-export-external-objects'Brad King2017-01-311-0/+8
|\ | | | | | | | | 4dde0bc8 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects
| * VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objectsZsolt Parragi2017-01-301-0/+8
| | | | | | | | | | | | Teach Visual Studio generators to include external object files in the list of objects whose symbols are to be exported. The Makefile and Ninja generators already did this.
* | Merge topic '16432-static-frameworks'Brad King2017-01-315-33/+89
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 071f8e78 Apple: Add support for static frameworks d525754e Xcode: Refactor RunCMake.Framework test to prepare for static frameworks 45405f00 Xcode: Ignore Xcode project warning until issue is fixed 50e1c105 Makefile: For static libraries remove only the "real" lib before creating 8643ca75 Makefile: Re-order list of files to clean
| * | Apple: Add support for static frameworksGregor Jasny2017-01-314-16/+71
| | | | | | | | | | | | Closes: #16432
| * | Makefile: For static libraries remove only the "real" lib before creatingGregor Jasny2017-01-261-13/+14
| | | | | | | | | | | | | | | | | | | | | When creating a static library with the archive tool, only the `.a` needs to be removed to start a fresh archive. Any other files (e.g. symbolic links we may later add) are not managed by the archive tool and therefore do not need to be cleaned.
| * | Makefile: Re-order list of files to cleanGregor Jasny2017-01-261-4/+4
| | | | | | | | | | | | | | | Revise construction of the list of files to be cleaned for the target to list the "real" file first.
* | | CMake Nightly Date StampKitware Robot2017-01-311-1/+1
| | |
* | | Merge topic 'timestamp-percent'Brad King2017-01-301-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 6c54f7b3 string: Teach TIMESTAMP to treat %% as %
| * | | string: Teach TIMESTAMP to treat %% as %Bernhard M. Wiedemann2017-01-271-0/+1
| | | | | | | | | | | | | | | | This encoding is documented by `strptime`.
* | | | CMake Nightly Date StampKitware Robot2017-01-301-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-01-291-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2017-01-281-1/+1
|/ /
* | Merge topic 'genex-if'Brad King2017-01-271-0/+22
|\ \ | | | | | | | | | | | | 895f7f16 Genex: Add `IF` generator expression
| * | Genex: Add `IF` generator expressionColby Pike2017-01-261-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | This allows a single condition to be used to choose between two alternatives. Without this the condition must be duplicated with one surrounded by `NOT`. Closes: #15585
* | | Merge topic 'topic-reproducible-build'Brad King2017-01-271-0/+11
|\ \ \ | | | | | | | | | | | | | | | | 243aed52 cmTimestamp: Support SOURCE_DATE_EPOCH to override current time
| * | | cmTimestamp: Support SOURCE_DATE_EPOCH to override current timeBernhard M. Wiedemann2017-01-261-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | See https://reproducible-builds.org/ for why this is good and https://reproducible-builds.org/specs/source-date-epoch/ for the definition of this variable.
* | | | CMake Nightly Date StampKitware Robot2017-01-271-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2017-01-261-1/+1
| | |
* | | Merge topic 'cpack-ifw-options'Brad King2017-01-252-18/+165
|\ \ \ | | | | | | | | | | | | | | | | e5089c56 CPackIFW: Add some options
| * | | CPackIFW: Add some optionsKonstantin Podsvirov2017-01-242-18/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cpack_ifw_configure_component_group command gained options: - DEPENDS. The cpack_ifw_configure_component and cpack_ifw_configure_component_group commands gained options: - REQUIRES_ADMIN_RIGHTS; - UPDATE_TEXT; - SORTING_PRIORITY; # New name for PRIORITY - DEPENDENCIES; # Alias for DEPENDS - AUTO_DEPEND_ON; - TRANSLATIONS. For both commands PRIORITY option now is depreceted. Please use SORTING_PRIORITY instead.
* | | | Merge topic 'sanitizer-options'Brad King2017-01-251-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e116f2a5 ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty 522e1588 Tests: Use CTEST_MEMORYCHECK_SANITIZER_OPTIONS where appropriate
| * | | | ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is emptyJamie Snape2017-01-231-3/+9
| |/ / /
* | | | Merge topic 'lang_lint'Brad King2017-01-254-7/+57
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | 0618ddf6 Add properties to run the cpplint style checker with the compiler
| * | | Add properties to run the cpplint style checker with the compilerJamie Snape2017-01-234-7/+57
| |/ / | | | | | | | | | | | | | | | Create a `<LANG>_CPPLINT` target property (initialized by a `CMAKE_<LANG>_CPPLINT` variable) to specify a `cpplint` style checker command line to be run along with the compiler.
* | | CMake Nightly Date StampKitware Robot2017-01-251-1/+1
| | |
* | | Merge topic '16253-xcode-effective-platform-name'Brad King2017-01-245-4/+25
|\ \ \ | | | | | | | | | | | | | | | | 10c9c73d Xcode: Control emission of EFFECTIVE_PLATFORM_NAME
| * | | Xcode: Control emission of EFFECTIVE_PLATFORM_NAMEGregor Jasny2017-01-205-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building with multiple SDKs within one project Xcode requires the usage of ${EFFECTIVE_PLATFORM_NAME} to put temporary and build outout into separate directories. For example an iOS device and simulator build use two different SDKs (iphoneos and iphonesimulator). In the past cmake tries to detect embedded toolchains that could possibly use simulators and emitted EFFECTIVE_PLATFORM_NAME (EPN) at the proper locations. In #16253 Mark noticed that if he uses macosx and iphoneos in combination the necessary EPN is not emitted. This is because CMake by default assumes macosx SDK which does not trigger EPN emission. The fist naive approach - enabling EPN unconditionally revealed that then the EPN leaks into generator expressions like $<TARGET_FILE:xxx> which might be a regression and thus is unacceptable. The next approach was to add an CMake property to enable EPN emission unconditionally. This solved the reported problem. But the EPN leakage also happened for the embedded toolchains already without anyone noticing. So the control property was turned into a tri-state one: * No definition: EPN is activated for embedded toolchains like before * ON: EPN is always emitted * OFF: EPN is never emitted That approach gives the user the chance to disable EPN for embedded toolchains and restores generator expression functionality for those. Closes: #16253
* | | | Merge topic 'qtdialog-trim-new-varname'Brad King2017-01-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 8f1bce12 cmake-gui: trim spaces from user-created variable names