Commit Graph

21338 Commits

Author SHA1 Message Date
Brad King 635e19d607 Merge branch 'upstream-kwsys' into update-kwsys 2013-07-11 09:04:05 -04:00
KWSys Robot 0a44fa4c6c KWSys 2013-07-10 (beef6819)
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ beef6819 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' f6c4c247..beef6819
Brad King (1):
      beef6819 SystemTools: Implement IsSubDirectory without loop

Change-Id: Ifab0c0384c7fbf1f9fc934918573a49b38f7bc0a
2013-07-11 09:03:59 -04:00
Kitware Robot 4dc515f8e1 CMake Nightly Date Stamp 2013-07-11 00:01:04 -04:00
Kitware Robot a18e9586db CMake Nightly Date Stamp 2013-07-10 00:01:06 -04:00
Kitware Robot d2fb62e916 CMake Nightly Date Stamp 2013-07-09 00:01:04 -04:00
Kitware Robot 448a677148 CMake Nightly Date Stamp 2013-07-08 00:01:05 -04:00
Kitware Robot 14eb4a1dc7 CMake Nightly Date Stamp 2013-07-07 00:01:03 -04:00
Kitware Robot dd24c60fe7 CMake Nightly Date Stamp 2013-07-06 00:01:03 -04:00
Kitware Robot bdc66ea7c5 CMake Nightly Date Stamp 2013-07-05 00:01:04 -04:00
Kitware Robot 1101350f76 CMake Nightly Date Stamp 2013-07-04 00:01:05 -04:00
Brad King 99a814e5b9 Merge branch 'release' 2013-07-03 15:35:34 -04:00
Kitware Robot 287bbab7d4 CMake Nightly Date Stamp 2013-07-03 00:01:05 -04:00
Brad King 3173c93756 Merge topic 'Fortran-explicit-types'
7b5bc2c Fortran: Use explicit type in Fortran 90 check
2013-07-02 09:05:28 -04:00
Brad King 0e9ff1cb3b Merge topic 'update-kwsys'
c314da0 Merge branch 'upstream-kwsys' into update-kwsys
2e3c935 KWSys 2013-07-01 (f6c4c247)
2013-07-02 09:05:14 -04:00
Brad King 8b23045490 Merge topic 'FindGTK2vd2'
60e4555 FindGTK2: Add GTK2_DEFINITIONS variable
2013-07-02 09:05:05 -04:00
Brad King 31d55ee8ac Merge topic 'FindGTK2vs11'
eb16301 FindGTK2: Do not fail on MSVC11 if vc100 libraries are available
2013-07-02 09:04:12 -04:00
Brad King 357db89d27 Merge topic 'make-depends-collapse-paths'
551d334 cmDependsC: Collapse relative include paths
2013-07-02 09:03:52 -04:00
Brad King 000793aae7 Merge topic 'SelectLibraryConfigurations-cached-library'
c4bcc56 SelectLibraryConfigurations: Fix for cached <base>_LIBRARY
2013-07-02 08:39:36 -04:00
Brad King 3bff90f866 CMake 2.8.11.2 2013-07-02 08:39:24 -04:00
Brad King b6f01d4560 Merge topic 'vs-generator-brief-doc-update'
52f1464 VS: Clarify Visual Studio product year for each version
2013-07-02 08:38:57 -04:00
Brad King acff729701 Merge branch 'vs-generator-brief-doc-update' into release 2013-07-02 08:36:12 -04:00
Brad King c9697fa611 Merge branch 'vs12-generator' into release 2013-07-02 08:35:49 -04:00
Brad King 8857afa05e Merge branch 'curl-bug-1192' into release 2013-07-02 08:35:43 -04:00
Brad King 04897c02cc Merge branch 'sha2-alignment' into release 2013-07-02 08:35:39 -04:00
Brad King d9ece45a36 Merge branch 'FixAsmSupport' into release 2013-07-02 08:35:33 -04:00
Brad King 5bcca28096 Merge branch 'SelectLibraryConfigurations-cached-library' into release 2013-07-02 08:35:28 -04:00
Robert Maynard 52f146414f VS: Clarify Visual Studio product year for each version
Add to the brief documentation of the Visual Studio 10, 11, and 12
generators the corresponding VS product year.  Clarify that VS11 is for
Visual Studio 2012, and VS12 is for Visual Studio 2013.
2013-07-02 08:24:38 -04:00
Bjoern Thiel c4bcc56156 SelectLibraryConfigurations: Fix for cached <base>_LIBRARY
The line

  set( ${basename}_LIBRARY )

removes the normal variable, but if the corresponding cached variable is
present then line

  list( APPEND ${basename}_LIBRARY optimized "${_libname}" )

uses that and fails.  Replace the original line with

  set( ${basename}_LIBRARY "" )

to set the normal variable to empty instead of unsetting it.
2013-07-02 08:21:16 -04:00
Kitware Robot 7b276a3b5d CMake Nightly Date Stamp 2013-07-02 00:01:03 -04:00
Brad King 7b5bc2c6f0 Fortran: Use explicit type in Fortran 90 check
In CMakeTestFortranCompiler we build a test program using a Fortran 90
construct to check whether the compiler supports the language.  Some
compilers have options to require explicit variable types.  Fix the test
program to use an explicit variable type so it passes under such a
configuration.

Suggested-by: Neil Carlson <neil.n.carlson@gmail.com>
2013-07-01 15:10:08 -04:00
Brad King c314da004a Merge branch 'upstream-kwsys' into update-kwsys 2013-07-01 09:36:48 -04:00
KWSys Robot 2e3c935284 KWSys 2013-07-01 (f6c4c247)
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ f6c4c247 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 3d1d4e7c..f6c4c247
Sean McBride (1):
      f6c4c247 RegularExpression: Remove 'register' storage specifier

Change-Id: I755712879ab86fa163f5fce684fff2f0ecd8ab99
2013-07-01 09:36:43 -04:00
Brad King 8a08ab051a Merge topic 'vs12-generator'
9a76d83 VS12: Find proper MSBuild for VSProjectInSubdir test
4e5cb39 Merge branch 'master' into vs12-generator
78fdbbc FindBoost: Add -vc120 mangling for VS 12
e99d7b1 VS12: Generate flag tables from MSBuild v120 tool files
77ac9b8 VS12: Add Visual Studio 12 generator (#14251)
2013-07-01 09:27:33 -04:00
Brad King 526f1e636e Merge topic 'clang-register-warnings'
e1381b1 Document removal of 'register' from flex/bison output
1399825 Remove some uses of obsolete 'register' storage specifier
2013-07-01 09:24:22 -04:00
Brad King 5f36fa98ff Merge topic 'AddAutomocTargetFolder'
ba0e06f automoc: add a global AUTOMOC_TARGETS_FOLDER property
2013-07-01 09:22:22 -04:00
Brad King 51406e2532 Merge topic 'DontStripImportLibs'
ae8e654 install: do not strip dll import libraries (#14123)
2013-07-01 09:21:28 -04:00
Brad King 7c92d0dade Merge topic 'CMakeDetermineVSServicePack-vs11'
f449c68 CMakeDetermineVSServicePack: Add VS 11 update 3
2013-07-01 09:20:00 -04:00
Brad King be9a80a088 Merge topic 'vs-windows-forms'
6c9712c VS: Add Resx configuration to the vcxproj file
2013-07-01 09:18:06 -04:00
Brad King c46142bcae Merge topic 'split-GeneratorExpression-test'
cacb938 Split the GeneratorExpression test into a third part.
2013-07-01 09:16:09 -04:00
Brad King 62428f5e72 Merge topic 'ninja_phony_targets'
539356f Ninja: Custom Command file depends don't need to exist before building
874e171 Ninja: GlobalNinjaGenerator WriteBuild and WritePhonyBuild non static
88d27ad Add a test to expose a bug with add_custom_command and ninja.
2013-07-01 09:15:09 -04:00
Brad King 07095e1ea7 Merge topic 'compiler-version-genex'
47a8db5 Add generator expressions for compiler versions.
2013-07-01 09:12:32 -04:00
Brad King 84cb494703 Merge topic 'curl-bug-1192'
e643e02 cmcurl: Backport curl bug 1192 fix (#14250)
2013-07-01 09:12:00 -04:00
Robert Maynard 539356f128 Ninja: Custom Command file depends don't need to exist before building
When converting custom commands for the ninja build system we
need to make sure that any file dependencies that exist in the build
tree are converted to phony targets. This tells ninja that these
files might not exist when starting the build, but could be generated
during the build.

This is done by tracking all dependencies for custom command targets.
After all have been written out we remove all items from the set
that have been seen as a target, custom command output, an alias,
or a file in the source directory. Anything that is left is considered
to be a file that will be generated as a side effect of another
custom command.
2013-07-01 09:01:01 -04:00
Robert Maynard 874e17120d Ninja: GlobalNinjaGenerator WriteBuild and WritePhonyBuild non static
To properly track the usage of dependencies that are generated at
compile time as the side effect of other build steps we need
to make the WriteBuild and WritePhonyBuild commands non static
2013-07-01 08:59:38 -04:00
Alex Neundorf ae8e6543a5 install: do not strip dll import libraries (#14123)
DLL import libraries exist specifically to have symbols.
2013-07-01 08:56:03 -04:00
Kitware Robot 6e77c2b586 CMake Nightly Date Stamp 2013-07-01 00:01:03 -04:00
Kitware Robot 0c8eee4144 CMake Nightly Date Stamp 2013-06-30 00:01:03 -04:00
Daniele E. Domenichelli 60e4555c89 FindGTK2: Add GTK2_DEFINITIONS variable
According to https://wiki.gnome.org/gtkmm/MSWindows on MSVC the /vd2
flag should be passed to the compiler in order to use gtkmm
2013-06-29 16:44:57 +02:00
Daniele E. Domenichelli eb1630112d FindGTK2: Do not fail on MSVC11 if vc100 libraries are available 2013-06-29 15:27:58 +02:00
Kitware Robot e021d33f9c CMake Nightly Date Stamp 2013-06-29 00:01:05 -04:00