summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | |
| * | | | | | | | QtAutogen tests: Rename rcconly target to camel case rccOnly.Sebastian Holtermann2016-11-293-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add dedicated rccOnlyRes.qrc file for the rccOnly target.
* | | | | | | | | Merge topic 'end-commands'Brad King2016-11-3020-512/+95
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67303794 Combine all unexpected commands to a single class d23a0196 Set the error after argument expansion in end commands 1afbe7d2 Make error message of standalone endwhile command consistent
| * | | | | | | | | Combine all unexpected commands to a single classDaniel Pfeifer2016-11-2919-456/+94
| | | | | | | | | |
| * | | | | | | | | Set the error after argument expansion in end commandsDaniel Pfeifer2016-11-298-60/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current code is optimized for rare error cases. Simplify the code and remove these optimizations.
| * | | | | | | | | Make error message of standalone endwhile command consistentDaniel Pfeifer2016-11-292-13/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | with the error messages of endforeach, endmacro, endfunction, etc.
* | | | | | | | | Merge topic 'UseSWIG-java-outputs'Brad King2016-11-301-3/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62c4cb4b UseSWIG: Record generated java files as custom command outputs
| * | | | | | | | | UseSWIG: Record generated java files as custom command outputscaryoscelus2016-11-291-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When another target depends on the generated files CMake must know which custom command generates them in order to hook up the dependency properly. We already do this for Python. Add the Java files too.
* | | | | | | | | | Merge topic 'update-kwsys'Brad King2016-11-302-33/+53
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8bced8b1 Merge branch 'upstream-KWSys' into update-kwsys cd5cff13 KWSys 2016-11-28 (1c7c2139)
| * \ \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-11-292-33/+53
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-11-28 (1c7c2139)
| | * | | | | | | | | KWSys 2016-11-28 (1c7c2139)KWSys Upstream2016-11-292-33/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 1c7c2139e773124c0a2b80e10b2840c22a750980 (master). Upstream Shortlog ----------------- Brad King (2): 5e556d53 Refactor CMake policy settings cb55cf5a Set CMake Policy CMP0063 to NEW within KWSys Dāvis Mosāns (1): 1c7c2139 ConsoleBuf: Fix character handling between buffer boundaries
* | | | | | | | | | | Merge topic 'vs15-rename-generator-for-master'Brad King2016-11-305-15/+18
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31e013ae Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-master d639620e VS: Rename VS 15 generator to 'Visual Studio 15 2017'
generated by cgit v0.12 at 2025-09-09 21:49:33 (GMT)