summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'FindHDF5-handle-unsuffixed' into releaseBrad King2016-06-271-4/+21
|\
| * FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmakeRobert Maynard2016-06-241-0/+4
| |
| * FindHDF5: cache the correct path to the high level librariesRobert Maynard2016-06-241-3/+3
| |
| * FindHDF5: When component targets not found fallback to compiler wrappersRobert Maynard2016-06-231-0/+6
| |
| * FindHDF5: Handle HDF5 builds with non-suffixed componentsRobert Maynard2016-06-231-0/+7
| |
| * FindHDF5: correctly add lang to each component target name.Robert Maynard2016-06-231-1/+1
| |
* | Merge branch 'doc-osx-versions' into releaseBrad King2016-06-233-13/+43
|\ \
| * | Help: Describe VERSION and SOVERSION meanings for Mach-O binariesBartosz Kosiorek2016-06-233-13/+43
| |/
* | Merge branch 'backport-GetPrerequisites-typo' into releaseBrad King2016-06-231-1/+1
|\ \ | |/ |/|
| * GetPrerequisites: fix typo in commentRolf Eike Beer2016-06-221-1/+1
|/
* CMake 3.6.0-rc3v3.6.0-rc3Brad King2016-06-221-1/+1
|
* Merge branch 'doc-VS_STARTUP_PROJECT-clarify' into releaseBrad King2016-06-211-1/+7
|\
| * Help: Clarify VS_STARTUP_PROJECT documentationBrad King2016-06-211-1/+7
| | | | | | | | | | | | | | Explain in what directory the property should be set to affect the corresponding ``.sln`` file. Suggested-by: Stephen Kelly <steveire@gmail.com>
* | Merge branch 'update-libarchive' into releaseBrad King2016-06-2019-49/+88
|\ \
| * \ Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2016-06-2019-49/+88
| |\ \ | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2016-06-19 (139d0576)
| | * | LibArchive 2016-06-19 (139d0576)LibArchive Upstream2016-06-2022-52/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 139d0576b51a253732a5ab1f66805dffbf8b00af (master).
* | | | Merge branch 'cpack-deb-test-fixes' into releaseBrad King2016-06-203-10/+13
|\ \ \ \
| * | | | CPack/Deb: Fix test to actually test the preinst scriptDomen Vrankar2016-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test regex variable name was invalid and did not test preinst script. Reported-by: Patrick <mail6543210@yahoo.com.tw>
| * | | | CPack/Deb: Fix tests for SELinux-enabled systemsDomen Vrankar2016-06-203-10/+13
| | |_|/ | |/| | | | | | | | | | Suggested-by: Patrick <mail6543210@yahoo.com.tw>
* | | | Merge branch 'pkgconfig-targets' into releaseBrad King2016-06-201-2/+6
|\ \ \ \
| * | | | FindPkgConfig: define the imported targets also when the data comes from cacheRolf Eike Beer2016-06-191-2/+6
| |/ / /
* | | | Merge branch 'FindQt4-doc-QtDeclarative-imported' into releaseBrad King2016-06-201-0/+2
|\ \ \ \
| * | | | FindQt4: Document Qt4::QtDeclarative imported target (#16157)Brad King2016-06-201-0/+2
| |/ / /
* | | | Merge branch 'doc-issue-tracker-move' into releaseBrad King2016-06-171-1/+1
|\ \ \ \
| * | | | README: Update Issue Tracker link to new locationBrad King2016-06-171-1/+1
| |/ / /
* | | | Merge branch 'CodeBlocks-include-order' into releaseBrad King2016-06-171-7/+11
|\ \ \ \
| * | | | cmExtraCodeBlocksGenerator: Do not shuffle include directoriesTobias Hunger2016-06-171-7/+11
| | |/ / | |/| | | | | | | | | | | | | | Report include directories in a sensible order. Do not shuffle them when trying to make them unique.
* | | | Merge branch 'revert-vs-clang-minsize' into releaseBrad King2016-06-172-2/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | VS: Fix regressed mapping for the cl `/Os` compiler flagBrad King2016-06-172-2/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | CMake 3.6.0-rc2v3.6.0-rc2Brad King2016-06-131-1/+1
| | |
* | | Merge branch 'bash-completion' into releaseBrad King2016-06-103-2/+53
|\ \ \
| * | | bash-completion: Add cpack --help-{manual,module,policy,property}Eric NOULARD2016-06-101-0/+20
| | | |
| * | | bash-completion: Add ctest --help-{manual,module,policy,property,variable}Eric NOULARD2016-06-101-0/+26
| | | |
| * | | bash-completion: Fix cmake --help-policy lookupEric NOULARD2016-06-101-2/+2
| | | |
| * | | bash-completion: Add cmake --help-manualEric NOULARD2016-06-101-0/+5
| |/ /
* | | Merge branch 'cmake-gui-osx-symlink-qt5-plugin' into releaseBrad King2016-06-091-0/+34
|\ \ \
| * | | cmake-gui: Teach Qt5 where plugins are when launched through a symlinkRobert Maynard2016-06-091-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'doc-ctest_update' into releaseBrad King2016-06-082-0/+9
|\ \ \ \
| * | | | Help: Document CTest Git fetch-and-reset behaviorBrad King2016-06-081-0/+5
| | | | |
| * | | | Help: Document ctest_update branch following behaviorBrad King2016-06-081-0/+4
| | |/ / | |/| |
* | | | Merge branch 'fix-libarchive-openssl-no-hashes' into releaseBrad King2016-06-071-0/+1
|\ \ \ \
| * | | | libarchive: Restore OpenSSL include directory from upstreamBrad King2016-06-071-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'update-expat' into releaseBrad King2016-06-068-295/+433
|\ \ \ \
| * \ \ \ Merge branch 'upstream-expat' into update-expatBrad King2016-06-068-295/+433
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * upstream-expat: expat 2016-06-05 (2b9cb7f5)
| | * | | expat 2016-06-05 (2b9cb7f5)Expat Upstream2016-06-069-295/+444
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://git.code.sf.net/p/expat/code_git at commit 2b9cb7f5b59397d2d04117a419cd3d9d50f4a1ed (master).
* | | | | Merge branch 'SunOS-PathScale' into releaseBrad King2016-06-064-0/+37
|\ \ \ \ \
| * | | | | Platform: add flag definitions for PathScale compiler on SunOS (#16135)Michał Górny2016-06-064-0/+37
| |/ / / /
* | | | | Merge branch 'FindLibArchive-3.2' into releaseBrad King2016-06-031-4/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | FindLibArchive: Support libarchive 3.2 version string formatOrion Poplawski2016-06-031-4/+5
| |/ / /
* | | | Merge branch 'FindHDF5-fix-already-found' into releasev3.6.0-rc1Brad King2016-06-021-4/+11
|\ \ \ \
generated by cgit v0.12 at 2025-01-20 14:56:01 (GMT)