Commit 4ea1c51e authored by Bill Hoffman's avatar Bill Hoffman

clean up for build on its own

parent f0e21f19
......@@ -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
......
......@@ -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;
......
......@@ -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
......
......@@ -25,5 +25,5 @@ SET (CMAKE_SHLIB_LD_LIBS "@CMAKE_SHLIB_LD_LIBS@" CACHE_NO_REPLACE_NO_REPLAC
# support for X11
SET (CMAKE_X_LIBS "@X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@" CACHE_NO_REPLACE )
SET (CMAKE_X_CFLAGS "@X_CFLAGS@" CACHE_NO_REPLACE)
SET (CMAKE_HAS_X "@CMAKE_HAS_X@" CACHE_NO_REPLACE)
SET (CMAKE_HAS_X "@CMAKE_HAS_X@" CACHE_NO_REPLACE BOOL)
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment