summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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'
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-masterBrad King2016-11-295-15/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | VS: Rename VS 15 generator to 'Visual Studio 15 2017'Roman Wüger2016-11-295-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The final name of this VS version was announced: https://blogs.msdn.microsoft.com/visualstudio/2016/11/16/visual-studio-2017-rc/ Add the year to the generator name accordingly. For convenience, map the name without the year to the name with the year.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-11-301-1/+1
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'release'Brad King2016-11-290-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'libarchive-openssl-1.1' into releaseBrad King2016-11-289-41/+183
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '16449-revert-xcode-system-includes' into releaseBrad King2016-11-283-44/+19
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'find-module-cleanup-sweep'Brad King2016-11-2948-111/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 745b56f5 Find*.cmake: drop the comments before including FPHSA 0ab9cb46 FindLibArchive: do not set LibArchive_FOUND explicitly 703d1943 FindLibArchive: use CMAKE_CURRENT_LIST_DIR to find FPHSA
| * | | | | | | | | | | | Find*.cmake: drop the comments before including FPHSARolf Eike Beer2016-11-2848-106/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to explain this over and over again. While at it, do some other minor cleanups to whitespace and comments (i.e. delete them).
| * | | | | | | | | | | | FindLibArchive: do not set LibArchive_FOUND explicitlyRolf Eike Beer2016-11-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FPHSA already does this.
| * | | | | | | | | | | | FindLibArchive: use CMAKE_CURRENT_LIST_DIR to find FPHSARolf Eike Beer2016-11-281-4/+1
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version of CMake required to build CMake is now new enough to have that variable.
* | | | | | | | | | | | Merge topic 'FindDevIL-updates'Brad King2016-11-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7abb12c8 FindDevIL: Make the ILUT library optional d3f9f512 FindDevIL: fail properly when library is not found.
| * | | | | | | | | | | | FindDevIL: Make the ILUT library optionalVladimír Vondruš2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some distributions (such as ArchLinux) have only the IL and ILU libraries and since these are mainly used, the module should succeed even though ILUT was not found. Removed it from the FPHSA() macro call, making it effectively optional.
| * | | | | | | | | | | | FindDevIL: fail properly when library is not found.Vladimír Vondruš2016-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a mismatch between module name and name passed to FPHSA() the macro printed an error message but the error was not caught up by CMake. Fix the typo.
* | | | | | | | | | | | | Merge topic 'FindPkgConfig-fix-print-errors'Brad King2016-11-291-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbccebba FindPkgConfig: Fix missing error text when library version is specified
| * | | | | | | | | | | | | FindPkgConfig: Fix missing error text when library version is specifiedGautier Pelloux-Prayer2016-11-281-1/+2
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls like `pkg_check_modules(somelibrary>=3.22)` that specify a version requirement should still display an informative error when the package is not found. Fix our logic accordingly.
* | | | | | | | | | | | | Merge topic 'vs-default-build-package'Brad King2016-11-297-14/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e3164df VS: Add option to place `PACKAGE` target in solution default build
| * | | | | | | | | | | | | VS: Add option to place `PACKAGE` target in solution default buildMichael Stürmer2016-11-297-14/+69
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD` variable to control this behavior.
* | | | | | | | | | | | | Merge topic 'try_compile-honor-CMAKE_WARN_DEPRECATED'Brad King2016-11-294-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d604c49 try_compile: Honor CMAKE_WARN_DEPRECATED in test project
| * | | | | | | | | | | | | try_compile: Honor CMAKE_WARN_DEPRECATED in test projectBrad King2016-11-224-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This causes the `-Wno-deprecated` option to be honored even inside a `try_compile` test project, which is needed to suppress all deprecation warnings as the option documents. Closes: #16446
generated by cgit v0.12 at 2025-02-19 10:13:03 (GMT)