summaryrefslogtreecommitdiffstats
path: root/Source/cmVTKWrapJavaCommand.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2001-06-07 18:52:29 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2001-06-07 18:52:29 (GMT)
commit4f77d737c9d2ee681e17f5a672e18e85164550f1 (patch)
tree3fdcdaeac75422a958ff4e288adeafaf15de0ecf /Source/cmVTKWrapJavaCommand.cxx
parent5b4a11af80d27649ef191f918e92c3e41779e987 (diff)
downloadCMake-4f77d737c9d2ee681e17f5a672e18e85164550f1.zip
CMake-4f77d737c9d2ee681e17f5a672e18e85164550f1.tar.gz
CMake-4f77d737c9d2ee681e17f5a672e18e85164550f1.tar.bz2
ENH: move utilities to targets from makefile, and add versioning to cache
Diffstat (limited to 'Source/cmVTKWrapJavaCommand.cxx')
-rw-r--r--Source/cmVTKWrapJavaCommand.cxx12
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/cmVTKWrapJavaCommand.cxx b/Source/cmVTKWrapJavaCommand.cxx
index e9a8951..eba4723 100644
--- a/Source/cmVTKWrapJavaCommand.cxx
+++ b/Source/cmVTKWrapJavaCommand.cxx
@@ -56,10 +56,6 @@ bool cmVTKWrapJavaCommand::InitialPass(std::vector<std::string>& args)
return true;
}
- // add in a depend in the vtkVTKWrapJava executable
- m_Makefile->AddUtility("vtkWrapJava");
- m_Makefile->AddUtility("vtkParseJava");
-
// what is the current source dir
std::string cdir = m_Makefile->GetCurrentDirectory();
@@ -123,16 +119,16 @@ void cmVTKWrapJavaCommand::FinalPass()
std::string res2 = resultDirectory + "/" +
m_OriginalNames[classNum] + ".java";
- std::string cmd = wjava + " " + m_WrapHeaders[classNum] + " "
+ std::string cmd = " " + m_WrapHeaders[classNum] + " "
+ hints + (m_WrapClasses[classNum].IsAnAbstractClass() ? " 0 " : " 1 ") + " > " + m_WrapClasses[classNum].GetSourceName() + ".cxx";
m_Makefile->AddCustomCommand(m_WrapHeaders[classNum].c_str(),
- cmd.c_str(), depends,
+ wjava.c_str(), cmd.c_str(), depends,
res.c_str(), m_LibraryName.c_str());
- cmd = pjava + " " + m_WrapHeaders[classNum] + " "
+ cmd = " " + m_WrapHeaders[classNum] + " "
+ hints + (m_WrapClasses[classNum].IsAnAbstractClass() ? " 0 " : " 1 ") + " > " + res2;
m_Makefile->AddCustomCommand(m_WrapHeaders[classNum].c_str(),
- cmd.c_str(), depends2,
+ pjava.c_str(), cmd.c_str(), depends2,
res2.c_str(), m_LibraryName.c_str());
alldepends.push_back(res2);
}