summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add support for x32-abiSteven Newbury2017-03-0713-3/+74
| | | | | | | | Detect x32-abi through CMakeCompilerABI infrastruture and use this information at runtime to determine the correct library paths with `FIND_LIBRARY_USE_LIBX32_PATHS`. Fixes: #15994
* Merge branch 'release'Brad King2017-03-020-0/+0
|\
| * Merge branch 'csproj_add_free_source_tags' into releaseBrad King2017-03-0212-56/+410
| |\
* | \ Merge topic 'autogen_uic_paths'Brad King2017-03-0220-263/+440
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bf28f5e Autogen: New short InfoGet functions 154d8339 Autogen: Parse enabled feature configuration only ac77fa35 Autogen: Add missing return on error 662ad240 Autogen: Rename and merge moc related methods 5adf22bb Autogen: Add AUTOUIC_SEARCH_PATHS release notes 36fa535d Autogen: Add AUTOUIC_SEARCH_PATHS documentation 6d7c02db Autogen: Add AUTOUIC_SEARCH_PATHS test 1cdf7c1b Autogen: Add AUTOUIC_SEARCH_PATHS support 110c1bf4 Autogen: Add subDirPrefix function db431ecf Autogen: Merge FindInIncludeDirectories into FindIncludeFile
| * | | Autogen: New short InfoGet functionsSebastian Holtermann2017-03-023-72/+62
| | | |
| * | | Autogen: Parse enabled feature configuration onlySebastian Holtermann2017-03-021-108/+117
| | | |
| * | | Autogen: Add missing return on errorSebastian Holtermann2017-03-021-0/+1
| | | |
| * | | Autogen: Rename and merge moc related methodsSebastian Holtermann2017-03-022-41/+23
| | | |
| * | | Autogen: Add AUTOUIC_SEARCH_PATHS release notesSebastian Holtermann2017-03-021-0/+10
| | | |
| * | | Autogen: Add AUTOUIC_SEARCH_PATHS documentationSebastian Holtermann2017-03-027-4/+36
| | | |
| * | | Autogen: Add AUTOUIC_SEARCH_PATHS testSebastian Holtermann2017-03-027-0/+100
| | | |
| * | | Autogen: Add AUTOUIC_SEARCH_PATHS supportSebastian Holtermann2017-03-025-49/+107
| | | | | | | | | | | | | | | | Closes #15227
| * | | Autogen: Add subDirPrefix functionSebastian Holtermann2017-03-022-14/+16
| | | |
| * | | Autogen: Merge FindInIncludeDirectories into FindIncludeFileSebastian Holtermann2017-03-012-29/+22
| | | |
* | | | Merge topic 'find_library-custom-lib-suffix'Brad King2017-03-0214-14/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 503f25d4 find_library: Allow custom lib suffix be used as find path
| * | | | find_library: Allow custom lib suffix be used as find pathChristian Schmidbauer2017-03-0114-14/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new `CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable to allow use of a custom suffix on `lib` directory names. This is a more general option than that added by commit v3.7.0-rc1~504^2 (Teach find_library and find_package to search lib32 paths, 2016-06-10). It allows the find path to be more deterministic on custom setups. See discussion in #10287 and #15994.
* | | | | Merge topic 'csproj_add_free_source_tags'Brad King2017-03-0212-56/+410
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 506207f9 VS: add test for VS_CSHARP_* source file property a202749c VS: add CSharpUtilities module 9588d0a2 VS: add VS_CSHARP_<tagname> sourcefile property
| * | | | VS: add test for VS_CSHARP_* source file propertyMichael Stürmer2017-03-014-0/+38
| | | | |
| * | | | VS: add CSharpUtilities moduleMichael Stürmer2017-03-014-0/+305
| | | | |
| * | | | VS: add VS_CSHARP_<tagname> sourcefile propertyMichael Stürmer2017-03-015-56/+67
| | | | |
* | | | | Merge topic 'FindHDF5-updates'Brad King2017-03-021-23/+58
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2186b323 FindHDF5: initialize HDF5_DEFINITIONS when using hdf5-config.cmake 16f1dd0d FindHDF5: document HDF5_<LANG>_DEFINITIONS b2de6da2 FindHDF5: use import libraries when using hdf5-config.cmake on Windows 003c9138 FindHDF5: do not cache library locations when using hdf5-config.cmake bf67fff0 FindHDF5: recognize hdf5:: prefix when using hdf5-config.cmake e629be4a FindHDF5: fix typo in comment 1c7a9119 FindHDF5: remove mark_as_advanced for non-cached variables 8250a520 FindHDF5: add HDF5_FIND_DEBUG variable to get debugging output 4b847f12 FindHDF5: hide HDF5_DIR if HDF5 was found in another way
| * | | | | FindHDF5: initialize HDF5_DEFINITIONS when using hdf5-config.cmakeKris Thielemans2017-03-011-0/+1
| | | | | |
| * | | | | FindHDF5: document HDF5_<LANG>_DEFINITIONSKris Thielemans2017-03-011-1/+5
| | | | | |
| * | | | | FindHDF5: use import libraries when using hdf5-config.cmake on WindowsKris Thielemans2017-03-011-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `LOCATION` of imported shared libraries on Windows is that of the `.dll`. Use the import library instead to get the `.lib` to be linked. Fixes: #16534
| * | | | | FindHDF5: do not cache library locations when using hdf5-config.cmakeKris Thielemans2017-03-011-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imported targets provide a persistent reference of their location, so we do not need to cache the values.
| * | | | | FindHDF5: recognize hdf5:: prefix when using hdf5-config.cmakeKris Thielemans2017-03-011-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | Some versions of HDF5 use this prefix on their imported targets.
| * | | | | FindHDF5: fix typo in commentKris Thielemans2017-03-011-1/+1
| | | | | |
| * | | | | FindHDF5: remove mark_as_advanced for non-cached variablesKris Thielemans2017-03-011-7/+0
| | | | | |
| * | | | | FindHDF5: add HDF5_FIND_DEBUG variable to get debugging outputKris Thielemans2017-02-281-0/+23
| | | | | |
| * | | | | FindHDF5: hide HDF5_DIR if HDF5 was found in another wayKris Thielemans2017-02-281-0/+6
| | | | | |
* | | | | | Merge topic 'xcode-enhance-schemes'Brad King2017-03-026-24/+92
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54a48c67 Xcode: Use proper buildable name for schema f4977d05 Xcode: Select executable target for execution in schema 7202db5d Xcode: Fix schema container location calculation 59950821 Xcode: Do not autocreate schemes 6a54d28e Xcode: Use proper indentation for schemes
| * | | | | | Xcode: Use proper buildable name for schemaGregor Jasny2017-02-282-2/+4
| | | | | | |
| * | | | | | Xcode: Select executable target for execution in schemaGregor Jasny2017-02-282-2/+24
| | | | | | |
| * | | | | | Xcode: Fix schema container location calculationGregor Jasny2017-02-284-19/+18
| | | | | | |
| * | | | | | Xcode: Do not autocreate schemesGregor Jasny2017-02-282-0/+32
| | | | | | |
| * | | | | | Xcode: Use proper indentation for schemesGregor Jasny2017-02-283-1/+14
| | |_|/ / / | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-03-021-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'release'Brad King2017-03-010-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'find-libarch-not-symlink' into releaseBrad King2017-02-284-16/+77
| |\ \ \ \
* | \ \ \ \ Merge branch 'release-3.7'Brad King2017-03-010-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'find-libarch-not-symlink' into release-3.7Brad King2017-02-284-16/+77
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
* | | | | | | Merge topic 'FindPkgConfig-version-ops'Brad King2017-03-013-40/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d71fa92 FindPkgConfig: use new version checking "library >= version" syntax
| * | | | | | | FindPkgConfig: use new version checking "library >= version" syntaxGautier Pelloux-Prayer2017-02-283-40/+38
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Instead of the deprecated --atleast-version one.
* | | | | | | Merge topic 'export-executable-symbols'Brad King2017-03-014-1/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85e08370 bindexplib: Always export executable symbols, even they are also readable
| * | | | | | | bindexplib: Always export executable symbols, even they are also readableZsolt Parragi2017-02-284-1/+24
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously bindexplib discarded read-only non-function symbols even in executable/code sections, but in some specific cases they could still mark functions. An example is provided by nop.asm in the AuoExportDll test, which exports a function only marked by a label. This symbol can be used from C/C++ code, but without this change it would result in an unresolved external symbol when built as a DLL on Windows.
* | | | | | | Merge topic 'find-libarch-not-symlink'Brad King2017-03-014-16/+77
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 6f5aede7 find_library: Skip 'lib => lib<arch>' searches if one symlinks the other e67963ed cmFindLibraryCommand: Refactor AddArchitecturePath logic
| * | | | | | find_library: Skip 'lib => lib<arch>' searches if one symlinks the otherBrad King2017-02-284-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `FIND_LIBRARY_USE_LIB<arch>_PATHS` global properties ask `find_library` to look in `lib<arch>` directories automatically before corresponding `lib` directories. However, if `lib<arch>` is just a symlink to `lib` (or vice-versa) then we should skip adding the `lib<arch>` path. Such symlinks typically only exist to satisfy software that expects the `lib<arch>` path to be available. Fixes: #16687
| * | | | | | cmFindLibraryCommand: Refactor AddArchitecturePath logicBrad King2017-02-281-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use boolean variables to save results and rename variables to more closely represent their roles.
* | | | | | | Merge topic 'autogen_json_fix'Brad King2017-03-014-45/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48b56504 Autogen: Fix for Q_PLUGIN_METADATA change detection test
| * | | | | | | Autogen: Fix for Q_PLUGIN_METADATA change detection testSebastian Holtermann2017-02-264-45/+46
| | | | | | | |