kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STYLE: better error message, name the new manpages cmakecommands, 

cmakecompat, cmakeprops and cmakemodules

Alex
This commit is contained in:
Alexander Neundorf 2007-07-13 12:03:13 -04:00
parent 2339b9f753
commit 1941b1c5d2
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmAddLibraryCommand.cxx
View File

@ -89,9 +89,10 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args)
{ {
std::string msg = "ADD_LIBRARY for library "; std::string msg = "ADD_LIBRARY for library ";
msg += args[0]; msg += args[0];
msg += " is used with the SHARED or MODULE option, but the target " msg += " is used with the ";
"platform supports only STATIC libraries. Building it STATIC instead. " msg += type==cmTarget::SHARED_LIBRARY ? "SHARED" : "MODULE";
"This may lead to problems."; 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"); cmSystemTools::Message(msg.c_str() ,"Warning");
type = cmTarget::STATIC_LIBRARY; type = cmTarget::STATIC_LIBRARY;
} }

16
Utilities/CMakeLists.txt
View File

@ -46,26 +46,26 @@ ADD_CUSTOM_COMMAND(
--help-full ${CMake_BINARY_DIR}/Docs/cmake.1 --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.txt
--help-properties ${CMake_BINARY_DIR}/Docs/cmake-properties.html --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.txt
--help-modules ${CMake_BINARY_DIR}/Docs/cmake-modules.html --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.txt
--help-commands ${CMake_BINARY_DIR}/Docs/cmake-commands.html --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.txt
--help-compatcommands ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.html --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 DEPENDS cmake
MAIN_DEPENDENCY ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt MAIN_DEPENDENCY ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt
) )
INSTALL_FILES(${CMAKE_MAN_DIR}/man1 FILES INSTALL_FILES(${CMAKE_MAN_DIR}/man1 FILES
${CMake_BINARY_DIR}/Docs/cmake.1 ${CMake_BINARY_DIR}/Docs/cmake.1
${CMake_BINARY_DIR}/Docs/cmcommands.1 ${CMake_BINARY_DIR}/Docs/cmakecommands.1
${CMake_BINARY_DIR}/Docs/cmcompat.1 ${CMake_BINARY_DIR}/Docs/cmakecompat.1
${CMake_BINARY_DIR}/Docs/cmprops.1 ${CMake_BINARY_DIR}/Docs/cmakeprops.1
${CMake_BINARY_DIR}/Docs/cmmodules.1) ${CMake_BINARY_DIR}/Docs/cmakemodules.1)
INSTALL_FILES(${CMAKE_DOC_DIR} FILES INSTALL_FILES(${CMAKE_DOC_DIR} FILES
${CMake_BINARY_DIR}/Docs/cmake.txt ${CMake_BINARY_DIR}/Docs/cmake.txt