[Cmake-commits] CMake branch, next, updated. v2.8.5-1714-gf4b07ae

[Stephen Kelly]

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, next has been updated
       via  f4b07ae4486edc68044cb3efa7c72df143471b65 (commit)
       via  5ca8c565bc3ebabea06bd7de655d9a120a7f008c (commit)
       via  75596e62f9a54c36943be0a89a0ad9874f50bf99 (commit)
       via  826374a45ac8eb7fef9c41a391b1ca759c5a2b31 (commit)
      from  b14c10e0ff86027dfe5685335282e77a337eb913 (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=f4b07ae4486edc68044cb3efa7c72df143471b65
commit f4b07ae4486edc68044cb3efa7c72df143471b65
Merge: b14c10e 5ca8c56
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 25 14:40:45 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 25 14:40:45 2011 -0400

    Merge topic 'generate_export_header' into next
    
    5ca8c56 Fix up verbatim code sections of the dox.
    75596e6 Don't start a line with a dash(-)
    826374a Remove blank line at the start of the file.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ca8c565bc3ebabea06bd7de655d9a120a7f008c
commit 5ca8c565bc3ebabea06bd7de655d9a120a7f008c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 25 20:38:13 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 25 20:39:01 2011 +0200

    Fix up verbatim code sections of the dox.

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index b6901e4..0f5c413 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -28,13 +28,9 @@
 # This means that in the simplest case, users of these functions will be equivalent to:
 #
 #   add_compiler_export_flags()
-#
 #   add_library(somelib someclass.cpp)
-#
 #   generate_export_header(somelib)
-#
 #   install(TARGETS somelib DESTINATION ${LIBRARY_INSTALL_DIR})
-#
 #   install(FILES
 #    someclass.h
 #    ${PROJECT_BINARY_DIR}/somelib_export.h DESTINATION ${INCLUDE_INSTALL_DIR}
@@ -42,13 +38,10 @@
 #
 # And in the ABI header files:
 #
-#   \code
 #   #include "somelib_export.h"
-#
 #   class SOMELIB_EXPORT SomeClass {
-#
+#     ...
 #   };
-#   \endcode
 #
 # The CMake fragment will generate a file in the ${CMAKE_CURRENT_BUILD_DIR} called
 # somelib_export.h containing the macros SOMELIB_EXPORT, SOMELIB_NO_EXPORT,
@@ -92,9 +85,7 @@
 #
 #   add_library(shared_variant SHARED ${lib_SRCS})
 #   add_library(static_variant ${lib_SRCS})
-#
 #   generate_export_header(shared_variant BASE_NAME libshared_and_static)
-#
 #   set_target_properties(static_variant PROPERTIES COMPILE_FLAGS -DLIBSHARED_AND_STATIC_STATIC_DEFINE)
 #
 # This will cause the export macros to expand to nothing when building the static library.
@@ -103,16 +94,13 @@
 # This macro can be used to remove deprecated code from preprocessor output.
 #
 #   option(EXCLUDE_DEPRECATED "Exclude deprecated parts of the library" FALSE)
-#
 #   if (EXCLUDE_DEPRECATED)
 #     set(NO_BUILD_DEPRECATED DEFINE_NO_DEPRECATED)
 #   endif()
-#
 #   generate_export_header(somelib ${NO_BUILD_DEPRECATED})
 #
 # And then in somelib:
 #
-#   \code
 #   class SOMELIB_EXPORT SomeClass
 #   {
 #   public:
@@ -121,14 +109,10 @@
 #   #endif
 #   };
 #
-#   // ...
-#
 #   #ifndef SOMELIB_NO_DEPRECATED
 #   void SomeClass::oldMethod() {  }
 #   #endif
 #
-#   \endcode
-#
 # If PREFIX_NAME is specified, the argument will be used as a prefix to all
 # generated macros.
 #

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75596e62f9a54c36943be0a89a0ad9874f50bf99
commit 75596e62f9a54c36943be0a89a0ad9874f50bf99
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 25 20:31:42 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 25 20:39:00 2011 +0200

    Don't start a line with a dash(-)
    
    That is a special character in cmake dox.

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index b441f3c..b6901e4 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -21,8 +21,8 @@
 # ADD_COMPILER_EXPORT_FLAGS( [FATAL_WARNINGS] )
 #
 # By default GENERATE_EXPORT_HEADER() generates macro names in a file name
-# determined by the name of the library. The ADD_COMPILER_EXPORT_FLAGS macro adds
-# -fvisibility=hidden to CMAKE_CXX_FLAGS if supported, and is a no-op on Windows
+# determined by the name of the library. The ADD_COMPILER_EXPORT_FLAGS macro
+# adds -fvisibility=hidden to CMAKE_CXX_FLAGS if supported, and is a no-op on Windows
 # which does not need extra compiler flags for exporting support.
 #
 # This means that in the simplest case, users of these functions will be equivalent to:

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=826374a45ac8eb7fef9c41a391b1ca759c5a2b31
commit 826374a45ac8eb7fef9c41a391b1ca759c5a2b31
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 25 20:30:58 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 25 20:39:00 2011 +0200

    Remove blank line at the start of the file.
    
    A blank line excludes the file from documentation processing.

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 8d6cab9..b441f3c 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -1,6 +1,4 @@
-
 # - Function for generation of export macros for libraries
-#
 # This module provides the function GENERATE_EXPORT_HEADER() and the
 # accompanying ADD_COMPILER_EXPORT_FLAGS() function.
 #

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

Summary of changes:
 Modules/GenerateExportHeader.cmake |   24 +++---------------------
 1 files changed, 3 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake