Commit Graph

6521 Commits

Author SHA1 Message Date
Brad King 40d5375cf1 Merge branch 'nsis-protect-uninst-exec' into release 2016-07-21 10:08:33 -04:00
Justin Clift 11768733d3 NSIS: Quote uninstaller path when executing it in a shell
Protect our `$0` reference in the shell as `"$0"`.  Otherwise it works
with a space in the path only due to an insecure Windows feature.

Prior to this fix, any installer using the option added by commit
v2.8.9~234^2 (Added CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL,
2011-06-11) exposes a local privilege escalation vulnerability.

Reported-by: Amir Szekely <kichik@gmail.com>
Reported-by: Ug_0 Security
2016-07-21 10:05:46 -04:00
Brad King 9c9ac043b4 Merge branch 'FindHDF5-fix-misc-issues' into release 2016-07-13 08:57:16 -04:00
Chuck Atkins d5e4516ec2 FindHDF5: Cleanup inconsistent use of HDF5_ROOT 2016-07-12 15:32:10 -04:00
Chuck Atkins 4ece8bdd0f FindHDF5: Properly fail when required components are not found. 2016-07-12 13:40:41 -04:00
Chuck Atkins 87c1cd9c51 FindHDF5: Fix h5cc arg parsing to work with homebrew on Mac 2016-07-12 11:08:11 -04:00
Alex Turbov 672e6d2e20 CPack/RPM: Add missed CPACK_RPM_FILE_NAME fallback variable
In commit v3.6.0-rc1~66^2 (CPack/RPM different package names,
2016-05-15) we forgot the non-uppercased fallback variable name
`CPACK_RPM_<COMPONENT>_FILE_NAME`.  Add it now.
2016-07-11 11:19:24 -04:00
Brad King c7e0c3005b Merge branch 'FindJNI-ubuntu-paths' into release 2016-07-05 14:34:02 -04:00
O Libre 26d16380b0 FindJNI: Fix support for Ubuntu 15.10
The library search paths added by commit v3.6.0-rc1~281^2~1 (FindJNI:
Add support for Ubuntu 15.10, 2016-03-08) were incorrect.  Fix them.
2016-07-05 14:33:46 -04:00
Brad King dab3ccf294 InstallRequiredSystemLibraries: Document UCRT option use case
Suggested-by: Hendrik Sattler <post@hendrik-sattler.de>
2016-06-30 08:54:46 -04:00
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
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
Rolf Eike Beer 460a589d20 GetPrerequisites: fix typo in comment 2016-06-22 21:38:08 +02: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 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 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
Chuck Atkins f11243d13e FindHDF5: Add backwards compatability for already-found searches 2016-06-02 14:46:32 -04:00
Alexander Stein 89317915d9 Compiler/TI: Pass libraries as last part to linker
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>
2016-06-02 09:39:25 -04:00
Brad King 62adedbf5e Merge topic 'UseJava-fix-typo'
bcf39688 UseJava: Fix grammar error in documentation
2016-06-01 09:05:58 -04:00
Domen Vrankar 20e55e4be8 CPackRPM and CPackDeb documentation improvements 2016-06-01 08:29:34 -04:00
Matthew Woehlke bcf3968851 UseJava: Fix grammar error in documentation 2016-05-31 10:30:57 -04:00
Brad King 07983bcbfa Merge topic 'osx-no-warn-sdk-target-mismatch'
cffe0ed7 OS X: Drop warning about SDK and deployment target version mismatch
2016-05-27 09:08:15 -04:00
Brad King 579185be7a Merge topic 'cpack-dmg-no-app-link'
3acc29fc CPack/DragNDrop: Optionally disable `/Applications` symlink
2016-05-26 09:52:07 -04:00
Brad King 903bcbc39e Merge topic 'FindCUDA-cublas_device'
81e73b72 FindCUDA: Add support for finding the cublas_device library
2016-05-26 09:52:04 -04:00
Brad King 7bfcfd59fb Merge topic 'FindMatlab-2016a'
715e4cf5 FindMatlab: Add support for Matlab 2016a (9.0)
2016-05-26 09:51:58 -04:00
Brad King b86bcd4046 Merge topic 'GetPrerequisites-more-paths'
c9cebed5 GetPrerequisites: Look for VS tools using registry entries (#16108)
2016-05-26 09:51:56 -04:00
Brad King cffe0ed798 OS X: Drop warning about SDK and deployment target version mismatch
OS X supports using the SDK for any version equal to or newer than
the deployment target.  There is no reason to warn if the versions
do not match exactly.

Suggested-by: James Burgess <jamesrburgess@mac.com>
Suggested-by: Clinton Stimpson <clinton@elemtech.com>
2016-05-26 09:20:28 -04:00
Harry Mallon 3acc29fca9 CPack/DragNDrop: Optionally disable `/Applications` symlink 2016-05-25 09:51:04 -04:00
James Sharpe 81e73b7240 FindCUDA: Add support for finding the cublas_device library 2016-05-25 09:42:25 -04:00
Brad King 9ebc209288 Merge topic 'FindCUDA-flags-genex'
6b190b5c FindCUDA: Add support for generator expressions in CUDA_NVCC_FLAGS
2016-05-25 09:34:26 -04:00
Chuck Atkins 6b190b5c52 FindCUDA: Add support for generator expressions in CUDA_NVCC_FLAGS
Follow the configure_file by a file(GENERATE) so the resulting cmake
scripts used by FindCUDA for wrapping nvcc calls can now support
generator expressions in the CUDA_NVCC_FLAGS variable.
2016-05-25 09:31:35 -04:00
Francesco Romano 715e4cf57c FindMatlab: Add support for Matlab 2016a (9.0) 2016-05-25 09:08:32 -04:00
Brad King c9cebed5d8 GetPrerequisites: Look for VS tools using registry entries (#16108) 2016-05-25 09:00:33 -04:00
Brad King a98a699987 Merge topic 'cpack-deb-different-package-names'
adbd3985 CPack/Deb possibility to change package name
2016-05-24 13:54:03 -04:00
Brad King 384de98709 Merge topic 'cpack-deb-component-depends'
4f3b9706 CPack/Deb prevent accidental component dependencies
2016-05-24 13:54:00 -04:00
Brad King 185be83815 Merge topic 'ExternalProject-fix-stash-all'
2bc981e6 ExternalProject: Fix git stash not using "--all" option
2016-05-24 13:53:58 -04:00
Brad King 7d5355a21a Merge topic 'doc-CPACK_DMG_FORMAT'
239367f0 CPackDMG: Document CPACK_DMG_FORMAT default
2016-05-24 13:53:55 -04:00
Domen Vrankar 4f3b97063f CPack/Deb prevent accidental component dependencies
Prevent accidental inter component dependency setting
since this is a breaking feature in situations where
another CPack module is already using the feature.
It should be enabled if desired since it can cause
issues when upgrading only one of the components
for e.g. configuration instead of all the components
at once.
2016-05-23 20:21:32 +02:00