diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-07-13 16:03:13 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-07-13 16:03:13 (GMT) |
| commit | 1941b1c5d296757315cc894a3b054740b8ea07cd (patch) | |
| tree | 15d61697c693bf39afae7c0c6a710879f044e298 | |
| parent | 2339b9f753b0a4503c5e0dbb27b9bf75fa4840f7 (diff) | |
| download | CMake-1941b1c5d296757315cc894a3b054740b8ea07cd.zip CMake-1941b1c5d296757315cc894a3b054740b8ea07cd.tar.gz CMake-1941b1c5d296757315cc894a3b054740b8ea07cd.tar.bz2 | |
STYLE: better error message, name the new manpages cmakecommands,
cmakecompat, cmakeprops and cmakemodules
Alex
| -rw-r--r-- | Source/cmAddLibraryCommand.cxx | 7 | ||||
| -rw-r--r-- | Utilities/CMakeLists.txt | 16 |
2 files changed, 12 insertions, 11 deletions
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx index bbfa5ce..36d636b 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 fbe0d41..9d96c2f 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 |