[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.397 1.397.2.1 cmGlobalKdevelopGenerator.cxx 1.29 1.29.2.1 cmGlobalKdevelopGenerator.h 1.7 1.7.2.1 cmLocalGenerator.cxx 1.269 1.269.2.1 cmLocalVisualStudio7Generator.cxx 1.217 1.217.2.1 cmSystemTools.cxx 1.368 1.368.2.1 cmTarget.cxx 1.207.2.1 1.207.2.2 cmake.cxx 1.375.2.2 1.375.2.3 cmake.h 1.109.2.1 1.109.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Sun Mar 30 09:09:49 EDT 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv4308/Source
Modified Files:
Tag: CMake-2-6
CMakeLists.txt cmGlobalKdevelopGenerator.cxx
cmGlobalKdevelopGenerator.h cmLocalGenerator.cxx
cmLocalVisualStudio7Generator.cxx cmSystemTools.cxx
cmTarget.cxx cmake.cxx cmake.h
Log Message:
ENH: merge from main tree
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.217
retrieving revision 1.217.2.1
diff -C 2 -d -r1.217 -r1.217.2.1
*** cmLocalVisualStudio7Generator.cxx 30 Jan 2008 17:04:38 -0000 1.217
--- cmLocalVisualStudio7Generator.cxx 30 Mar 2008 13:09:25 -0000 1.217.2.1
***************
*** 354,358 ****
// boolean flags
{"BufferSecurityCheck", "GS", "Buffer security check", "TRUE", 0},
! {"EnableFibreSafeOptimization", "GT", "OmitFramePointers", "TRUE", 0},
{"EnableFunctionLevelLinking", "Gy",
"EnableFunctionLevelLinking", "TRUE", 0},
--- 354,362 ----
// boolean flags
{"BufferSecurityCheck", "GS", "Buffer security check", "TRUE", 0},
! {"BufferSecurityCheck", "GS-", "Turn off Buffer security check", "FALSE", 0},
! {"Detect64BitPortabilityProblems", "Wp64",
! "Detect 64-bit Portability Problems", "TRUE", 0},
! {"EnableFiberSafeOptimization", "GT", "Enable Fiber-safe Optimizations",
! "TRUE", 0},
{"EnableFunctionLevelLinking", "Gy",
"EnableFunctionLevelLinking", "TRUE", 0},
***************
*** 366,369 ****
--- 370,375 ----
{"RuntimeTypeInfo", "GR",
"Turn on Run time type information for c++", "TRUE", 0},
+ {"RuntimeTypeInfo", "GR-",
+ "Turn off Run time type information for c++", "FALSE", 0},
{"SmallerTypeCheck", "RTCc", "smaller type check", "TRUE", 0},
{"SuppressStartupBanner", "nologo", "SuppressStartupBanner", "TRUE", 0},
Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.269
retrieving revision 1.269.2.1
diff -C 2 -d -r1.269 -r1.269.2.1
*** cmLocalGenerator.cxx 13 Mar 2008 15:38:46 -0000 1.269
--- cmLocalGenerator.cxx 30 Mar 2008 13:09:24 -0000 1.269.2.1
***************
*** 942,946 ****
{
const char* cmcommand =
! this->GlobalGenerator->GetCMakeInstance()->GetCMakeCommand();
return this->Convert(cmcommand, FULL, SHELL);
}
--- 942,946 ----
{
const char* cmcommand =
! this->GetMakefile()->GetDefinition("CMAKE_COMMAND");
return this->Convert(cmcommand, FULL, SHELL);
}
Index: cmake.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.h,v
retrieving revision 1.109.2.1
retrieving revision 1.109.2.2
diff -C 2 -d -r1.109.2.1 -r1.109.2.2
*** cmake.h 24 Mar 2008 22:23:26 -0000 1.109.2.1
--- cmake.h 30 Mar 2008 13:09:35 -0000 1.109.2.2
***************
*** 315,319 ****
const char* GetCTestCommand();
const char* GetCPackCommand();
- const char* GetCMakeCommand() const { return this->CMakeCommand.c_str(); }
// Do we want debug output during the cmake run.
--- 315,318 ----
***************
*** 349,353 ****
void SetSuppressDevWarnings(bool v)
{
! this->SuppressDevWarnings = v;
}
--- 348,353 ----
void SetSuppressDevWarnings(bool v)
{
! this->SuppressDevWarnings = v;
! this->DoSuppressDevWarnings = true;
}
Index: cmGlobalKdevelopGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalKdevelopGenerator.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C 2 -d -r1.7 -r1.7.2.1
*** cmGlobalKdevelopGenerator.h 26 Aug 2007 23:27:33 -0000 1.7
--- cmGlobalKdevelopGenerator.h 30 Mar 2008 13:09:23 -0000 1.7.2.1
***************
*** 38,42 ****
public:
cmGlobalKdevelopGenerator();
- virtual void SetGlobalGenerator(cmGlobalGenerator* generator);
virtual const char* GetName() const
--- 38,41 ----
Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.368
retrieving revision 1.368.2.1
diff -C 2 -d -r1.368 -r1.368.2.1
*** cmSystemTools.cxx 2 Mar 2008 21:19:26 -0000 1.368
--- cmSystemTools.cxx 30 Mar 2008 13:09:27 -0000 1.368.2.1
***************
*** 2108,2111 ****
--- 2108,2113 ----
if(cmSystemTools::FindProgramPath(argv0, exe, errorMsg))
{
+ // remove symlinks
+ exe = cmSystemTools::GetRealPath(exe.c_str());
cmSystemToolsExecutableDirectory =
cmSystemTools::GetFilenamePath(exe.c_str());
Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.375.2.2
retrieving revision 1.375.2.3
diff -C 2 -d -r1.375.2.2 -r1.375.2.3
*** cmake.cxx 27 Mar 2008 15:16:30 -0000 1.375.2.2
--- cmake.cxx 30 Mar 2008 13:09:33 -0000 1.375.2.3
***************
*** 784,787 ****
--- 784,788 ----
// Find the cmake executable
std::string cMakeSelf = cmSystemTools::GetExecutableDirectory();
+ cMakeSelf = cmSystemTools::GetRealPath(cMakeSelf.c_str());
cMakeSelf += "/cmake";
cMakeSelf += cmSystemTools::GetExecutableExtension();
***************
*** 858,862 ****
{
// next try exe/..
! cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str());
std::string::size_type slashPos = cMakeRoot.rfind("/");
if(slashPos != std::string::npos)
--- 859,864 ----
{
// next try exe/..
! cMakeRoot = cmSystemTools::GetRealPath(cMakeSelf.c_str());
! cMakeRoot = cmSystemTools::GetProgramPath(cMakeRoot.c_str());
std::string::size_type slashPos = cMakeRoot.rfind("/");
if(slashPos != std::string::npos)
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.397
retrieving revision 1.397.2.1
diff -C 2 -d -r1.397 -r1.397.2.1
*** CMakeLists.txt 1 Mar 2008 20:20:35 -0000 1.397
--- CMakeLists.txt 30 Mar 2008 13:09:22 -0000 1.397.2.1
***************
*** 1,2 ****
--- 1,3 ----
+ INCLUDE(CheckIncludeFile)
# Check if we can build support for ELF parsing.
CHECK_INCLUDE_FILE("elf.h" HAVE_ELF_H)
Index: cmGlobalKdevelopGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalKdevelopGenerator.cxx,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -C 2 -d -r1.29 -r1.29.2.1
*** cmGlobalKdevelopGenerator.cxx 22 Oct 2007 17:28:49 -0000 1.29
--- cmGlobalKdevelopGenerator.cxx 30 Mar 2008 13:09:22 -0000 1.29.2.1
***************
*** 53,67 ****
}
-
- void cmGlobalKdevelopGenerator::SetGlobalGenerator(
- cmGlobalGenerator* generator)
- {
- cmExternalMakefileProjectGenerator::SetGlobalGenerator(generator);
- cmGlobalUnixMakefileGenerator3* mf = (cmGlobalUnixMakefileGenerator3*)
- generator;
- mf->SetToolSupportsColor(false);
- mf->SetForceVerboseMakefiles(true);
- }
-
void cmGlobalKdevelopGenerator::Generate()
{
--- 53,56 ----
***************
*** 475,479 ****
" <build>\n"
" <buildtool>make</buildtool>\n"; //this one is important
! fout<<" <builddir>"<<outputDir.c_str()<<"</builddir>\n"; //and this one
fout<<" </build>\n"
" <make>\n"
--- 464,468 ----
" <build>\n"
" <buildtool>make</buildtool>\n"; //this one is important
! fout<<" <builddir>"<<outputDir.c_str()<<"</builddir>\n"; //and this one
fout<<" </build>\n"
" <make>\n"
***************
*** 481,485 ****
" <numberofjobs>1</numberofjobs>\n"
" <dontact>false</dontact>\n"
! " <makebin></makebin>\n"
" <selectedenvironment>default</selectedenvironment>\n"
" <environments>\n"
--- 470,476 ----
" <numberofjobs>1</numberofjobs>\n"
" <dontact>false</dontact>\n"
! " <makebin>" << this->GlobalGenerator->GetLocalGenerators()[0]->
! GetMakefile()->GetRequiredDefinition("CMAKE_BUILD_TOOL")
! << " VERBOSE=1 </makebin>\n"
" <selectedenvironment>default</selectedenvironment>\n"
" <environments>\n"
Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.207.2.1
retrieving revision 1.207.2.2
diff -C 2 -d -r1.207.2.1 -r1.207.2.2
*** cmTarget.cxx 18 Mar 2008 14:23:54 -0000 1.207.2.1
--- cmTarget.cxx 30 Mar 2008 13:09:30 -0000 1.207.2.2
***************
*** 568,572 ****
"the directory in which the modules will be placed. "
"When this property is not set the modules will be placed in the "
! "build directory corresponding to the target's source directory.");
cm->DefineProperty
--- 568,574 ----
"the directory in which the modules will be placed. "
"When this property is not set the modules will be placed in the "
! "build directory corresponding to the target's source directory. "
! "If the variable CMAKE_Fortran_MODULE_DIRECTORY is set when a target "
! "is created its value is used to initialize this property.");
cm->DefineProperty
More information about the Cmake-commits
mailing list