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

24548 Commits

Author SHA1 Message Date
Brad King 808f4b1fa4 VS: Re-order logic to group MS-tool-specific options together 2014-06-09 11:00:01 -04:00
Brad King 13e6d5595f VS: Set some options directly instead of using flag map 
Instead of passing /TC, /TP, and /STACK: as strings to be parsed through
the flag map, directly set the results in the options map.
 2014-06-09 10:59:59 -04:00
Brad King 8f4bdcc6cb VS: Remove always-true condition on compile options block 
The cmVisualStudio10TargetGenerator::ComputeClOptions method is
only called when the target type compiles, so do not duplicate
that check in the implementation.
 2014-06-09 10:59:57 -04:00
Brad King eaa9f2f8ee VS: Refactor internal generator factory logic 
Consume the space before the platform name as soon as possible
instead of including it in the comparison.
 2014-06-09 10:59:55 -04:00
Brad King 2b3e7b6f94 VS: Fix vcxproj specification of empty output file extension 
When a binary output file is to have no extension, the TargetExt
element in the vcxproj cannot be left empty because VS will choose
a default extension.  Instead use "." because the Windows filesystem
will treat that as an empty extension.
 2014-06-09 10:59:53 -04:00
Brad King 39af06e7f7 VS: Fix vcxproj elements specifying binary output locations 
Fix generation of OutDir, IntDir, TargetName, and TargetExt element
values to encode the values for XML.
 2014-06-09 10:59:51 -04:00
Brad King ee329d543c VS: Refactor flag table lookup 
In cmVisualStudio10TargetGenerator, convert the static functions
currently used to lookup the flag table for each tool into class
methods.  This avoids passing the this->LocalGenerator member and
gives the methods access to other information that may be useful
in the future.
 2014-06-09 10:59:48 -04:00
Brad King 9e8fa1043c Merge branch 'release' 2014-06-09 10:51:19 -04:00
Brad King f25a301f3a Merge branch 'hpux-libarchive-compile' into release 2014-06-09 10:39:00 -04:00
Rolf Eike Beer 4189a7f9a6 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:38:11 -04:00
Brad King 51775851f1 Merge topic 'hpux-libarchive-compile' 
4189a7f9 libarchive: fix compilation on newer HP-UX versions
 2014-06-09 10:37:19 -04:00
Brad King f56e74ef56 Merge topic 'hpux-libarchive-compile' 
c1ddd77d libarchive: Fix compilation on Tru64 with F_SETTIMES
 2014-06-09 10:36:13 -04:00
Brad King c1ddd77d0c libarchive: Fix compilation on Tru64 with F_SETTIMES 
The parent commit left a typo in the conditional code path for Tru64.
Add the missing '.'.
 2014-06-09 10:36:41 -04:00
Brad King 074ac5dbe9 Merge topic 'WriteCompilerDetectionHeader-deprecated-define' 
62863106 WCDH: Add compatibility defines for deprecation.
 2014-06-09 10:28:45 -04:00
Brad King a0861931ea Merge topic 'dev/backtrace-performance' 
86be733f cmGeneratorExpression: Add workaround for Borland compiler
3495ab0a tests: update unused variable test expected output
2a1b2d84 backtrace: Convert to local paths in IssueMessage
a0829205 genex: remove the need for backtraces
efc20569 cmake: remove dummy backtraces for IssueMessage
d46c650d cmMakefile: return a backtrace
 2014-06-09 10:28:44 -04:00
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 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