35109 Commits

Author SHA1 Message Date
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
8d1af9cad2 Merge branch 'implicit-dir-symlinks' into release 2017-03-02 08:38:21 -05:00
Brad King
fce6233d8b Merge branch 'csproj_add_free_source_tags' into release 2017-03-02 08:38:16 -05:00
Brad King
5228d36aac Merge branch 'backport-implicit-dir-symlinks' into release-3.7 2017-03-02 08:37:39 -05:00
Brad King
69528fe65f Tests: Add case for RPATH exclusion of symlinks to implicit directories
Issue: #16682
2017-03-02 08:36:32 -05:00
Brad King
f3102ca884 Merge branch 'backport-implicit-dir-symlinks' into implicit-dir-symlinks 2017-03-02 08:36:13 -05:00
Brad King
c3fb650c85 cmOrderDirectories: Consider symlinks when checking implicit directories
When checking whether a directory is "implicit" (e.g. implicit link
directory or implicit rpath directory), resolve the real path of both
sides of the comparison.  Otherwise we will not recognize paths like
`/usr/lib32` as implicit when `/usr/lib` is implicit and `lib32` is
actually a symlink to `lib`.  This can lead to addition of unnecessary
entries to the RPATH of a binary, for example.

Fixes: #16682
2017-03-02 08:35:48 -05:00
Kitware Robot
a52d35b8ef CMake Nightly Date Stamp 2017-03-02 00:01:03 -05:00
Brad King
d33de80c8a Help/dev: Exclude this directory from user-facing documentation
Teach Sphinx and our own install rules to skip a `Help/dev` directory.
This will give us a place to put developer-only documentation that
should not be included in the user-facing documentation.  Add a
placeholder README.
2017-03-01 16:05:55 -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
Roman Wüger
09475c298b CPack/NSIS: Sign the uninstaller 2017-03-01 20:18:28 +01:00
Brad King
b1a37362b8 cmOrderDirectories: Factor out implicit directory check 2017-03-01 12:39:18 -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
Brad King
78104bd7bc Merge branch 'release' 2017-02-28 09:44:12 -05:00
Brad King
2ca029d9a8 Merge topic 'kwiml-test-gcc-format-security'
4ca77bb6 KWIML: Add -Wno-format-security to tolerate -Werror=format-security
2017-02-28 09:43:49 -05:00