Index: Modules/CMakeSystemSpecificInformation.cmake =================================================================== RCS file: /cvsroot/CMake/CMake/Modules/CMakeSystemSpecificInformation.cmake,v retrieving revision 1.26 diff -c -r1.26 CMakeSystemSpecificInformation.cmake *** a/Modules/CMakeSystemSpecificInformation.cmake 23 Apr 2004 17:12:33 -0000 1.26 --- b/Modules/CMakeSystemSpecificInformation.cmake 22 Jul 2004 19:25:03 -0000 *************** *** 66,72 **** ENDIF(CMAKE_C_COMPILER) IF(CMAKE_CXX_COMPILER) GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE) ! # since the gnu compiler has several names force gcc IF(CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_BASE_NAME g++) ENDIF(CMAKE_COMPILER_IS_GNUCXX) --- 66,72 ---- ENDIF(CMAKE_C_COMPILER) IF(CMAKE_CXX_COMPILER) GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE) ! # since the gnu compiler has several names force g++ IF(CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_BASE_NAME g++) ENDIF(CMAKE_COMPILER_IS_GNUCXX) Index: Source/cmMakefile.cxx =================================================================== RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v retrieving revision 1.255 diff -c -r1.255 cmMakefile.cxx *** a/Source/cmMakefile.cxx 20 Jul 2004 15:07:37 -0000 1.255 --- b/Source/cmMakefile.cxx 22 Jul 2004 19:25:08 -0000 *************** *** 422,428 **** this->ExecuteCommand(lf->m_Functions[i]); } ! // send scope ended to and funciton blockers if (filename) { // loop over all function blockers to see if any block this command --- 422,428 ---- this->ExecuteCommand(lf->m_Functions[i]); } ! // send scope ended to and function blockers if (filename) { // loop over all function blockers to see if any block this command Index: Source/cmTarget.cxx =================================================================== RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v retrieving revision 1.54 diff -c -r1.54 cmTarget.cxx *** a/Source/cmTarget.cxx 22 Apr 2004 18:38:17 -0000 1.54 --- b/Source/cmTarget.cxx 22 Jul 2004 19:25:10 -0000 *************** *** 67,73 **** for(std::vector::iterator id = depends.begin(); id != depends.end(); ++id) { ! // if there is a cutom rule to generate that dependency // then add it to the list cmSourceFile* outsf = makefile->GetSourceFileWithOutput(id->c_str()); --- 67,73 ---- for(std::vector::iterator id = depends.begin(); id != depends.end(); ++id) { ! // if there is a custom rule to generate that dependency // then add it to the list cmSourceFile* outsf = makefile->GetSourceFileWithOutput(id->c_str()); *************** *** 107,113 **** // add in the project file itself srcFilesToProcess.push(projFile); srcFilesQueued.insert(projFile); ! // add in the library depends for cusotm targets if (this->GetType() == cmTarget::UTILITY) { for (std::vector::iterator ic = --- 107,113 ---- // add in the project file itself srcFilesToProcess.push(projFile); srcFilesQueued.insert(projFile); ! // add in the library depends for custom targets if (this->GetType() == cmTarget::UTILITY) { for (std::vector::iterator ic = Index: Source/cmakewizard.h =================================================================== RCS file: /cvsroot/CMake/CMake/Source/cmakewizard.h,v retrieving revision 1.10 diff -c -r1.10 cmakewizard.h *** a/Source/cmakewizard.h 26 Aug 2003 19:06:52 -0000 1.10 --- b/Source/cmakewizard.h 22 Jul 2004 19:25:10 -0000 *************** *** 23,29 **** public: cmakewizard(); /** ! * Prompt the user to see if they want to see advanced entires. */ virtual bool AskAdvanced(); --- 23,29 ---- public: cmakewizard(); /** ! * Prompt the user to see if they want to see advanced entries. */ virtual bool AskAdvanced();