SimDist/packages/lcio
diff -u -r1.10 -r1.11
--- Makefile.in 23 May 2008 21:05:34 -0000 1.10
+++ Makefile.in 23 May 2008 21:32:41 -0000 1.11
@@ -1,12 +1,9 @@
-# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.10 2008/05/23 21:05:34 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.11 2008/05/23 21:32:41 jeremy Exp $
# default
targets := cvs config
-ifdef ANT
- targets += compile_ant
-endif
-
+# optional cmake build for mokka
ifdef CMAKE
targets += compile_cmake
endif
@@ -19,7 +16,7 @@
PATH="$(LCIO)/tools:$(LCIO)/bin:$(PATH)" ; cd $(PACKAGE_BUILDDIR) ; $(ANT) aid.generate cpp;:
compile_cmake:
- cd $(PACKAGE_BUILDDIR); $(CMAKE) -DBUILD_SHARED_LIBS=OFF .; mkdir build; cd build; $(CMAKE) -C ../BuildSetup.cmake ..; cd ..; $(MAKE) install
+ cd $(PACKAGE_BUILDDIR); $(CMAKE) -DBUILD_SHARED_LIBS=OFF -DJAVA_HOME=$(JAVA_HOME) .; mkdir build; cd build; $(CMAKE) -C ../BuildSetup.cmake ..; cd ..; $(MAKE) install
# package build
include ../../build/package.gmk