diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-05-21 18:01:30 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-05-21 18:01:30 (GMT) |
| commit | 4ea1c51ebae49375bbb4bafce8e40a02741bda3a (patch) | |
| tree | b6d3bd9965e6961da314beaf0e585f38bfc3b835 /Source | |
| parent | f0e21f196a3abe908d6179d3f5ac36d3ea583761 (diff) | |
| download | CMake-4ea1c51ebae49375bbb4bafce8e40a02741bda3a.zip CMake-4ea1c51ebae49375bbb4bafce8e40a02741bda3a.tar.gz CMake-4ea1c51ebae49375bbb4bafce8e40a02741bda3a.tar.bz2 | |
clean up for build on its own
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Makefile.in | 2 | ||||
| -rw-r--r-- | Source/cmBuildNameCommand.cxx | 7 | ||||
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Source/Makefile.in b/Source/Makefile.in index d0fadb8..9daeac0 100644 --- a/Source/Makefile.in +++ b/Source/Makefile.in @@ -3,7 +3,7 @@ VPATH = @srcdir@ CMAKE_CONFIG_DIR = @CMAKE_CONFIG_DIR@ CXX = @CXX@ -CXXFLAGS = -DCMAKE_ROOT_DIR='"@CMAKE_ROOT_DIR@"' @CXXFLAGS@ -DCMAKE_HAS_AUTOCONF -I${CMAKE_CONFIG_DIR}/CMake/Source +CXXFLAGS = -DCMAKE_ROOT_DIR='"@CMAKE_ROOT_DIR@"' @CXXFLAGS@ -DCMAKE_HAS_AUTOCONF -I${CMAKE_CONFIG_DIR}/Source .SUFFIXES: .cxx .java .class diff --git a/Source/cmBuildNameCommand.cxx b/Source/cmBuildNameCommand.cxx index a8c727a..8ec6e47 100644 --- a/Source/cmBuildNameCommand.cxx +++ b/Source/cmBuildNameCommand.cxx @@ -68,10 +68,15 @@ bool cmBuildNameCommand::Invoke(std::vector<std::string>& args) if(reg.find(buildname.c_str())) { buildname = reg.match(1) + "-" + reg.match(2); + cmSystemTools::ReplaceString(buildname, + "/", "_"); + cmSystemTools::ReplaceString(buildname, + "(", "_"); + cmSystemTools::ReplaceString(buildname, + ")", "_"); } } } - std::string compiler = "-${CMAKE_CXX_COMPILER}"; m_Makefile->ExpandVariablesInString ( compiler ); buildname += compiler; diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index d1490a4..cadd0cd 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -901,6 +901,7 @@ void cmUnixMakefileGenerator::ComputeSystemInfo() cmd = root; cmd += "/Templates/configure"; cmSystemTools::RunCommand(cmd.c_str(), output); + m_Makefile->AddDefinition("RUN_CONFIGURE", true); } // now load the settings |