[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.397.2.1 1.397.2.2 cmFLTKWrapUICommand.cxx 1.38 1.38.2.1 cmFindPackageCommand.cxx 1.36.2.1 1.36.2.2 cmLocalVisualStudio7Generator.cxx 1.217.2.6 1.217.2.7 cmake.cxx 1.375.2.7 1.375.2.8 cmake.h 1.109.2.4 1.109.2.5
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jun 25 09:51:35 EDT 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv13020/Source
Modified Files:
Tag: CMake-2-6
CMakeLists.txt cmFLTKWrapUICommand.cxx
cmFindPackageCommand.cxx cmLocalVisualStudio7Generator.cxx
cmake.cxx cmake.h
Log Message:
ENH: merge in changes from main tree
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.217.2.6
retrieving revision 1.217.2.7
diff -C 2 -d -r1.217.2.6 -r1.217.2.7
*** cmLocalVisualStudio7Generator.cxx 23 May 2008 20:09:36 -0000 1.217.2.6
--- cmLocalVisualStudio7Generator.cxx 25 Jun 2008 13:51:32 -0000 1.217.2.7
***************
*** 424,428 ****
{"Detect64BitPortabilityProblems", "Wp64",
"Detect 64-bit Portability Problems", "TRUE", 0},
! {"EnableFiberSafeOptimization", "GT", "Enable Fiber-safe Optimizations",
"TRUE", 0},
{"EnableFunctionLevelLinking", "Gy",
--- 424,428 ----
{"Detect64BitPortabilityProblems", "Wp64",
"Detect 64-bit Portability Problems", "TRUE", 0},
! {"EnableFiberSafeOptimizations", "GT", "Enable Fiber-safe Optimizations",
"TRUE", 0},
{"EnableFunctionLevelLinking", "Gy",
Index: cmake.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.h,v
retrieving revision 1.109.2.4
retrieving revision 1.109.2.5
diff -C 2 -d -r1.109.2.4 -r1.109.2.5
*** cmake.h 1 May 2008 16:35:40 -0000 1.109.2.4
--- cmake.h 25 Jun 2008 13:51:32 -0000 1.109.2.5
***************
*** 417,420 ****
--- 417,421 ----
static int VisualStudioLinkNonIncremental(std::vector<std::string>& args,
int type,
+ bool hasManifest,
bool verbose);
static int ParseVisualStudioLinkCommand(std::vector<std::string>& args,
***************
*** 429,433 ****
///! Find the full path to one of the cmake programs like ctest, cpack, etc.
std::string FindCMakeProgram(const char* name) const;
! private:
ProgressCallbackType ProgressCallback;
void* ProgressCallbackClientData;
--- 430,436 ----
///! Find the full path to one of the cmake programs like ctest, cpack, etc.
std::string FindCMakeProgram(const char* name) const;
! private:
! cmake(const cmake&); // Not implemented.
! void operator=(const cmake&); // Not implemented.
ProgressCallbackType ProgressCallback;
void* ProgressCallbackClientData;
Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.375.2.7
retrieving revision 1.375.2.8
diff -C 2 -d -r1.375.2.7 -r1.375.2.8
*** cmake.cxx 13 Jun 2008 12:55:17 -0000 1.375.2.7
--- cmake.cxx 25 Jun 2008 13:51:32 -0000 1.375.2.8
***************
*** 3376,3379 ****
--- 3376,3384 ----
"Read-only property that is true during a try-compile configuration.",
"True when building a project inside a TRY_COMPILE or TRY_RUN command.");
+ cm->DefineProperty
+ ("ENABLED_LANGUAGES", cmProperty::GLOBAL,
+ "Read-only property that contains the list of currently "
+ "enabled languages",
+ "Set to list of currently enabled lanauges.");
// ================================================================
***************
*** 3591,3594 ****
--- 3596,3617 ----
this->GetIsInTryCompile()? "1":"0");
}
+ else if ( propname == "ENABLED_LANGUAGES" )
+ {
+ std::string lang;
+ if(this->GlobalGenerator)
+ {
+ std::vector<std::string> enLangs;
+ this->GlobalGenerator->GetEnabledLanguages(enLangs);
+ const char* sep = "";
+ for(std::vector<std::string>::iterator i = enLangs.begin();
+ i != enLangs.end(); ++i)
+ {
+ lang += sep;
+ sep = ";";
+ lang += *i;
+ }
+ }
+ this->SetProperty("ENABLED_LANGUAGES", lang.c_str());
+ }
return this->Properties.GetPropertyValue(prop, scope, chain);
}
***************
*** 3853,3857 ****
{
// check for nmake temporary files
! if((*i)[0] == '@')
{
std::ifstream fin(i->substr(1).c_str());
--- 3876,3880 ----
{
// check for nmake temporary files
! if((*i)[0] == '@' && i->find("@CMakeFiles") != 0 )
{
std::ifstream fin(i->substr(1).c_str());
***************
*** 3868,3873 ****
}
}
! // figure out if this is an incremental link or not and run the correct
! // link function.
for(std::vector<std::string>::iterator i = expandedArgs.begin();
i != expandedArgs.end(); ++i)
--- 3891,3896 ----
}
}
! bool hasIncremental = false;
! bool hasManifest = true;
for(std::vector<std::string>::iterator i = expandedArgs.begin();
i != expandedArgs.end(); ++i)
***************
*** 3875,3890 ****
if(cmSystemTools::Strucmp(i->c_str(), "/INCREMENTAL:YES") == 0)
{
! if(verbose)
! {
! std::cout << "Visual Studio Incremental Link\n";
! }
! return cmake::VisualStudioLinkIncremental(expandedArgs, type, verbose);
}
}
if(verbose)
{
! std::cout << "Visual Studio Non-Incremental Link\n";
}
! return cmake::VisualStudioLinkNonIncremental(expandedArgs, type, verbose);
}
--- 3898,3928 ----
if(cmSystemTools::Strucmp(i->c_str(), "/INCREMENTAL:YES") == 0)
{
! hasIncremental = true;
! }
! if(cmSystemTools::Strucmp(i->c_str(), "/MANIFEST:NO") == 0)
! {
! hasManifest = false;
! }
! }
! if(hasIncremental && hasManifest)
! {
! if(verbose)
! {
! std::cout << "Visual Studio Incremental Link with embeded manifests\n";
}
+ return cmake::VisualStudioLinkIncremental(expandedArgs, type, verbose);
}
if(verbose)
{
! if(!hasIncremental)
! {
! std::cout << "Visual Studio Non-Incremental Link\n";
! }
! else
! {
! std::cout << "Visual Studio Incremental Link without manifests\n";
! }
}
! return cmake::VisualStudioLinkNonIncremental(expandedArgs, type, hasManifest, verbose);
}
***************
*** 4091,4094 ****
--- 4129,4133 ----
int cmake::VisualStudioLinkNonIncremental(std::vector<std::string>& args,
int type,
+ bool hasManifest,
bool verbose)
{
***************
*** 4104,4107 ****
--- 4143,4150 ----
return -1;
}
+ if(!hasManifest)
+ {
+ return 0;
+ }
std::vector<cmStdString> mtCommand;
mtCommand.push_back(cmSystemTools::FindProgram("mt.exe"));
Index: cmFLTKWrapUICommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFLTKWrapUICommand.cxx,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -C 2 -d -r1.38 -r1.38.2.1
*** cmFLTKWrapUICommand.cxx 23 Jan 2008 15:27:59 -0000 1.38
--- cmFLTKWrapUICommand.cxx 25 Jun 2008 13:51:32 -0000 1.38.2.1
***************
*** 122,127 ****
// didn't support that, so check and see if they added the files in and if
// they didn;t then print a warning and add then anyhow
std::vector<cmSourceFile*> const& srcs =
! this->Makefile->GetTargets()[this->Target].GetSourceFiles();
bool found = false;
for (unsigned int i = 0; i < srcs.size(); ++i)
--- 122,139 ----
// didn't support that, so check and see if they added the files in and if
// they didn;t then print a warning and add then anyhow
+ cmTarget* target = this->Makefile->FindTarget(this->Target.c_str());
+ if(!target)
+ {
+ std::string msg =
+ "FLTK_WRAP_UI was called with a target that was never created: ";
+ msg += this->Target;
+ msg +=". The problem was found while processing the source directory: ";
+ msg += this->Makefile->GetStartDirectory();
+ msg += ". This FLTK_WRAP_UI call will be ignored.";
+ cmSystemTools::Message(msg.c_str(),"Warning");
+ return;
+ }
std::vector<cmSourceFile*> const& srcs =
! target->GetSourceFiles();
bool found = false;
for (unsigned int i = 0; i < srcs.size(); ++i)
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.397.2.1
retrieving revision 1.397.2.2
diff -C 2 -d -r1.397.2.1 -r1.397.2.2
*** CMakeLists.txt 30 Mar 2008 13:09:22 -0000 1.397.2.1
--- CMakeLists.txt 25 Jun 2008 13:51:32 -0000 1.397.2.2
***************
*** 375,378 ****
--- 375,379 ----
IF(APPLE)
SET(CPACK_SRCS ${CPACK_SRCS}
+ CPack/cmCPackBundleGenerator.cxx
CPack/cmCPackOSXX11Generator.cxx
CPack/cmCPackPackageMakerGenerator.cxx
Index: cmFindPackageCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindPackageCommand.cxx,v
retrieving revision 1.36.2.1
retrieving revision 1.36.2.2
diff -C 2 -d -r1.36.2.1 -r1.36.2.2
*** cmFindPackageCommand.cxx 13 Jun 2008 12:55:17 -0000 1.36.2.1
--- cmFindPackageCommand.cxx 25 Jun 2008 13:51:32 -0000 1.36.2.2
***************
*** 1,3 ****
! /*=========================================================================
Program: CMake - Cross-Platform Makefile Generator
--- 1,3 ----
! /*=========================================================================
Program: CMake - Cross-Platform Makefile Generator
More information about the Cmake-commits
mailing list