summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2012-08-20 19:37:26 (GMT)
committerAlex Neundorf <neundorf@kde.org>2012-08-20 19:37:26 (GMT)
commit8aed02ae0f753dce76a167367ecf54be1d04de2b (patch)
treef7047cca137acb04afbf79eb682cd593ddf98d79
parent7ae4479d655b567d0e2c67e6bdab2580a5c3d4ea (diff)
downloadCMake-8aed02ae0f753dce76a167367ecf54be1d04de2b.zip
CMake-8aed02ae0f753dce76a167367ecf54be1d04de2b.tar.gz
CMake-8aed02ae0f753dce76a167367ecf54be1d04de2b.tar.bz2
-fix Java dependency scanning, broken in previous commit
Alex
-rw-r--r--Source/cmDependsJava.cxx2
-rw-r--r--Source/cmDependsJava.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmDependsJava.cxx b/Source/cmDependsJava.cxx
index 1d84914..ba0e8fb 100644
--- a/Source/cmDependsJava.cxx
+++ b/Source/cmDependsJava.cxx
@@ -38,7 +38,7 @@ bool cmDependsJava::WriteDependencies(const char *src, const char *,
return true;
}
-bool cmDependsJava::CheckDependencies(std::istream&,
+bool cmDependsJava::CheckDependencies(std::istream&, const char*,
std::map<std::string, DependencyVector >&)
{
return true;
diff --git a/Source/cmDependsJava.h b/Source/cmDependsJava.h
index fe6fef5..bf7e234 100644
--- a/Source/cmDependsJava.h
+++ b/Source/cmDependsJava.h
@@ -32,7 +32,8 @@ protected:
virtual bool WriteDependencies(const char *src, const char *file,
std::ostream& makeDepends, std::ostream& internalDepends);
virtual bool CheckDependencies(std::istream& internalDepends,
- std::map<std::string, DependencyVector >& validDeps);
+ const char* internalDependsFileName,
+ std::map<std::string, DependencyVector>& validDeps);
private:
cmDependsJava(cmDependsJava const&); // Purposely not implemented.