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

24637 Commits

Author SHA1 Message Date
Brad King 3c0652f8bf Merge topic 'testRST-no-preprocessor-FILE' 
218699eb Tests: Fix CMakeLib.testRST for relative __FILE__
 2014-06-09 10:28:42 -04:00
Brad King 8c29d8d1e7 Merge topic 'hpux-libarchive-compile' 
478b1c8b libarchive: fix compilation on newer HP-UX versions
 2014-06-09 10:28:40 -04:00
Brad King d20792f302 Merge topic 'windows-RC-extension' 
514c2e3d CMakeRCCompiler: Handle uppercase 'RC' as resource file format extension
 2014-06-09 10:28:38 -04:00
Brad King bf022b7963 Merge topic 'xcode15-fix-RunCMake-TargetSources' 
0366ba5d Tests: Fix RunCMake.TargetSources on Xcode 1.5
 2014-06-09 10:28:36 -04:00
Brad King 81ddcaa67b Merge topic 'FindOpenGL-target' 
94770baf FindOpenGL: Fix typo in documented target name
 2014-06-09 10:28:35 -04:00
Brad King 9af1f985fd Merge topic 'fix-ctest-label-regex' 
887532f0 CTest: Fix combined inclusive/exclusive label regular expressions
 2014-06-09 10:28:33 -04:00
Stephen Kelly 62863106f0 WCDH: Add compatibility defines for deprecation. 2014-06-09 10:28:24 -04:00
Rolf Eike Beer 478b1c8b36 libarchive: fix compilation on newer HP-UX versions 
Newer HP-UX versions (e.g. 11.31) also offers F_SETTIMES, but with a different
struct for the timing information.

Suggested-by: Eric Berge <ericmberge@gmail.com>
 2014-06-09 10:15:27 -04:00
Brad King 94770baf30 FindOpenGL: Fix typo in documented target name 
We provide "OpenGL::GL", not "OpenGL::OpenGL".

Reported-by: Daniel Pfeifer
 2014-06-09 08:54:22 -04:00
Kitware Robot 2649d79470 CMake Nightly Date Stamp 2014-06-09 00:01:06 -04:00
Kitware Robot c4fe537562 CMake Nightly Date Stamp 2014-06-08 00:01:07 -04:00
Kitware Robot fc7d878616 CMake Nightly Date Stamp 2014-06-07 00:01:14 -04:00
Brad King 42f74df6d4 Add basic Android platform module 
Create a Platform/Android module that includes Platform/Linux since
Android is based on Linux.  Provide only the minimal settings needed to
get builds with Android NDK toolchains to work.

Disable use of RPATH since the Android loader ignores it and we cannot
predict the install destination anyway.

Android supports soname but shared library names must end in ".so" and
we cannot represent the versioned names with associated symlinks on all
host operating systems anyway.  However, we do want the SONAME of
library files to be set so that linking to them by path to the library
file produces NEEDED entries with the soname and not the path.  Add a
new CMAKE_PLATFORM_NO_VERSIONED_SONAME setting to tell the
cmTarget::GetLibraryNames method that not to use the VERSION or
SOVERSION target properties in the soname.
 2014-06-06 14:03:42 -04:00
Brad King 218699eb28 Tests: Fix CMakeLib.testRST for relative __FILE__ 
Pass the test input directory as a runtime argument instead of
depending on __FILE__ to locate it.
 2014-06-06 10:39:45 -04:00
Brad King 0366ba5db6 Tests: Fix RunCMake.TargetSources on Xcode 1.5 
Xcode 1.5 does not support multiple configurations.  The generator also
adds some sources internally that cause extra OriginDebug output.
Update the expected output to tolerate it.
 2014-06-06 10:28:32 -04:00
Tim Blechmann 514c2e3d9e CMakeRCCompiler: Handle uppercase 'RC' as resource file format extension 
We already match lowercase 'rc'.  Add 'RC' too.  The latter is listed in
other CMake<LANG>Compiler modules as ignored for their languages already.

Signed-off-by: Tim Blechmann <tim@klingt.org>
 2014-06-06 10:11:15 -04:00
Brad King 86be733fa5 cmGeneratorExpression: Add workaround for Borland compiler 2014-06-06 09:51:33 -04:00
Brad King 618b7df5bf Merge topic 'FindOpenGL-target' 
b7804cb6 FindOpenGL: Provide imported targets for GL and GLU
 2014-06-06 09:44:57 -04:00
Brad King c6e7c18bcc Merge topic 'xcode-15-string-apis' 
23dc6aa1 Xcode: Fix single-configuration generation for version 1.5
 2014-06-06 09:44:55 -04:00
Brad King 09c5fdfaa3 Merge topic 'compile-OBJECT_FILE_DIR' 
8256ccb7 Add OBJECT_FILE_DIR rule placeholder for compilation lines
 2014-06-06 09:44:53 -04:00
Brad King 6e68df8fa6 Merge topic 'dev/fix-complex-tests' 
7db77a82 tests: allow RelWithDebInfo and MinSizeRel configs to work
 2014-06-06 09:44:51 -04:00
Brad King 2292b82b1d Merge topic 'watcom-overhaul-notes' 
559ae189 Help: Add notes about new OpenWatcom compiler id and versioning
 2014-06-06 09:44:49 -04:00
Nils Gladitz 887532f0f0 CTest: Fix combined inclusive/exclusive label regular expressions 2014-06-06 10:28:18 +02:00
Kitware Robot 47cde18849 CMake Nightly Date Stamp 2014-06-06 00:01:08 -04:00
Brad King 559ae18901 Help: Add notes about new OpenWatcom compiler id and versioning 2014-06-05 14:50:59 -04:00
Philipp Möller b7804cb6ce FindOpenGL: Provide imported targets for GL and GLU 
Create OpenGL::GL and OpenGL::GLU imported targets using the locations
found.
 2014-06-05 14:29:45 -04:00
Brad King 5b7fa0e75e Merge topic 'FindOpenGL-docs' 
0496c430 FindOpenGL: Organize and format module documentation
 2014-06-05 14:27:59 -04:00
Ben Boeckel 3495ab0a81 tests: update unused variable test expected output 
The expected output is now a relative path, not a full path. Update the
pass/fail detection accordingly.
 2014-06-05 12:44:19 -04:00
Ben Boeckel 2a1b2d8486 backtrace: Convert to local paths in IssueMessage 
This is the only place we care show the FilePath to the user, so defer
the expensive relative path calculation until here.
 2014-06-05 12:44:19 -04:00
Ben Boeckel a08292059e genex: remove the need for backtraces 
Rather than making dummy backtraces and passing them around, just make
backtraces optional.
 2014-06-05 12:44:18 -04:00
Ben Boeckel efc205695d cmake: remove dummy backtraces for IssueMessage 2014-06-05 12:44:17 -04:00
Ben Boeckel d46c650d67 cmMakefile: return a backtrace 
This allows backtraces to be fully controlled by the makefile rather
than externally (and makes changing how they are manipulated easier).
 2014-06-05 12:44:04 -04:00
Ben Boeckel 7db77a828a tests: allow RelWithDebInfo and MinSizeRel configs to work 2014-06-05 12:42:13 -04:00
Brad King 88818b6805 Merge topic 'delay-generator-toolset' 
528e8af1 Allow a toolchain file to specify a generator toolset
98afb454 VS: Split user- and generator-provided PlatformToolset
3e9f6e36 Xcode: Rename internal variable {Platform => Generator}Toolset
 2014-06-05 11:31:00 -04:00
Brad King 64f3993220 Merge branch 'release' 2014-06-05 10:57:21 -04:00
Brad King eca798149b Merge branch 'fix-ctest-option-summary' into release 2014-06-05 10:57:02 -04:00
Brad King e319a3e1e5 Merge topic 'minor-help-cleanup' 
7eef823e Help: Add comma to assist parsing of ctest_build command docs.
5fb9b16d Help: Document that file(GENERATE) re-writes only when needed.
95135ac3 Help: Add missing external link marker.
 2014-06-05 10:55:33 -04:00
Brad King 2db73edc5c Merge topic 'fix-ctest-option-summary' 
6446eb09 CTest: Added option description for --output-on-failure
 2014-06-05 10:55:31 -04:00
Brad King 994f4b71fc Merge topic 'expand_cobertura_coverage' 
50daf239 CTest: Generalize Cobertura coverage format handling
a2822d30 CTest: Rename coverage implementation for "Python" to "Cobertura"
 2014-06-05 10:55:29 -04:00
Brad King 5d360f23fa Merge topic 'setlocale' 
730e3862 Encoding: Add setlocale() to applications.
 2014-06-05 10:55:27 -04:00
Nils Gladitz 6446eb099a CTest: Added option description for --output-on-failure 
Without it the option list is cut short after --debug.
 2014-06-05 10:51:39 -04:00
Philipp Möller 0496c4302e FindOpenGL: Organize and format module documentation 2014-06-05 09:58:40 -04:00
Brad King 23dc6aa194 Xcode: Fix single-configuration generation for version 1.5 
In commit 84fdc992 (stringapi: Pass configuration names as strings,
2014-02-09) a few code paths for the Xcode 1.5 single-configuration
generator were not updated to use an empty configuration name instead of
a NULL pointer when no configuration is specified in CMAKE_BUILD_TYPE.
Fix them now.
 2014-06-05 09:43:13 -04:00
Brad King 8256ccb78c Add OBJECT_FILE_DIR rule placeholder for compilation lines 
Some compilers do not offer an option to specify the path to the object
file, but rather only to the directory in which to place the object
file.  See issue 14876 for some examples.  Add a new OBJECT_FILE_DIR
placeholder to specify the directory containing the object file for the
current compilation.  This may differ from the main target OBJECT_DIR
when the object corresponds to a source in a subdirectory.
 2014-06-05 08:58:29 -04:00
Stephen Kelly b70295760c Project: Add configurable name for version computation macros. 2014-06-05 14:02:52 +02:00
Stephen Kelly 78acaafebe Project: Separate simulated compiler id from version detection. 2014-06-05 14:02:52 +02:00
Stephen Kelly 567af1a596 WCDH: Issue a better message for version compatibility. 2014-06-05 13:58:27 +02:00
Stephen Kelly 7eef823e14 Help: Add comma to assist parsing of ctest_build command docs. 2014-06-05 11:58:49 +02:00
Stephen Kelly 5fb9b16d0c Help: Document that file(GENERATE) re-writes only when needed. 2014-06-05 11:58:02 +02:00
Stephen Kelly 95135ac336 Help: Add missing external link marker. 2014-06-05 11:57:25 +02:00