kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,782 Commits 1 Branch 14 Tags
Commit Graph

31782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
cd29388615 Merge branch 'FindHDF5-handle-unsuffixed' into release 2016-06-27 10:29:09 -04:00
Robert Maynard
234deec2ea FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmake 2016-06-24 15:28:23 -04:00
Robert Maynard
963b576fd2 FindHDF5: cache the correct path to the high level libraries 2016-06-24 15:26:22 -04:00
Brad King
24bad96ec0 Merge branch 'doc-osx-versions' into release 2016-06-23 13:47:08 -04:00
Bartosz Kosiorek
00caa1dde8 Help: Describe VERSION and SOVERSION meanings for Mach-O binaries 2016-06-23 13:44:26 -04:00
Robert Maynard
9f2728cef3 FindHDF5: When component targets not found fallback to compiler wrappers 2016-06-23 12:31:26 -04:00
Robert Maynard
149539d9c2 FindHDF5: Handle HDF5 builds with non-suffixed components 2016-06-23 10:57:58 -04:00
Robert Maynard
f30b0fec74 FindHDF5: correctly add lang to each component target name. 2016-06-23 10:56:29 -04:00
Brad King
0acf9cb8d1 Merge branch 'backport-GetPrerequisites-typo' into release 2016-06-23 08:56:23 -04:00
Rolf Eike Beer
460a589d20 GetPrerequisites: fix typo in comment 2016-06-22 21:38:08 +02:00
Brad King
d152ae123d CMake 3.6.0-rc3 2016-06-22 09:02:00 -04:00
Brad King
c41dfdabdd Merge branch 'doc-VS_STARTUP_PROJECT-clarify' into release 2016-06-21 09:34:47 -04:00
Brad King
d3e538eabb Help: Clarify VS_STARTUP_PROJECT documentation 
Explain in what directory the property should be set to affect the
corresponding ``.sln`` file.

Suggested-by: Stephen Kelly <steveire@gmail.com>
 2016-06-21 09:33:35 -04:00
Brad King
d38fc22132 Merge branch 'update-libarchive' into release 2016-06-20 10:53:25 -04:00
Brad King
52f58267c3 Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2016-06-19 (139d0576)
 2016-06-20 10:50:13 -04:00
LibArchive Upstream
2b94d71d88 LibArchive 2016-06-19 (139d0576) 
Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit 139d0576b51a253732a5ab1f66805dffbf8b00af (master).
 2016-06-20 10:50:05 -04:00
Brad King
c8f139a16b Merge branch 'cpack-deb-test-fixes' into release 2016-06-20 09:29:22 -04:00
Domen Vrankar
6107fab467 CPack/Deb: Fix test to actually test the preinst script 
The test regex variable name was invalid and did not test preinst
script.

Reported-by: Patrick <mail6543210@yahoo.com.tw>
 2016-06-20 09:29:11 -04:00
Domen Vrankar
302391bae6 CPack/Deb: Fix tests for SELinux-enabled systems 
Suggested-by: Patrick <mail6543210@yahoo.com.tw>
 2016-06-20 09:29:11 -04:00
Brad King
4fdb97db8d Merge branch 'pkgconfig-targets' into release 2016-06-20 09:24:30 -04:00
Brad King
45b62646db Merge branch 'FindQt4-doc-QtDeclarative-imported' into release 2016-06-20 09:09:08 -04:00
Brad King
5ed2881cb2 FindQt4: Document Qt4::QtDeclarative imported target (#16157) 2016-06-20 08:49:31 -04:00
Rolf Eike Beer
8345c6463d FindPkgConfig: define the imported targets also when the data comes from cache 2016-06-19 09:35:05 +02:00
Brad King
c37e6e226c Merge branch 'doc-issue-tracker-move' into release 2016-06-17 15:39:35 -04:00
Brad King
588166f804 README: Update Issue Tracker link to new location 2016-06-17 15:38:07 -04:00
Brad King
3a50c55ff6 Merge branch 'CodeBlocks-include-order' into release 2016-06-17 10:40:14 -04:00
Tobias Hunger
76b462eacb cmExtraCodeBlocksGenerator: Do not shuffle include directories 
Report include directories in a sensible order. Do not shuffle them
when trying to make them unique.
 2016-06-17 10:37:29 -04:00
Brad King
4160d68189 Merge branch 'revert-vs-clang-minsize' into release 2016-06-17 10:20:16 -04:00
Brad King
78249be29d VS: Fix regressed mapping for the cl /Os compiler flag 
In commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct
compiler settings, 2016-02-18) a flag mapping was added for the clang
`-Os` flag.  However, this collides with a mapping we already had for
the MSVC flag of the same name.  This is a symptom of a larger problem
in that the VS generators need a per-toolset flag map (issue #16153).

For now, simply drop the new mapping and drop `-Os` from clang compiler
flags in the MinSizeRel configuration.

Reported-by: Felix Bruns <felixbruns@gmail.com>
 2016-06-17 10:18:47 -04:00
Brad King
9f3546bbb4 CMake 3.6.0-rc2 2016-06-13 10:28:02 -04:00
Brad King
023e2a1eb7 Merge branch 'bash-completion' into release 2016-06-10 10:47:47 -04:00
Eric NOULARD
797c3c54e8 bash-completion: Add cpack --help-{manual,module,policy,property} 2016-06-10 10:46:33 -04:00
Eric NOULARD
b08cae9b0e bash-completion: Add ctest --help-{manual,module,policy,property,variable} 2016-06-10 10:46:19 -04:00
Eric NOULARD
48cb388ead bash-completion: Fix cmake --help-policy lookup 2016-06-10 10:45:25 -04:00
Eric NOULARD
f67afbdc4a bash-completion: Add cmake --help-manual 2016-06-10 09:54:29 -04:00
Brad King
cc7e9d1d90 Merge branch 'cmake-gui-osx-symlink-qt5-plugin' into release 2016-06-09 13:21:56 -04:00
Robert Maynard
f28401554a cmake-gui: Teach Qt5 where plugins are when launched through a symlink 
When we are on OSX and we are launching cmake-gui from a symlink, the
application will fail to launch as it can't find the qt.conf file which
tells it what the name of the plugin folder is. We need to add this path
BEFORE the application is constructed as that is what triggers the
searching for the platform plugins
 2016-06-09 13:21:27 -04:00
Brad King
b55039ce5b Merge branch 'doc-ctest_update' into release 2016-06-08 10:03:41 -04:00
Brad King
1b18180ed4 Help: Document CTest Git fetch-and-reset behavior 2016-06-08 09:58:43 -04:00
Brad King
558e4d1ed6 Help: Document ctest_update branch following behavior 2016-06-08 09:53:13 -04:00
Brad King
fb30b1a282 Merge branch 'fix-libarchive-openssl-no-hashes' into release 2016-06-07 15:08:14 -04:00
Brad King
dbc9f73d0e libarchive: Restore OpenSSL include directory from upstream 
In commit v3.6.0-rc1~100^2 (libarchive: Drop early use of crypto
library, 2016-05-03) we accidentally dropped the include directory for
OpenSSL as well as the library.  Without that, it works only
accidentally when CHECK_CRYPTO happens to choose the OpenSSL
implementation and add the include directory.

Reported-by: Bradley Lowekamp <blowekamp@mail.nih.gov>
 2016-06-07 15:05:11 -04:00
Brad King
cd1f0a824e Merge branch 'update-expat' into release 2016-06-06 09:10:48 -04:00
Brad King
182f645801 Merge branch 'upstream-expat' into update-expat 
* upstream-expat:
  expat 2016-06-05 (2b9cb7f5)
 2016-06-06 09:08:33 -04:00
Expat Upstream
eb83112347 expat 2016-06-05 (2b9cb7f5) 
Code extracted from:

    http://git.code.sf.net/p/expat/code_git

at commit 2b9cb7f5b59397d2d04117a419cd3d9d50f4a1ed (master).
 2016-06-06 09:08:21 -04:00
Brad King
cd1327bb9c Merge branch 'SunOS-PathScale' into release 2016-06-06 09:01:00 -04:00
Michał Górny
fcfe121fd8 Platform: add flag definitions for PathScale compiler on SunOS (#16135) 2016-06-06 08:58:20 -04:00
Brad King
236b7cbe6e Merge branch 'FindLibArchive-3.2' into release 2016-06-03 13:27:34 -04:00
Orion Poplawski
38d18bab54 FindLibArchive: Support libarchive 3.2 version string format 2016-06-03 13:18:03 -04:00
Brad King
9703b32c1c Merge branch 'FindHDF5-fix-already-found' into release 2016-06-02 14:56:09 -04:00