summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* try_compile: Stop processing when test build system fails to generateBrad King2016-12-061-6/+10
| | | | | | Failing to generate the build system of the test project is a failure to compute the result of the test compilation, and so must be treated as any other CMake Error and stop processing.
* Merge topic 'cmake-gui-T-help'Brad King2016-12-021-1/+1
|\ | | | | | | | | dde72ee9 cmake-gui: Clarify help string on toolset selection field
| * cmake-gui: Clarify help string on toolset selection fieldBrad King2016-12-011-1/+1
| | | | | | | | | | | | | | The text `-T parameter` may be read as an example value for the field, but the `-T` part should not be included. Clarify the wording. Closes: #16475
* | Merge topic 'packaging-qtsdk'Brad King2016-12-022-0/+116
|\ \ | | | | | | | | | | | | 6eb78af2 QtIFW: Packaging as part of the QtSDK
| * | QtIFW: Packaging as part of the QtSDKKonstantin Podsvirov2016-11-302-0/+116
| | | | | | | | | | | | | | | Usage: 'cmake ... -C Packaging/QtSDK/ToolsCMakeXX.cmake ...' to make compatible package.
* | | Merge topic 'csharp_compiler_flag_tables'Brad King2016-12-0213-0/+648
|\ \ \ | | | | | | | | | | | | | | | | 9b06c226 VS: Add flag tables for C#
| * | | VS: Add flag tables for C#Michael Stürmer2016-12-0113-0/+648
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add these (currently unused) tables in preparation for `.csproj` generation support. Populate the tables for every version with a set of initial values that work well for me with VS 12 and VS 14. Later we may need to generate them more thoroughly from MSBuild `.xml` files.
* | | | Merge topic 'target_project_type'Brad King2016-12-022-8/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 66bd8a3c cmVisualStudio10TargetGenerator: Prepare to handle C# projects
| * | | | cmVisualStudio10TargetGenerator: Prepare to handle C# projectsMichael Stürmer2016-12-012-8/+50
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize some internal infrastructure to prepare for generating either `.vcxproj` or `.csproj` files. - Add member string for project file extension - Add member enum for project type - Add member flag for in-source build - Add member flag for managed build - Rename PathToVcxproj to PathToProjectFile
* | | | Merge topic 'execute_process-encoding'Brad King2016-12-0216-2/+125
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2ed473b3 execute_process: Add ENCODING option for Windows child process output
| * | | | execute_process: Add ENCODING option for Windows child process outputDāvis Mosāns2016-11-3016-2/+125
| | | | | | | | | | | | | | | | | | | | Different applications can use different output encodings.
* | | | | Merge topic 'utf8pipe'Brad King2016-12-024-1/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | 076aef8e Windows: Use UTF-8 for pipes in CMake, CTest and CPack
| * | | | Windows: Use UTF-8 for pipes in CMake, CTest and CPackDāvis Mosāns2016-11-294-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Applications which process CMake output will need to decode it as UTF-8 instead of console's codepage.
* | | | | CMake Nightly Date StampKitware Robot2016-12-021-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release'Brad King2016-12-010-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'vs-Zc-inline' into releaseBrad King2016-11-302-0/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'cmake-server-pad-arguments' into releaseBrad King2016-11-301-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'cmake-ifw-root-component'Brad King2016-12-012-42/+92
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d07d24b8 QtIFW: Configurable root component
| * | | | | | | QtIFW: Configurable root componentKonstantin Podsvirov2016-11-302-42/+92
| | | | | | | |
* | | | | | | | Merge topic 'compile-pdb-default'Brad King2016-12-012-0/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4da6fa7 Ninja,Makefile: Name static library compile PDB files as VS does
| * | | | | | | | Ninja,Makefile: Name static library compile PDB files as VS doesBrad King2016-11-302-0/+14
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default compile PDB file name for static libraries to match the Visual Studio default of using the logical target name. This may be incompatible with existing behavior but `COMPILE_PDB_NAME` documents that the default is unspecified. Projects depending on a particular name should set the property. Closes: #16438
* | | | | | | | Merge topic 'pgi-macos-flags'Brad King2016-12-014-0/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 571721c5 PGI: Pass macOS-specific link flags directly to linker
| * | | | | | | | PGI: Pass macOS-specific link flags directly to linkerBrad King2016-11-304-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PGI compiler on macOS does not support some macOS-specific flags so pass them through `-Wl,` to the linker directly. Issue: #16457
* | | | | | | | | Merge topic 'vs-Zc-inline'Brad King2016-12-012-0/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 418afd5b VS: Add v140 flag table entries for `-Zc:inline[-]` 315d44f7 VS: Add v141 flag table entry for `-Zc:inline-`
| * | | | | | | | VS: Add v140 flag table entries for `-Zc:inline[-]`Brad King2016-11-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of this option [1] claims that the default is off, but VS seems to use `-Zc:inline` by default if `RemoveUnreferencedCodeData` does not appear in the `.vcxproj` file. Add the flag table entry to allow use of the flag to be configured. [1] https://msdn.microsoft.com/en-us/library/dn642448.aspx Suggested-by: Serti Ayoub <ayb.serti@gmail.com>
| * | | | | | | | VS: Add v141 flag table entry for `-Zc:inline-`Brad King2016-11-301-0/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The negative form of the `-Zc:inline` flag is missing from c:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE/VC/VCTargets/1033/cl.xml so it was not included in our flag table automatically. Add it manually. Suggested-by: Serti Ayoub <ayb.serti@gmail.com>
* | | | | | | | Merge topic 'cmake-server-pad-arguments'Brad King2016-12-011-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | 28e891f0 server-mode: Do not ignore the first cacheArgument on configure
| * | | | | | | server-mode: Do not ignore the first cacheArgument on configureTobias Hunger2016-11-301-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | SetCacheArgs skips the first argument it gets, so add some padding before calling it.
* | | | | | | Merge topic 'VS_DEBUGGER_WORKING_DIRECTORY'Brad King2016-12-017-0/+49
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | 163e8018 VS: Add target property VS_DEBUGGER_WORKING_DIRECTORY
| * | | | | | VS: Add target property VS_DEBUGGER_WORKING_DIRECTORYMichael Stürmer2016-11-307-0/+49
| | |_|/ / / | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-12-011-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'release'Brad King2016-11-300-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | CMake 3.7.1v3.7.1Brad King2016-11-301-1/+1
| | | |
* | | | Merge branch 'release'Brad King2016-11-300-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'vs15-rename-generator' into releaseBrad King2016-11-295-14/+17
| |\ \ \
* | \ \ \ Merge topic 'CMakeGraphVizOptions-docs'Brad King2016-11-301-3/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f7c2a803 CMakeGraphVizOptions: Minor improvements to docs.
| * | | | | CMakeGraphVizOptions: Minor improvements to docs.Harry Mallon2016-11-291-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add `GRAPHVIZ_GRAPH_TYPE` options. * Correct inaccurate usage info.
* | | | | | Merge topic 'msbuild-customization'Brad King2016-11-308-14/+82
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3909918 VS: Add option to customize vcxproj user props file
| * | | | | | VS: Add option to customize vcxproj user props fileMichael Stürmer2016-11-298-14/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `VS_USER_PROPS_CXX` target property to set the user props file of the generated `.vcxproj` file to be something other than the default `$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props`.
* | | | | | | Merge topic 'FindPythonLibs-tolerate-relative-exe'Brad King2016-11-301-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9db0dfd7 FindPythonLibs: Tolerate a non-absolute PYTHON_EXECUTABLE
| * | | | | | | FindPythonLibs: Tolerate a non-absolute PYTHON_EXECUTABLEBrad King2016-11-281-4/+4
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `PYTHON_EXECUTABLE` variable normally contains an absolute path, but tolerate cases when it does not without calling `get_filename_component` with an incorrect number of arguments. Closes: #16452
* | | | | | | Merge topic 'cpack-ifw-options'Brad King2016-11-307-9/+183
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88ecfd8b CPackIFW: Add some options
| * | | | | | | CPackIFW: Add some optionsKonstantin Podsvirov2016-11-247-9/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New options is: DEFAULT, VIRTUAL, FORCED_INSTALLATION, DISPLAY_NAME, DESCRIPTION and RELEASE_DATE. Options added for both cpack_ifw_configure_component and cpack_ifw_configure_component_group command.
* | | | | | | | Merge topic 'QtAutogen_tests_update_v2'Brad King2016-11-3064-101/+127
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6938772a QtAutogen tests: Pass Qt compiler features to library targets c4d4becf QtAutogen tests: Move the complex test case to a subdirectory 2599f5d6 QtAutogen tests: Extend test description in CMakeLists.txt 7052af9d QtAutogen tests: Move independent sameName test to top list of CMakeLists.txt d675004d QtAutogen tests: Rename uiconly target to camel case uicOnly cb4bc19a QtAutogen tests: Rename rcc_empty target to camel case rccEmpty 59dbd3f8 QtAutogen tests: Rename rcconly target to camel case rccOnly.
| * | | | | | | | QtAutogen tests: Pass Qt compiler features to library targetsSebastian Holtermann2016-11-292-1/+7
| | | | | | | | |
| * | | | | | | | QtAutogen tests: Move the complex test case to a subdirectorySebastian Holtermann2016-11-2957-84/+89
| | | | | | | | |
| * | | | | | | | QtAutogen tests: Extend test description in CMakeLists.txtSebastian Holtermann2016-11-291-6/+14
| | | | | | | | |
| * | | | | | | | QtAutogen tests: Move independent sameName test to top list of CMakeLists.txtSebastian Holtermann2016-11-291-3/+4
| | | | | | | | |
| * | | | | | | | QtAutogen tests: Rename uiconly target to camel case uicOnlySebastian Holtermann2016-11-294-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also move uicOnly sources to dedicated uicOnlySource directory.
| * | | | | | | | QtAutogen tests: Rename rcc_empty target to camel case rccEmptySebastian Holtermann2016-11-293-7/+6
| | | | | | | | |
generated by cgit v0.12 at 2024-10-18 17:22:43 (GMT)