Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmake | Robert Maynard | 2016-06-24 | 1 | -0/+4 |
| | |||||
* | FindHDF5: cache the correct path to the high level libraries | Robert Maynard | 2016-06-24 | 1 | -3/+3 |
| | |||||
* | FindHDF5: When component targets not found fallback to compiler wrappers | Robert Maynard | 2016-06-23 | 1 | -0/+6 |
| | |||||
* | FindHDF5: Handle HDF5 builds with non-suffixed components | Robert Maynard | 2016-06-23 | 1 | -0/+7 |
| | |||||
* | FindHDF5: correctly add lang to each component target name. | Robert Maynard | 2016-06-23 | 1 | -1/+1 |
| | |||||
* | CMake 3.6.0-rc3v3.6.0-rc3 | Brad King | 2016-06-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'doc-VS_STARTUP_PROJECT-clarify' into release | Brad King | 2016-06-21 | 1 | -1/+7 |
|\ | |||||
| * | Help: Clarify VS_STARTUP_PROJECT documentation | Brad King | 2016-06-21 | 1 | -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 release | Brad King | 2016-06-20 | 19 | -49/+88 |
|\ \ | |||||
| * \ | Merge branch 'upstream-LibArchive' into update-libarchive | Brad King | 2016-06-20 | 19 | -49/+88 |
| |\ \ | | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2016-06-19 (139d0576) | ||||
| | * | | LibArchive 2016-06-19 (139d0576) | LibArchive Upstream | 2016-06-20 | 22 | -52/+91 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 139d0576b51a253732a5ab1f66805dffbf8b00af (master). | ||||
* | | | | Merge branch 'cpack-deb-test-fixes' into release | Brad King | 2016-06-20 | 3 | -10/+13 |
|\ \ \ \ | |||||
| * | | | | CPack/Deb: Fix test to actually test the preinst script | Domen Vrankar | 2016-06-20 | 1 | -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 systems | Domen Vrankar | 2016-06-20 | 3 | -10/+13 |
| | |_|/ | |/| | | | | | | | | | | Suggested-by: Patrick <mail6543210@yahoo.com.tw> | ||||
* | | | | Merge branch 'pkgconfig-targets' into release | Brad King | 2016-06-20 | 1 | -2/+6 |
|\ \ \ \ | |||||
| * | | | | FindPkgConfig: define the imported targets also when the data comes from cache | Rolf Eike Beer | 2016-06-19 | 1 | -2/+6 |
| |/ / / | |||||
* | | | | Merge branch 'FindQt4-doc-QtDeclarative-imported' into release | Brad King | 2016-06-20 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | FindQt4: Document Qt4::QtDeclarative imported target (#16157) | Brad King | 2016-06-20 | 1 | -0/+2 |
| |/ / / | |||||
* | | | | Merge branch 'doc-issue-tracker-move' into release | Brad King | 2016-06-17 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | README: Update Issue Tracker link to new location | Brad King | 2016-06-17 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'CodeBlocks-include-order' into release | Brad King | 2016-06-17 | 1 | -7/+11 |
|\ \ \ \ | |||||
| * | | | | cmExtraCodeBlocksGenerator: Do not shuffle include directories | Tobias Hunger | 2016-06-17 | 1 | -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 release | Brad King | 2016-06-17 | 2 | -2/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | VS: Fix regressed mapping for the cl `/Os` compiler flag | Brad King | 2016-06-17 | 2 | -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-rc2 | Brad King | 2016-06-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'bash-completion' into release | Brad King | 2016-06-10 | 3 | -2/+53 |
|\ \ \ | |||||
| * | | | bash-completion: Add cpack --help-{manual,module,policy,property} | Eric NOULARD | 2016-06-10 | 1 | -0/+20 |
| | | | | |||||
| * | | | bash-completion: Add ctest --help-{manual,module,policy,property,variable} | Eric NOULARD | 2016-06-10 | 1 | -0/+26 |
| | | | | |||||
| * | | | bash-completion: Fix cmake --help-policy lookup | Eric NOULARD | 2016-06-10 | 1 | -2/+2 |
| | | | | |||||
| * | | | bash-completion: Add cmake --help-manual | Eric NOULARD | 2016-06-10 | 1 | -0/+5 |
| |/ / | |||||
* | | | Merge branch 'cmake-gui-osx-symlink-qt5-plugin' into release | Brad King | 2016-06-09 | 1 | -0/+34 |
|\ \ \ | |||||
| * | | | cmake-gui: Teach Qt5 where plugins are when launched through a symlink | Robert Maynard | 2016-06-09 | 1 | -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 release | Brad King | 2016-06-08 | 2 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | Help: Document CTest Git fetch-and-reset behavior | Brad King | 2016-06-08 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Help: Document ctest_update branch following behavior | Brad King | 2016-06-08 | 1 | -0/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'fix-libarchive-openssl-no-hashes' into release | Brad King | 2016-06-07 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | libarchive: Restore OpenSSL include directory from upstream | Brad King | 2016-06-07 | 1 | -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 release | Brad King | 2016-06-06 | 8 | -295/+433 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'upstream-expat' into update-expat | Brad King | 2016-06-06 | 8 | -295/+433 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | * upstream-expat: expat 2016-06-05 (2b9cb7f5) | ||||
| | * | | | expat 2016-06-05 (2b9cb7f5) | Expat Upstream | 2016-06-06 | 9 | -295/+444 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://git.code.sf.net/p/expat/code_git at commit 2b9cb7f5b59397d2d04117a419cd3d9d50f4a1ed (master). | ||||
* | | | | | Merge branch 'SunOS-PathScale' into release | Brad King | 2016-06-06 | 4 | -0/+37 |
|\ \ \ \ \ | |||||
| * | | | | | Platform: add flag definitions for PathScale compiler on SunOS (#16135) | Michał Górny | 2016-06-06 | 4 | -0/+37 |
| |/ / / / | |||||
* | | | | | Merge branch 'FindLibArchive-3.2' into release | Brad King | 2016-06-03 | 1 | -4/+5 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | FindLibArchive: Support libarchive 3.2 version string format | Orion Poplawski | 2016-06-03 | 1 | -4/+5 |
| |/ / / | |||||
* | | | | Merge branch 'FindHDF5-fix-already-found' into releasev3.6.0-rc1 | Brad King | 2016-06-02 | 1 | -4/+11 |
|\ \ \ \ | |||||
| * | | | | FindHDF5: Add backwards compatability for already-found searches | Chuck Atkins | 2016-06-02 | 1 | -4/+11 |
| | | | | | |||||
* | | | | | Merge branch 'fix-TARGET_PROPERTY-LOCATION-crash' into release | Brad King | 2016-06-02 | 4 | -3/+23 |
|\ \ \ \ \ | |||||
| * | | | | | Fix crash on $<TARGET_PROPERTY:...,LOCATION> genex (#16134) | Brad King | 2016-06-02 | 4 | -3/+23 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Policy CMP0026 deprecated the LOCATION property, and we have long provided a $<TARGET_FILE:...> generator expression. However, if a project tries to use $<TARGET_PROPERTY:...,LOCATION> we should at least not crash. The compatibility implementation of the LOCATION property uses cmGlobalGenerator::CreateGenerationObjects to create the structures needed to evaluate the property before generation starts. The implementation assumed that accessing the property could only be done during configuration (via the typical get_property command use case). The $<TARGET_PROPERTY:...,LOCATION> genex causes the LOCATION property to be accessed during generation. Calling CreateGenerationObjects during generation blows away all the objects currently being used for generation and is not safe. Add a condition to call it only when configuration is not finished. | ||||
* | | | | | Merge branch 'fix-ti-link-order' into release | Brad King | 2016-06-02 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Compiler/TI: Pass libraries as last part to linker | Alexander Stein | 2016-06-02 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If e.g. libc.a is passed before any objects the linker raises the follwing warning: cannot resolve archive libc.a to a compatible library, as no input files have been encountered In the end the library is skipped and missing symbols occur. Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> |