From 1941b1c5d296757315cc894a3b054740b8ea07cd Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Fri, 13 Jul 2007 12:03:13 -0400
Subject: [PATCH] STYLE: better error message, name the new manpages
 cmakecommands, cmakecompat, cmakeprops and cmakemodules

Alex
---
 Source/cmAddLibraryCommand.cxx |  7 ++++---
 Utilities/CMakeLists.txt       | 16 ++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index bbfa5ce7c..36d636b56 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -89,9 +89,10 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args)
     {
     std::string msg = "ADD_LIBRARY for library ";
     msg += args[0];
-    msg += " is used with the SHARED or MODULE option, but the target "
-        "platform supports only STATIC libraries. Building it STATIC instead. "
-        "This may lead to problems.";
+    msg += " is used with the ";
+    msg += type==cmTarget::SHARED_LIBRARY ? "SHARED" : "MODULE";
+    msg += " option, but the target platform supports only STATIC libraries. "
+           "Building it STATIC instead. This may lead to problems.";
     cmSystemTools::Message(msg.c_str() ,"Warning");
     type = cmTarget::STATIC_LIBRARY;
     }
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index fbe0d41b9..9d96c2f98 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -46,26 +46,26 @@ ADD_CUSTOM_COMMAND(
        --help-full ${CMake_BINARY_DIR}/Docs/cmake.1
        --help-properties ${CMake_BINARY_DIR}/Docs/cmake-properties.txt
        --help-properties ${CMake_BINARY_DIR}/Docs/cmake-properties.html
-       --help-properties ${CMake_BINARY_DIR}/Docs/cmprops.1
+       --help-properties ${CMake_BINARY_DIR}/Docs/cmakeprops.1
        --help-modules ${CMake_BINARY_DIR}/Docs/cmake-modules.txt
        --help-modules ${CMake_BINARY_DIR}/Docs/cmake-modules.html
-       --help-modules ${CMake_BINARY_DIR}/Docs/cmmodules.1
+       --help-modules ${CMake_BINARY_DIR}/Docs/cmakemodules.1
        --help-commands ${CMake_BINARY_DIR}/Docs/cmake-commands.txt
        --help-commands ${CMake_BINARY_DIR}/Docs/cmake-commands.html
-       --help-commands ${CMake_BINARY_DIR}/Docs/cmcommands.1
+       --help-commands ${CMake_BINARY_DIR}/Docs/cmakecommands.1
        --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.txt
        --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.html
-       --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmcompat.1
+       --help-compatcommands ${CMake_BINARY_DIR}/Docs/cmakecompat.1
   DEPENDS cmake
   MAIN_DEPENDENCY ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt
   )
 
 INSTALL_FILES(${CMAKE_MAN_DIR}/man1 FILES
               ${CMake_BINARY_DIR}/Docs/cmake.1
-              ${CMake_BINARY_DIR}/Docs/cmcommands.1
-              ${CMake_BINARY_DIR}/Docs/cmcompat.1
-              ${CMake_BINARY_DIR}/Docs/cmprops.1
-              ${CMake_BINARY_DIR}/Docs/cmmodules.1)
+              ${CMake_BINARY_DIR}/Docs/cmakecommands.1
+              ${CMake_BINARY_DIR}/Docs/cmakecompat.1
+              ${CMake_BINARY_DIR}/Docs/cmakeprops.1
+              ${CMake_BINARY_DIR}/Docs/cmakemodules.1)
 
 INSTALL_FILES(${CMAKE_DOC_DIR} FILES
     ${CMake_BINARY_DIR}/Docs/cmake.txt