[Cmake-commits] CMake branch, master, updated. v2.8.11-84-g0dc0e7d

Brad King brad.king at kitware.com
Thu May 16 14:38:10 EDT 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  0dc0e7d88505be5ce77dc9762fe30d4218a720a5 (commit)
       via  7cc2805cd6da07ad4b38f072fea811bb5de4f729 (commit)
       via  2378a698a918c9d7f25e085480214bfb00171ecd (commit)
       via  56ca34dbbd9822083ee22976e1c1ede8705cd67f (commit)
       via  2bab472ecb2e5be31ea41e4035c3e4923b42c57c (commit)
       via  e619111d91a71c0aa80ddf45d981c8bed51ad805 (commit)
       via  5ca4336ece8975138bcbf7f3641c7646dd3653fc (commit)
       via  f57800d6f597ac812edb246b9b4cac2c8d238745 (commit)
       via  bf019d765d3993ba265c990a6e3a2e53defe112c (commit)
       via  ddac8d3d2d027dd50d729918078f57628855a568 (commit)
       via  86832cecd59b3a56c5a609742b43e5b1c9524c66 (commit)
      from  07afd4f37582ac0d3485df907120743fc5bd9a24 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0dc0e7d88505be5ce77dc9762fe30d4218a720a5
commit 0dc0e7d88505be5ce77dc9762fe30d4218a720a5
Merge: 07afd4f 7cc2805
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 16 14:38:07 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 16 14:38:07 2013 -0400

    Merge topic 'doc-improvements'
    
    7cc2805 Docs: Clarify wording "flag used" => "flag (to|will) be used"
    2378a69 Docs: Clarify that CMAKE_*_(PREFIX|SUFFIX) affect filenames
    56ca34d Docs: Update description of CMAKE_(BUILD_TYPE|CONFIGURATION_TYPES)
    2bab472 VS10: add detailed comment about MIDL processing
    e619111 Explain distribution of Win9x binary on all Windows versions.
    5ca4336 FindwxWidgets: add DOC strings with usual style
    f57800d Fix spelling and typos (product names)
    bf019d7 Fix spelling and typos (non-binary)
    ddac8d3 Fix spelling and typos (affecting binary data / module messages)
    86832ce Fix spelling and typos (affecting users)

diff --cc Modules/FindOpenSSL.cmake
index a7224ea,06c9d28..9851f67
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@@ -140,10 -140,10 +140,10 @@@ if(WIN32 AND NOT CYGWIN
  
      set( OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
    elseif(MINGW)
-     # same player, for MingW
+     # same player, for MinGW
      set(LIB_EAY_NAMES libeay32)
      set(SSL_EAY_NAMES ssleay32)
 -    if(CMAKE_CROSS_COMPILING)
 +    if(CMAKE_CROSSCOMPILING)
        list(APPEND LIB_EAY_NAMES crypto)
        list(APPEND SSL_EAY_NAMES ssl)
      endif()

-----------------------------------------------------------------------

Summary of changes:
 CMakeCPackOptions.cmake.in                         |    2 +-
 Modules/CMakeFindPackageMode.cmake                 |    2 +-
 Modules/CMakeParseArguments.cmake                  |    2 +-
 Modules/CPackPackageMaker.cmake                    |    2 +-
 Modules/CheckFunctionExists.cmake                  |    2 +-
 Modules/CheckSizeOf.cmake                          |    2 +-
 Modules/FindBoost.cmake                            |    6 +-
 Modules/FindCUDA/make2cmake.cmake                  |    2 +-
 Modules/FindFLTK2.cmake                            |    2 +-
 Modules/FindITK.cmake                              |    4 +-
 Modules/FindMPI.cmake                              |    2 +-
 Modules/FindOpenSSL.cmake                          |    2 +-
 Modules/FindQt4.cmake                              |   12 +-
 Modules/FindVTK.cmake                              |    4 +-
 Modules/FindwxWidgets.cmake                        |    8 +-
 Modules/FindwxWindows.cmake                        |    6 +-
 Modules/Platform/Windows-MSVC.cmake                |    2 +-
 Modules/UseEcos.cmake                              |    4 +-
 Source/CMakeLists.txt                              |    3 +-
 Source/CPack/cmCPackDocumentVariables.cxx          |    2 +-
 Source/CTest/cmCTestTestHandler.cxx                |    4 +-
 Source/CursesDialog/form/frm_driver.c              |    6 +-
 Source/CursesDialog/form/fty_enum.c                |    2 +-
 Source/QtDialog/QCMakeCacheView.cxx                |    2 +-
 Source/cmAddDefinitionsCommand.h                   |    2 +-
 Source/cmAddSubDirectoryCommand.h                  |    2 +-
 Source/cmCTest.cxx                                 |    2 +-
 Source/cmCacheManager.cxx                          |    2 +-
 Source/cmDocumentGeneratorExpressions.h            |    2 +-
 Source/cmDocumentVariables.cxx                     |  153 ++++++++++++--------
 Source/cmDocumentation.cxx                         |    4 +-
 Source/cmExportCommand.cxx                         |    2 +-
 Source/cmFileCommand.cxx                           |    4 +-
 Source/cmFunctionCommand.cxx                       |    2 +-
 Source/cmGlobalGenerator.cxx                       |    2 +-
 Source/cmGlobalVisualStudioGenerator.cxx           |    2 +-
 Source/cmIncludeCommand.cxx                        |    2 +-
 Source/cmLocalGenerator.cxx                        |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx           |    8 +-
 Source/cmLocalVisualStudio7Generator.cxx           |   14 +-
 Source/cmMakefile.cxx                              |    8 +-
 Source/cmNinjaNormalTargetGenerator.cxx            |    2 +-
 Source/cmPolicies.cxx                              |    7 +-
 Source/cmQtAutomoc.cxx                             |    4 +-
 Source/cmSetTargetPropertiesCommand.h              |    2 +-
 Source/cmSourceFile.cxx                            |    4 +-
 Source/cmSubdirCommand.cxx                         |    2 +-
 Source/cmSystemTools.h                             |    2 +-
 Source/cmTarget.cxx                                |   10 +-
 Source/cmVisualStudio10TargetGenerator.cxx         |   15 ++
 Source/cmVisualStudioGeneratorOptions.cxx          |    2 +-
 Source/cmWin32ProcessExecution.cxx                 |    2 +-
 Source/cmWin32ProcessExecution.h                   |    2 +-
 Source/cmake.cxx                                   |   10 +-
 Source/cmake.h                                     |    4 +-
 Source/cmakemain.cxx                               |    6 +-
 Source/cmcldeps.cxx                                |    2 +-
 Source/ctest.cxx                                   |    6 +-
 Tests/CompatibleInterface/CMakeLists.txt           |    6 +-
 Tests/ReturnTest/CMakeLists.txt                    |    2 +-
 .../BadNonTarget-stderr.txt                        |    4 +-
 .../BadNonTarget.cmake                             |    2 +-
 Utilities/cmcurl/ftp.c                             |    2 +-
 Utilities/cmcurl/http.c                            |    2 +-
 Utilities/cmcurl/ssluse.c                          |    2 +-
 Utilities/cmcurl/urldata.h                         |    2 +-
 .../libarchive/archive_read_support_format_mtree.c |    2 +-
 .../libarchive/archive_write_set_format_7zip.c     |    2 +-
 .../libarchive/archive_write_set_format_xar.c      |    6 +-
 Utilities/cmzlib/zlib.h                            |    2 +-
 70 files changed, 229 insertions(+), 185 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list