SimDist/build
diff -u -r1.45 -r1.46
--- packages.m4 29 Jun 2011 21:40:20 -0000 1.45
+++ packages.m4 29 Jun 2011 22:15:59 -0000 1.46
@@ -235,9 +235,18 @@
LCIO_BASEDIR=$package_base_dir
LCIO_BUILDDIR=${package_base_dir}/src/cpp
+dnl Setting for shared lib build with CMake build.
+if test "${SIMDIST_ENABLE_SHARED}" == "1"; then
+ LCIO_CMAKE_BUILD_SHARED="ON"
+else
+ LCIO_CMAKE_BUILD_SHARED="OFF"
+fi
+
+
AC_SUBST(LCIO_BASEDIR)
AC_SUBST(LCIO_BUILDDIR)
AC_SUBST(LCIO_VERSION)
+AC_SUBST(LCIO_CMAKE_BUILD_SHARED)
])
SimDist/packages/lcio
diff -u -r1.18 -r1.19
--- Makefile.in 20 Aug 2010 21:46:17 -0000 1.18
+++ Makefile.in 29 Jun 2011 22:15:59 -0000 1.19
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.18 2010/08/20 21:46:17 jeremy Exp $
+# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.19 2011/06/29 22:15:59 jeremy Exp $
# default
# package build
@@ -14,9 +14,10 @@
# Build using cmake.
compile_cmake:
- cd $(PACKAGE_BUILDDIR); $(CMAKE) -DBUILD_SHARED_LIBS=OFF .; $(MAKE);
+ cd $(PACKAGE_BUILDDIR); $(CMAKE) -DBUILD_SHARED_LIBS=@LCIO_CMAKE_BUILD_SHARED@ .; $(MAKE);
# Remove example that does not compile on latest Cygwin.
+# FIXME: Still need to do this?
patch:
cd $(PACKAGE_BUILDDIR); rm -rf ./src/cpp/src/EXAMPLE/readcalibration.cc;
