kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: try to fix qt problems

Browse Source
This commit is contained in:
Bill Hoffman 2005-09-10 10:33:10 -04:00
parent e6cb2ee6c4
commit f8c259b443
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindQt.cmake
View File

@ -116,10 +116,14 @@ IF(DESIRED_QT_VERSION MATCHES 4)
ENDIF(DESIRED_QT_VERSION MATCHES 4) ENDIF(DESIRED_QT_VERSION MATCHES 4)
IF(NOT QT3_INSTALLED AND NOT QT4_INSTALLED) IF(NOT QT3_INSTALLED AND NOT QT4_INSTALLED)
MESSAGE(SEND_ERROR "CMake was unable to find any QT versions, put qmake in your path, or set QT_QMAKE_EXECUTABLE.") IF(QT_REQUIRED)
MESSAGE(SEND_ERROR "CMake was unable to find any QT versions, put qmake in your path, or set QT_QMAKE_EXECUTABLE.")
ENDIF(QT_REQUIRED)
ELSE(NOT QT3_INSTALLED AND NOT QT4_INSTALLED) ELSE(NOT QT3_INSTALLED AND NOT QT4_INSTALLED)
IF(NOT QT_FOUND AND NOT DESIRED_QT_VERSION) IF(NOT QT_FOUND AND NOT DESIRED_QT_VERSION)
MESSAGE(SEND_ERROR "Multiple versions of QT found please set DESIRED_QT_VERSION") IF(QT_REQUIRED)
MESSAGE(SEND_ERROR "Multiple versions of QT found please set DESIRED_QT_VERSION")
ENDIF(QT_REQUIRED)
ENDIF(NOT QT_FOUND AND NOT DESIRED_QT_VERSION) ENDIF(NOT QT_FOUND AND NOT DESIRED_QT_VERSION)
IF(NOT QT_FOUND AND DESIRED_QT_VERSION) IF(NOT QT_FOUND AND DESIRED_QT_VERSION)
MESSAGE(SEND_ERROR "CMake was unable to find QT version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE.") MESSAGE(SEND_ERROR "CMake was unable to find QT version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE.")

6
Source/cmFileCommand.cxx
View File

@ -182,7 +182,6 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
return false; return false;
} }
#ifdef CMAKE_BUILD_WITH_CMAKE
std::vector<std::string>::const_iterator i = args.begin(); std::vector<std::string>::const_iterator i = args.begin();
i++; // Get rid of subcommand i++; // Get rid of subcommand
@ -227,11 +226,6 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
} }
m_Makefile->AddDefinition(variable.c_str(), output.c_str()); m_Makefile->AddDefinition(variable.c_str(), output.c_str());
return true; return true;
#else
(void)recurse;
this->SetError("GLOB is not implemented in the bootstrap CMake");
return false;
#endif
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

1
bootstrap
View File

@ -45,6 +45,7 @@ CMAKE_CXX_SOURCES="\
cmMakefile \ cmMakefile \
cmGeneratedFileStream \ cmGeneratedFileStream \
cmGlobalGenerator \ cmGlobalGenerator \
cmGlob \
cmLocalGenerator \ cmLocalGenerator \
cmSourceFile \ cmSourceFile \
cmSystemTools \ cmSystemTools \