Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
36e27284
Commit
36e27284
authored
Mar 22, 2006
by
Andy Cedilnik
Browse files
ENH: Cleanup bootstrap even more
parent
0376fe4b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Modules/CheckCSourceCompiles.cmake
View file @
36e27284
...
...
@@ -43,14 +43,14 @@ MACRO(CHECK_C_SOURCE_COMPILES SOURCE VAR)
IF
(
${
VAR
}
)
SET
(
${
VAR
}
1 CACHE INTERNAL
"Test
${
FUNCTION
}
"
)
MESSAGE
(
STATUS
"Performing Test
${
VAR
}
- Success"
)
WRITE_FILE
(
${
CMAKE_BINARY_DIR
}
/CMakeOutput.log
FILE
(
WRITE
${
CMAKE_BINARY_DIR
}
/CMakeOutput.log
"Performing C SOURCE FILE Test
${
VAR
}
succeded with the following output:
\n
"
"
${
OUTPUT
}
\n
"
"Source file was:
\n
${
SOURCE
}
\n
"
APPEND
)
ELSE
(
${
VAR
}
)
MESSAGE
(
STATUS
"Performing Test
${
VAR
}
- Failed"
)
SET
(
${
VAR
}
""
CACHE INTERNAL
"Test
${
FUNCTION
}
"
)
WRITE_FILE
(
${
CMAKE_BINARY_DIR
}
/CMakeError.log
FILE
(
WRITE
${
CMAKE_BINARY_DIR
}
/CMakeError.log
"Performing C SOURCE FILE Test
${
VAR
}
failed with the following output:
\n
"
"
${
OUTPUT
}
\n
"
"Source file was:
\n
${
SOURCE
}
\n
"
APPEND
)
...
...
Modules/CheckCXXSourceCompiles.cmake
View file @
36e27284
...
...
@@ -43,14 +43,14 @@ MACRO(CHECK_CXX_SOURCE_COMPILES SOURCE VAR)
IF
(
${
VAR
}
)
SET
(
${
VAR
}
1 CACHE INTERNAL
"Test
${
FUNCTION
}
"
)
MESSAGE
(
STATUS
"Performing Test
${
VAR
}
- Success"
)
WRITE_FILE
(
${
CMAKE_BINARY_DIR
}
/CMakeFiles/CMakeOutput.log
FILE
(
WRITE
${
CMAKE_BINARY_DIR
}
/CMakeFiles/CMakeOutput.log
"Performing C++ SOURCE FILE Test
${
VAR
}
succeded with the following output:
\n
"
"
${
OUTPUT
}
\n
"
"Source file was:
\n
${
SOURCE
}
\n
"
APPEND
)
ELSE
(
${
VAR
}
)
MESSAGE
(
STATUS
"Performing Test
${
VAR
}
- Failed"
)
SET
(
${
VAR
}
""
CACHE INTERNAL
"Test
${
FUNCTION
}
"
)
WRITE_FILE
(
${
CMAKE_BINARY_DIR
}
/CMakeFiles/CMakeError.log
FILE
(
WRITE
${
CMAKE_BINARY_DIR
}
/CMakeFiles/CMakeError.log
"Performing C++ SOURCE FILE Test
${
VAR
}
failed with the following output:
\n
"
"
${
OUTPUT
}
\n
"
"Source file was:
\n
${
SOURCE
}
\n
"
APPEND
)
...
...
Source/cmBootstrapCommands.cxx
View file @
36e27284
...
...
@@ -22,16 +22,12 @@
#include "cmAddCustomCommandCommand.cxx"
#include "cmAddCustomTargetCommand.cxx"
#include "cmAddDefinitionsCommand.cxx"
#include "cmAddDependenciesCommand.cxx"
#include "cmAddExecutableCommand.cxx"
#include "cmAddLibraryCommand.cxx"
#include "cmAddSubDirectoryCommand.cxx"
#include "cmAddTestCommand.cxx"
#include "cmBuildCommand.cxx"
#include "cmBuildNameCommand.cxx"
#include "cmCMakeMinimumRequired.cxx"
#include "cmConfigureFileCommand.cxx"
#include "cmCreateTestSourceList.cxx"
#include "cmElseCommand.cxx"
#include "cmEnableTestingCommand.cxx"
#include "cmEndForEachCommand.cxx"
...
...
@@ -47,14 +43,11 @@
#include "cmForEachCommand.cxx"
#include "cmGetCMakePropertyCommand.cxx"
#include "cmGetFilenameComponentCommand.cxx"
#include "cmGetSourceFilePropertyCommand.cxx"
#include "cmGetTargetPropertyCommand.cxx"
#include "cmIfCommand.cxx"
#include "cmIncludeCommand.cxx"
#include "cmIncludeDirectoryCommand.cxx"
#include "cmIncludeRegularExpressionCommand.cxx"
#include "cmInstallFilesCommand.cxx"
#include "cmInstallProgramsCommand.cxx"
#include "cmInstallTargetsCommand.cxx"
#include "cmLinkDirectoriesCommand.cxx"
#include "cmMacroCommand.cxx"
...
...
@@ -63,35 +56,26 @@
#include "cmMessageCommand.cxx"
#include "cmOptionCommand.cxx"
#include "cmProjectCommand.cxx"
#include "cmRemoveDefinitionsCommand.cxx"
#include "cmSeparateArgumentsCommand.cxx"
#include "cmSetCommand.cxx"
#include "cmSetSourceFilesPropertiesCommand.cxx"
#include "cmSiteNameCommand.cxx"
#include "cmStringCommand.cxx"
#include "cmSubdirCommand.cxx"
#include "cmSubdirDependsCommand.cxx"
#include "cmTargetLinkLibrariesCommand.cxx"
#include "cmTryCompileCommand.cxx"
#include "cmTryRunCommand.cxx"
#include "cmVariableRequiresCommand.cxx"
#include "cmWriteFileCommand.cxx"
void
GetBootstrapCommands
(
std
::
list
<
cmCommand
*>&
commands
)
{
commands
.
push_back
(
new
cmAddCustomCommandCommand
);
commands
.
push_back
(
new
cmAddCustomTargetCommand
);
commands
.
push_back
(
new
cmAddDefinitionsCommand
);
commands
.
push_back
(
new
cmAddDependenciesCommand
);
commands
.
push_back
(
new
cmAddExecutableCommand
);
commands
.
push_back
(
new
cmAddLibraryCommand
);
commands
.
push_back
(
new
cmAddSubDirectoryCommand
);
commands
.
push_back
(
new
cmAddTestCommand
);
commands
.
push_back
(
new
cmBuildCommand
);
commands
.
push_back
(
new
cmBuildNameCommand
);
commands
.
push_back
(
new
cmCMakeMinimumRequired
);
commands
.
push_back
(
new
cmConfigureFileCommand
);
commands
.
push_back
(
new
cmCreateTestSourceList
);
commands
.
push_back
(
new
cmElseCommand
);
commands
.
push_back
(
new
cmEnableTestingCommand
);
commands
.
push_back
(
new
cmEndForEachCommand
);
...
...
@@ -106,14 +90,11 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands)
commands
.
push_back
(
new
cmForEachCommand
);
commands
.
push_back
(
new
cmGetCMakePropertyCommand
);
commands
.
push_back
(
new
cmGetFilenameComponentCommand
);
commands
.
push_back
(
new
cmGetSourceFilePropertyCommand
);
commands
.
push_back
(
new
cmGetTargetPropertyCommand
);
commands
.
push_back
(
new
cmIfCommand
);
commands
.
push_back
(
new
cmIncludeCommand
);
commands
.
push_back
(
new
cmIncludeDirectoryCommand
);
commands
.
push_back
(
new
cmIncludeRegularExpressionCommand
);
commands
.
push_back
(
new
cmInstallFilesCommand
);
commands
.
push_back
(
new
cmInstallProgramsCommand
);
commands
.
push_back
(
new
cmInstallTargetsCommand
);
commands
.
push_back
(
new
cmLinkDirectoriesCommand
);
commands
.
push_back
(
new
cmMacroCommand
);
...
...
@@ -122,17 +103,12 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands)
commands
.
push_back
(
new
cmMessageCommand
);
commands
.
push_back
(
new
cmOptionCommand
);
commands
.
push_back
(
new
cmProjectCommand
);
commands
.
push_back
(
new
cmRemoveDefinitionsCommand
);
commands
.
push_back
(
new
cmSeparateArgumentsCommand
);
commands
.
push_back
(
new
cmSetCommand
);
commands
.
push_back
(
new
cmSetSourceFilesPropertiesCommand
);
commands
.
push_back
(
new
cmSiteNameCommand
);
commands
.
push_back
(
new
cmStringCommand
);
commands
.
push_back
(
new
cmSubdirCommand
);
commands
.
push_back
(
new
cmSubdirDependsCommand
);
commands
.
push_back
(
new
cmTargetLinkLibrariesCommand
);
commands
.
push_back
(
new
cmTryCompileCommand
);
commands
.
push_back
(
new
cmTryRunCommand
);
commands
.
push_back
(
new
cmVariableRequiresCommand
);
commands
.
push_back
(
new
cmWriteFileCommand
);
}
Source/cmCommands.cxx
View file @
36e27284
...
...
@@ -16,35 +16,47 @@
=========================================================================*/
#include "cmCommands.h"
#if defined(CMAKE_BUILD_WITH_CMAKE)
#include "cmAddDependenciesCommand.cxx"
#include "cmAddSubDirectoryCommand.cxx"
#include "cmAuxSourceDirectoryCommand.cxx"
#include "cmBuildNameCommand.cxx"
#include "cmCreateTestSourceList.cxx"
#include "cmEnableLanguageCommand.cxx"
#include "cmEndWhileCommand.cxx"
#include "cmExecuteProcessCommand.cxx"
#include "cmExportLibraryDependencies.cxx"
#include "cmEnableLanguageCommand.cxx"
#include "cmFLTKWrapUICommand.cxx"
#include "cmGetDirectoryPropertyCommand.cxx"
#include "cmGetSourceFilePropertyCommand.cxx"
#include "cmGetTargetPropertyCommand.cxx"
#include "cmGetTestPropertyCommand.cxx"
#include "cmIncludeExternalMSProjectCommand.cxx"
#include "cmInstallCommand.cxx"
#include "cmInstallProgramsCommand.cxx"
#include "cmLinkLibrariesCommand.cxx"
#include "cmListCommand.cxx"
#include "cmLoadCacheCommand.cxx"
#include "cmMathCommand.cxx"
#include "cmOutputRequiredFilesCommand.cxx"
#include "cmQTWrapCPPCommand.cxx"
#include "cmQTWrapUICommand.cxx"
#include "cmRemoveCommand.cxx"
#include "cmRemoveDefinitionsCommand.cxx"
#include "cmSeparateArgumentsCommand.cxx"
#include "cmSetDirectoryPropertiesCommand.cxx"
#include "cmSetTargetPropertiesCommand.cxx"
#include "cmSetTestsPropertiesCommand.cxx"
#include "cmSourceGroupCommand.cxx"
#include "cmSubdirDependsCommand.cxx"
#include "cmUseMangledMesaCommand.cxx"
#include "cmUtilitySourceCommand.cxx"
#include "cmVTKMakeInstantiatorCommand.cxx"
#include "cmVTKWrapJavaCommand.cxx"
#include "cmVTKWrapPythonCommand.cxx"
#include "cmVTKWrapTclCommand.cxx"
#include "cmQTWrapCPPCommand.cxx"
#include "cmQTWrapUICommand.cxx"
#include "cmUseMangledMesaCommand.cxx"
#include "cmUtilitySourceCommand.cxx"
#include "cmVariableRequiresCommand.cxx"
#include "cmWhileCommand.cxx"
#include "cmWriteFileCommand.cxx"
// This one must be last because it includes windows.h and
// windows.h #defines GetCurrentDirectory which is a member
...
...
@@ -59,35 +71,47 @@ void GetPredefinedCommands(std::list<cmCommand*>&
)
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
commands
.
push_back
(
new
cmAddDependenciesCommand
);
commands
.
push_back
(
new
cmAddSubDirectoryCommand
);
commands
.
push_back
(
new
cmAuxSourceDirectoryCommand
);
commands
.
push_back
(
new
cmBuildNameCommand
);
commands
.
push_back
(
new
cmCreateTestSourceList
);
commands
.
push_back
(
new
cmEnableLanguageCommand
);
commands
.
push_back
(
new
cmEndWhileCommand
);
commands
.
push_back
(
new
cmExecuteProcessCommand
);
commands
.
push_back
(
new
cmExportLibraryDependenciesCommand
);
commands
.
push_back
(
new
cmFLTKWrapUICommand
);
commands
.
push_back
(
new
cmGetDirectoryPropertyCommand
);
commands
.
push_back
(
new
cmGetSourceFilePropertyCommand
);
commands
.
push_back
(
new
cmGetTargetPropertyCommand
);
commands
.
push_back
(
new
cmGetTestPropertyCommand
);
commands
.
push_back
(
new
cmIncludeExternalMSProjectCommand
);
commands
.
push_back
(
new
cmInstallCommand
);
commands
.
push_back
(
new
cmInstallProgramsCommand
);
commands
.
push_back
(
new
cmLinkLibrariesCommand
);
commands
.
push_back
(
new
cmListCommand
);
commands
.
push_back
(
new
cmLoadCacheCommand
);
commands
.
push_back
(
new
cmLoadCommandCommand
);
commands
.
push_back
(
new
cmMathCommand
);
commands
.
push_back
(
new
cmOutputRequiredFilesCommand
);
commands
.
push_back
(
new
cmQTWrapCPPCommand
);
commands
.
push_back
(
new
cmQTWrapUICommand
);
commands
.
push_back
(
new
cmRemoveCommand
);
commands
.
push_back
(
new
cmRemoveDefinitionsCommand
);
commands
.
push_back
(
new
cmSeparateArgumentsCommand
);
commands
.
push_back
(
new
cmSetDirectoryPropertiesCommand
);
commands
.
push_back
(
new
cmSetTargetPropertiesCommand
);
commands
.
push_back
(
new
cmSetTestsPropertiesCommand
);
commands
.
push_back
(
new
cmSourceGroupCommand
);
commands
.
push_back
(
new
cmSubdirDependsCommand
);
commands
.
push_back
(
new
cmUseMangledMesaCommand
);
commands
.
push_back
(
new
cmUtilitySourceCommand
);
commands
.
push_back
(
new
cmVTKMakeInstantiatorCommand
);
commands
.
push_back
(
new
cmVTKWrapJavaCommand
);
commands
.
push_back
(
new
cmVTKWrapPythonCommand
);
commands
.
push_back
(
new
cmVTKWrapTclCommand
);
commands
.
push_back
(
new
cmQTWrapCPPCommand
);
commands
.
push_back
(
new
cmQTWrapUICommand
);
commands
.
push_back
(
new
cmUseMangledMesaCommand
);
commands
.
push_back
(
new
cmUtilitySourceCommand
);
commands
.
push_back
(
new
cmVariableRequiresCommand
);
commands
.
push_back
(
new
cmWhileCommand
);
commands
.
push_back
(
new
cmWriteFileCommand
);
#endif
}
Source/cmWriteFileCommand.cxx
View file @
36e27284
...
...
@@ -16,6 +16,9 @@
=========================================================================*/
#include "cmWriteFileCommand.h"
#include <sys/types.h>
#include <sys/stat.h>
// cmLibraryCommand
bool
cmWriteFileCommand
::
InitialPass
(
std
::
vector
<
std
::
string
>
const
&
args
)
{
...
...
Utilities/cmxmlrpc/CMake/TryCompileFromSource.cmake
View file @
36e27284
...
...
@@ -29,14 +29,14 @@ MACRO(TRY_COMPILE_FROM_SOURCE SOURCE VAR)
IF
(
${
VAR
}
)
SET
(
${
VAR
}
1 CACHE INTERNAL
"Test
${
FUNCTION
}
"
)
MESSAGE
(
STATUS
"Performing Test
${
VAR
}
- Success"
)
WRITE_FILE
(
${
CMAKE_BINARY_DIR
}
/CMakeFiles/CMakeOutput.log
FILE
(
WRITE
${
CMAKE_BINARY_DIR
}
/CMakeFiles/CMakeOutput.log
"Performing C SOURCE FILE Test
${
VAR
}
succeded with the following output:
\n
"
"
${
OUTPUT
}
\n
"
"Source file was:
\n
${
src
}
\n
"
APPEND
)
ELSE
(
${
VAR
}
)
MESSAGE
(
STATUS
"Performing Test
${
VAR
}
- Failed"
)
SET
(
${
VAR
}
""
CACHE INTERNAL
"Test
${
FUNCTION
}
"
)
WRITE_FILE
(
${
CMAKE_BINARY_DIR
}
/CMakeFiles/CMakeError.log
FILE
(
WRITE
${
CMAKE_BINARY_DIR
}
/CMakeFiles/CMakeError.log
"Performing C SOURCE FILE Test
${
VAR
}
failed with the following output:
\n
"
"
${
OUTPUT
}
\n
"
"Source file was:
\n
${
src
}
\n
"
APPEND
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment