kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
26,278 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

26278 Commits

Author SHA1 Message Date
Brad King a19a43a930 Merge topic 'ctest-coverage-extra-line-error' 
9c4984b4 ctest_coverage: Fix error message to report the file name
 2014-12-23 08:53:48 -05:00
Brad King 400af305ef Merge topic 'add-FindGSL' 
1b28e3b2 FindGSL: Add module to find the GNU Scientific Library
 2014-12-23 08:53:45 -05:00
Kitware Robot 7a2d1cd6d4 CMake Nightly Date Stamp 2014-12-23 00:01:15 -05:00
Brad King 6697765230 Merge topic 'backport-suncc-fixes' 
107dcac3 Fix compilation with the Oracle / Sun compiler (#15318)
 2014-12-22 14:26:10 -05:00
Brad King 6c39bc5520 Merge topic 'macho-parser' 
c294a115 Mach-O: Use Mach-O parser to extract install names instead of otool.
e42da307 Mach-O: Add Mach-O parser for OS X and iOS.
 2014-12-22 13:41:03 -05:00
Clinton Stimpson c294a115f2 Mach-O: Use Mach-O parser to extract install names instead of otool. 
This has much better performance than calling "otool" or "xcrun -r otool"
to extract install names for rpath support.

Fixes bug #15178.
 2014-12-22 11:33:00 -07:00
Clinton Stimpson e42da30782 Mach-O: Add Mach-O parser for OS X and iOS. 
This parser also supports fat binaries which archive multiple
Mach-O binaries.
 2014-12-22 11:32:10 -07:00
Brad King 99ca7a0391 Merge branch 'release' 2014-12-22 10:00:57 -05:00
Brad King 90f5845e72 Merge branch 'doc-mingw-makefiles' into release 2014-12-22 09:59:57 -05:00
Brad King 594db49e56 Merge topic 'doc-mingw-makefiles' 
844f98c1 Help: Clarify MinGW v. MSYS Makefiles generators (#15319)
 2014-12-22 09:59:11 -05:00
Brad King d760c3cbe8 Merge topic 'nightly-binary-updates' 
202056cd Utilities/Release: Build Windows and OS X binaries with native SSL
d64caa53 Utilities/Release: Fix name of OS X 10.6+ x86_64-only binary
 2014-12-22 09:59:09 -05:00
Vladislav Vinogradov 9c4984b4e5 ctest_coverage: Fix error message to report the file name 
Print file name instead of line content for "Looks like there are more
lines in the file:" error message.
 2014-12-22 09:25:24 -05:00
Brad King 202056cdb8 Utilities/Release: Build Windows and OS X binaries with native SSL 
For the nightly binaries, turn of CMAKE_USE_OPENSSL on Windows and OS X
10.6+ platforms.  This will activate the new curl behavior to use the
OS-native SSL/TLS implementation.
 2014-12-22 08:47:46 -05:00
Brad King d64caa5372 Utilities/Release: Fix name of OS X 10.6+ x86_64-only binary 
In commit v3.1.0-rc1~52^2 (Make the OSX 10.6+ release x86_64 only,
2014-09-29) we forgot to remove the name "universal" from the binary
name.  Since the binary is no longer universal, use "x86_64" instead.

While at it, update the deployment target to actually be 10.6.
 2014-12-22 08:47:19 -05:00
Kitware Robot d63609ed2a CMake Nightly Date Stamp 2014-12-22 00:01:08 -05:00
Kitware Robot 2c76f6f4da CMake Nightly Date Stamp 2014-12-21 00:01:07 -05:00
Kitware Robot 5bb0ae03ef CMake Nightly Date Stamp 2014-12-20 00:01:09 -05:00
Brad King 844f98c1fd Help: Clarify MinGW v. MSYS Makefiles generators (#15319) 
Explain the usage of each generator more clearly and reference each as
an alternative to the other.

Suggested-by: Craig Hicks <hicks111@hotmail.com>
 2014-12-19 09:07:25 -05:00
Brad King 852242b60d Merge topic 'bootstrap-solaris' 
44c6db6e bootstrap: Fix syntax for Solaris 10 shell (#15317)
 2014-12-19 08:27:01 -05:00
Brad King bf731becfa Merge topic 'update-kwsys' 
2e9acb6d Merge branch 'upstream-kwsys' into update-kwsys
1f7de543 KWSys 2014-12-18 (87c65319)
 2014-12-19 08:26:59 -05:00
Brad King ccd5822a83 Merge topic 'osx-cfbundle-tweaks' 
b189c599 Tests: Run CFBundleTest only with valid configuration
3a605693 Xcode: Call IsCFBundleOnApple to decide if bundle is being built
207b7af0 cmTarget: Use GetCFBundleDirectory within GetFullNameInternal
 2014-12-19 08:26:57 -05:00
Brad King 1ac8523c3b Merge topic 'install-EXPORT-absolute-prefix' 
dd089e08 install: Allow absolute EXPORT destination with relative targets (#15258)
 2014-12-19 08:26:55 -05:00
Brad King b189c5994d Tests: Run CFBundleTest only with valid configuration 
The verification script needs to know the configuration tested.
 2014-12-19 08:24:04 -05:00
Kitware Robot d48ccbe458 CMake Nightly Date Stamp 2014-12-19 00:01:09 -05:00
Chuck Atkins 107dcac3e0 Fix compilation with the Oracle / Sun compiler (#15318) 
One piece of code has some ambiguous type deduction that seems to
resolve correctly for most compilers but not for the Oracle compiler.
Make it more explicit.
 2014-12-18 11:23:41 -05:00
Brad King cbbe840e96 Merge branch 'bootstrap-solaris' into release 2014-12-18 11:10:09 -05:00
Brad King 44c6db6eb1 bootstrap: Fix syntax for Solaris 10 shell (#15317) 
In commit v3.1.0-rc2~7^2 (Workaround for short jump tables on PA-RISC,
2014-11-04) we added use of shell syntax not supported on the Solaris
shell.  Avoid using the '!' operator.

Reported-by: Friedrich Haubensak <hsk@imb-jena.de>
 2014-12-18 11:08:55 -05:00
Brad King 2e9acb6d43 Merge branch 'upstream-kwsys' into update-kwsys 2014-12-18 10:17:20 -05:00
KWSys Robot 1f7de54346 KWSys 2014-12-18 (87c65319) 
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ 87c65319 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' cc4046a8..87c65319
Sean McBride (1):
      87c65319 SharedForward: Suppress clang -Wcast-qual warnings with conditional pragma

Change-Id: I2f79780385aca7e0caa24e5bb0c0b4106b786c37
 2014-12-18 10:17:16 -05:00
Brad King cd7bde80bf Merge topic 'update-kwsys' 
3470704f Merge branch 'upstream-kwsys' into update-kwsys
6a5ab894 KWSys 2014-12-16 (cc4046a8)
 2014-12-18 10:16:42 -05:00
Brad King 45b1e31451 Merge topic 'vs-nsight-tegra-min-api' 
eeaa25e5 Add 'ANDROID_API_MIN' target property to set Android Target MIN API
 2014-12-18 10:16:40 -05:00
Brad King a39e65a817 Merge topic 'fix-sha2-cast-constness' 
d4d2d72f sha2: Fix -Wcast-qual warnings by adding const to some casts
 2014-12-18 10:16:38 -05:00
Brad King e7f26687ab Merge topic 'doc-INTERFACE-target-type' 
473446ab Help: Add INTERFACE_LIBRARY to TYPE target property documentation
 2014-12-18 10:16:36 -05:00
Brad King 0549694718 Merge topic 'test-memcheck-with-RunCMake' 
7ca6bdf0 Tests: Move CTestTestMemcheck tools into Tests/CMakeLib
1651dc96 Tests: Move CTestTestMemcheck cases into a RunCMake.CTestMemcheck test
 2014-12-18 10:16:31 -05:00
Brad King bdf278ad5f Merge topic 'curl-darwinssl' 
e4563257 curl: Use OS X SSL/TLS native implementation
 2014-12-18 10:16:29 -05:00
Brad King 7ca6bdf035 Tests: Move CTestTestMemcheck tools into Tests/CMakeLib 
The dummy memcheck tools we build for the RunCMake.CTestMemcheck tests
require CMakeLib, so put them in a Tests/CMakeLib/PseudoMemcheck
directory.
 2014-12-18 10:12:16 -05:00
Brad King 1651dc9668 Tests: Move CTestTestMemcheck cases into a RunCMake.CTestMemcheck test 
The CTestTestMemcheck test cases all try to check the ctest output with
a regular expression.  They fail intermittently due to ordering of the
portions of the output that come from stdout and stderr being mixed.
Convert all the test cases to use the RunCMake infrastructure to match
stdout and stderr separately.
 2014-12-18 10:12:15 -05:00
Brad King e4563257ba curl: Use OS X SSL/TLS native implementation 
On OS X, when CMAKE_USE_OPENSSL is OFF, use the OS implementation.
This will allow the OS-configured CA list to be trusted automatically.

This is supported on OS X 10.6 and above using AppleClang, Clang, and
GNU compilers.
 2014-12-18 09:44:19 -05:00
Kitware Robot 2a45da6ea4 CMake Nightly Date Stamp 2014-12-18 00:01:20 -05:00
Brad King 8af60777e2 Merge branch 'doc-INTERFACE-target-type' into release 2014-12-17 16:05:24 -05:00
Tim Blechmann 473446abfa Help: Add INTERFACE_LIBRARY to TYPE target property documentation 2014-12-17 16:03:29 -05:00
Brad King 3470704f5a Merge branch 'upstream-kwsys' into update-kwsys 2014-12-17 15:00:39 -05:00
KWSys Robot 6a5ab894fb KWSys 2014-12-16 (cc4046a8) 
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ cc4046a8 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' dec9c30b..cc4046a8
Brad King (2):
      9c3eacf8 Add CONTRIBUTING.rst file with instructions to contribute
      cc4046a8 Directory: Work around PGI problem with Linux Large File Support

Jean-Christophe Fillion-Robin (2):
      c38ba638 SystemInformation: Improve Get(Available/Total)VirtualMemory for windows
      58308145 SystemInformation: Improve comments in private implementation

Change-Id: Ic033444a9c03a8a8b5195e7dac108af2aec79fa6
 2014-12-17 15:00:15 -05:00
Brad King 9c7c6e434a Merge topic 'ctest_memcheck-no-empty-BC-output' 
1c812979 ctest_memcheck: Do not open empty BC output file name
 2014-12-17 14:54:14 -05:00
Brad King 70ffd71db1 Merge topic 'test-RunCMake-updates' 
29533380 Tests: Allow RunCMake expected result code to be a regex
a85ee8b8 Tests: Simplify RunCMake test extra argument passing
da7155f5 Tests: Allow RunCMake tests to pass generator expressions
 2014-12-17 14:44:22 -05:00
Brad King f408667d19 Merge topic 'fix_coverage_scanbuild_errors' 
0622f92d CTest: Remove code to fix scanbuild errors
 2014-12-17 14:44:19 -05:00
Brad King 4e61edc457 Merge topic 'test-CheckSourceTree-update' 
2a3e2631 Tests: Fix CheckSourceTree test for newer Git
 2014-12-17 14:44:17 -05:00
Brad King bd62c52115 Merge topic 'doc-custom-command-depends' 
953d34fd Help: Document MAIN_DEPENDENCY limitation in add_custom_command
9859042c Help: Mention add_dependencies in add_custom_target DEPENDS option
 2014-12-17 14:44:15 -05:00
Brad King 1dc6f6f8a1 Merge branch 'release' 2014-12-17 14:04:47 -05:00
Sean McBride d4d2d72f5d sha2: Fix -Wcast-qual warnings by adding const to some casts 2014-12-17 13:53:04 -05:00