[Cmake-commits] [cmake-commits] king committed cmLocalVisualStudio6Generator.cxx 1.158 1.159 cmLocalVisualStudio7Generator.cxx 1.249 1.250

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Sep 2 16:07:14 EDT 2009


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv15934/Source

Modified Files:
	cmLocalVisualStudio6Generator.cxx 
	cmLocalVisualStudio7Generator.cxx 
Log Message:
Silence VS generator for missing CMakeLists.txt

CMake Makefile generators silently ignore missing CMakeLists.txt files
and just treat the source directory as if it had an empty input file.
This will be addressed with a new CMake Policy, but for now we make the
VS generator consistent with the Makefile generator behavior.  The VS
generator will need to handle the OLD behavior of the policy anyway.


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.249
retrieving revision 1.250
diff -C 2 -d -r1.249 -r1.250
*** cmLocalVisualStudio7Generator.cxx	28 Jul 2009 18:30:15 -0000	1.249
--- cmLocalVisualStudio7Generator.cxx	2 Sep 2009 20:07:12 -0000	1.250
***************
*** 247,250 ****
--- 247,254 ----
    makefileIn += "CMakeLists.txt";
    makefileIn = cmSystemTools::CollapseFullPath(makefileIn.c_str());
+   if(!cmSystemTools::FileExists(makefileIn.c_str()))
+     {
+     return 0;
+     }
    std::string comment = "Building Custom Rule ";
    comment += makefileIn;

Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.158
retrieving revision 1.159
diff -C 2 -d -r1.158 -r1.159
*** cmLocalVisualStudio6Generator.cxx	14 Jul 2009 18:16:46 -0000	1.158
--- cmLocalVisualStudio6Generator.cxx	2 Sep 2009 20:07:10 -0000	1.159
***************
*** 267,270 ****
--- 267,274 ----
    makefileIn += "/";
    makefileIn += "CMakeLists.txt";
+   if(!cmSystemTools::FileExists(makefileIn.c_str()))
+     {
+     return;
+     }
    std::string comment = "Building Custom Rule ";
    comment += makefileIn;



More information about the Cmake-commits mailing list