Commit Graph

35011 Commits

Author SHA1 Message Date
Steven Newbury bed9c73dec Modules: Add x32-abi support to hard-coded paths
Update hard-coded library paths in bundled CMake Modules for libx32 as
used with x32-abi.
2017-03-07 15:22:55 -05:00
Steven Newbury 462cf25427 Add support for x32-abi
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
2017-03-07 15:22:55 -05:00
Brad King 06ef23c3e0 Merge branch 'release' 2017-03-02 10:04:13 -05:00
Brad King c1fb7213ed Merge topic 'autogen_uic_paths'
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
2017-03-02 09:26:13 -05:00
Brad King 6c332bd84c Merge topic 'find_library-custom-lib-suffix'
503f25d4 find_library: Allow custom lib suffix be used as find path
2017-03-02 09:26:08 -05:00
Brad King 5d81817b71 Merge topic 'csproj_add_free_source_tags'
506207f9 VS: add test for VS_CSHARP_* source file property
a202749c VS: add CSharpUtilities module
9588d0a2 VS: add VS_CSHARP_<tagname> sourcefile property
2017-03-02 09:26:03 -05:00
Brad King 6d9ab1eff7 Merge topic 'FindHDF5-updates'
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
2017-03-02 09:25:59 -05:00
Brad King 2187818706 Merge topic 'xcode-enhance-schemes'
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
2017-03-02 09:25:54 -05:00
Sebastian Holtermann 3bf28f5ed0 Autogen: New short InfoGet functions 2017-03-02 09:10:03 -05:00
Sebastian Holtermann 154d8339f7 Autogen: Parse enabled feature configuration only 2017-03-02 09:10:03 -05:00
Sebastian Holtermann ac77fa35c0 Autogen: Add missing return on error 2017-03-02 09:10:02 -05:00
Sebastian Holtermann 662ad240db Autogen: Rename and merge moc related methods 2017-03-02 09:10:02 -05:00
Sebastian Holtermann 5adf22bbd2 Autogen: Add AUTOUIC_SEARCH_PATHS release notes 2017-03-02 09:10:02 -05:00
Sebastian Holtermann 36fa535d92 Autogen: Add AUTOUIC_SEARCH_PATHS documentation 2017-03-02 09:10:02 -05:00
Sebastian Holtermann 6d7c02db34 Autogen: Add AUTOUIC_SEARCH_PATHS test 2017-03-02 09:10:01 -05:00
Sebastian Holtermann 1cdf7c1be2 Autogen: Add AUTOUIC_SEARCH_PATHS support
Closes #15227
2017-03-02 09:10:01 -05:00
Sebastian Holtermann 110c1bf475 Autogen: Add subDirPrefix function 2017-03-02 09:10:01 -05:00
Brad King fce6233d8b Merge branch 'csproj_add_free_source_tags' into release 2017-03-02 08:38:16 -05:00
Kitware Robot a52d35b8ef CMake Nightly Date Stamp 2017-03-02 00:01:03 -05:00
Michael Stürmer 506207f928 VS: add test for VS_CSHARP_* source file property 2017-03-01 15:31:05 -05:00
Michael Stürmer a202749c46 VS: add CSharpUtilities module 2017-03-01 15:31:05 -05:00
Michael Stürmer 9588d0a2e2 VS: add VS_CSHARP_<tagname> sourcefile property 2017-03-01 15:31:05 -05:00
Christian Schmidbauer 503f25d490 find_library: Allow custom lib suffix be used as find path
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.
2017-03-01 09:49:42 -05:00
Sebastian Holtermann db431ecfe3 Autogen: Merge FindInIncludeDirectories into FindIncludeFile 2017-03-01 15:30:28 +01:00
Brad King ebc28c156e Merge branch 'release' 2017-03-01 09:03:02 -05:00
Brad King 66bdc792a0 Merge branch 'release-3.7' 2017-03-01 09:02:38 -05:00
Brad King f782b31368 Merge topic 'FindPkgConfig-version-ops'
8d71fa92 FindPkgConfig: use new version checking "library >= version" syntax
2017-03-01 09:00:46 -05:00
Brad King 86563cf7c8 Merge topic 'export-executable-symbols'
85e08370 bindexplib: Always export executable symbols, even they are also readable
2017-03-01 09:00:43 -05:00
Brad King 4fc64ce76d Merge topic 'find-libarch-not-symlink'
6f5aede7 find_library: Skip 'lib => lib<arch>' searches if one symlinks the other
e67963ed cmFindLibraryCommand: Refactor AddArchitecturePath logic
2017-03-01 09:00:40 -05:00
Brad King a9113ae37b Merge topic 'autogen_json_fix'
48b56504 Autogen: Fix for Q_PLUGIN_METADATA change detection test
2017-03-01 09:00:37 -05:00
Kris Thielemans 2186b323c0 FindHDF5: initialize HDF5_DEFINITIONS when using hdf5-config.cmake 2017-03-01 08:13:58 -05:00
Kris Thielemans 16f1dd0d16 FindHDF5: document HDF5_<LANG>_DEFINITIONS 2017-03-01 08:13:58 -05:00
Kris Thielemans b2de6da2f1 FindHDF5: use import libraries when using hdf5-config.cmake on Windows
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
2017-03-01 08:12:56 -05:00
Kris Thielemans 003c91385a FindHDF5: do not cache library locations when using hdf5-config.cmake
The imported targets provide a persistent reference of their location,
so we do not need to cache the values.
2017-03-01 08:11:37 -05:00
Kris Thielemans bf67fff035 FindHDF5: recognize hdf5:: prefix when using hdf5-config.cmake
Some versions of HDF5 use this prefix on their imported targets.
2017-03-01 08:11:22 -05:00
Kris Thielemans e629be4a7a FindHDF5: fix typo in comment 2017-03-01 08:06:26 -05:00
Kris Thielemans 1c7a9119d2 FindHDF5: remove mark_as_advanced for non-cached variables 2017-03-01 08:06:26 -05:00
Kitware Robot e9cfe63dfc CMake Nightly Date Stamp 2017-03-01 00:01:04 -05:00
Gregor Jasny 54a48c6781 Xcode: Use proper buildable name for schema 2017-02-28 22:38:30 +01:00
Gregor Jasny f4977d056b Xcode: Select executable target for execution in schema 2017-02-28 22:38:29 +01:00
Gregor Jasny 7202db5db4 Xcode: Fix schema container location calculation 2017-02-28 22:38:29 +01:00
Gregor Jasny 5995082101 Xcode: Do not autocreate schemes 2017-02-28 22:38:29 +01:00
Gregor Jasny 6a54d28e44 Xcode: Use proper indentation for schemes 2017-02-28 22:27:21 +01:00
Kris Thielemans 8250a520aa FindHDF5: add HDF5_FIND_DEBUG variable to get debugging output 2017-02-28 16:10:11 -05:00
Kris Thielemans 4b847f12f6 FindHDF5: hide HDF5_DIR if HDF5 was found in another way 2017-02-28 16:01:04 -05:00
Brad King baed38107e Merge branch 'find-libarch-not-symlink' into release 2017-02-28 15:57:54 -05:00
Brad King f566ab2747 Merge branch 'find-libarch-not-symlink' into release-3.7 2017-02-28 15:57:37 -05:00
Brad King 6f5aede716 find_library: Skip 'lib => lib<arch>' searches if one symlinks the other
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
2017-02-28 14:56:54 -05:00
Brad King e67963ed73 cmFindLibraryCommand: Refactor AddArchitecturePath logic
Use boolean variables to save results and rename variables to more
closely represent their roles.
2017-02-28 14:56:13 -05:00
Zsolt Parragi 85e08370d0 bindexplib: Always export executable symbols, even they are also readable
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.
2017-02-28 09:49:12 -05:00