Author: smr Date: 2010-07-30 11:44:13 +0000 (Fri, 30 Jul 2010) New Revision: 5072
Removed: trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian Modified: trunk/packages/insighttoolkit/trunk/debian/changelog trunk/packages/insighttoolkit/trunk/debian/rules Log: Use cdbs class cmake.mk instead of makefile.mk; drop common-configure-arch rule. Required moving contents of CMakeCache.txt.debian into rules. Deleted: trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian 2010-07-30 09:50:19 UTC (rev 5071) +++ trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian 2010-07-30 11:44:13 UTC (rev 5072) @@ -1,62 +0,0 @@ - -# This is the Kickstart CMakeCache file for the Debian build of ITK. -# Only those settings that are changed from the default are specified. - -// Make the build verbose, to ease debugging of buildd logs -CMAKE_VERBOSE_MAKEFILE:BOOL=ON - -// Conform to VTK's setting -CMAKE_CXX_COMPILER:STRING=/usr/bin/c++ - -// Don't build examples now (let the user later) -BUILD_EXAMPLES:BOOL=OFF - -// Build ITK with shared libraries -BUILD_SHARED_LIBS:BOOL=ON - -// Don't bother building the testing tree -BUILD_TESTING:BOOL=OFF - -// Give us an optimised release build -CMAKE_BUILD_TYPE:STRING=RELEASE - -// Install path prefix, prepended onto install directories -CMAKE_INSTALL_PREFIX:PATH=/usr - -// Don't build documentation files with doxygen: it's too slow -// The docs are downloadable from itk.org -BUILD_DOXYGEN:BOOL=OFF - -// The code still uses the older #include <iostream.h> style -CMAKE_CXX_FLAGS:STRING=-Wno-deprecated - -// We do not want rpath enabled -CMAKE_SKIP_RPATH:BOOL=ON - -//Build cswig Java wrapper support -ITK_CSWIG_JAVA:BOOL=ON - -//Build cswig Python wrapper support (requires CableSwig). -ITK_CSWIG_PYTHON:BOOL=ON - -//Build cswig Tcl wrapper support (requires CableSwig). -ITK_CSWIG_TCL:BOOL=ON - -// We haven't packaged this (yet) -ITK_DATA_ROOT:PATH=ITK_DATA_ROOT_NOTFOUND - -// Use the system libraries for these -ITK_USE_SYSTEM_GDCM:BOOL=ON -ITK_USE_SYSTEM_JPEG:BOOL=ON -ITK_USE_SYSTEM_PNG:BOOL=ON -ITK_USE_SYSTEM_TIFF:BOOL=ON -ITK_USE_SYSTEM_ZLIB:BOOL=ON -ITK_USE_SYSTEM_VXL:BOOL=OFF - -// Optional libraries -USE_FFTWD:BOOL=ON -USE_FFTWF:BOOL=ON - -// Enable concept checking -ITK_USE_CONCEPT_CHECKING:BOOL=ON -ITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON Modified: trunk/packages/insighttoolkit/trunk/debian/changelog =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/changelog 2010-07-30 09:50:19 UTC (rev 5071) +++ trunk/packages/insighttoolkit/trunk/debian/changelog 2010-07-30 11:44:13 UTC (rev 5072) @@ -1,3 +1,14 @@ +insighttoolkit (3.18.0-4) unstable; urgency=low + + * rules: Use cmake.mk instead of makefile.mk; drop common-configure-arch + rule. + + * CMakeCache.txt.debian: Remove. + * rules: Move contents of CMakeCache.txt.debian into rules as "-D" + options to cmake. + + -- Steve M. Robbins <[email protected]> Fri, 30 Jul 2010 06:42:26 -0500 + insighttoolkit (3.18.0-3) unstable; urgency=low * patches/hppa-complex-long-double.patch: New (thanks, Denis Modified: trunk/packages/insighttoolkit/trunk/debian/rules =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/rules 2010-07-30 09:50:19 UTC (rev 5071) +++ trunk/packages/insighttoolkit/trunk/debian/rules 2010-07-30 11:44:13 UTC (rev 5072) @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/class/javahelper.mk @@ -35,10 +35,6 @@ TCLMODDIR = usr/share/tcltk/tcl$(TCLVERS)/insighttoolkit$(VER_MAJOR) -DEB_BUILDDIR = $(CURDIR)/Build -DEB_DESTDIR = $(CURDIR)/debian/tmp -DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR) - # Parallel build of wrapping code is broken (e.g. tcl, python), # so can't use DEB_BUILD_OPTIONS. However parallel build is # useful in limited circumstances, so we leave a hook to enable it. @@ -52,20 +48,38 @@ clean:: rm -rf $(DEB_BUILDDIR) -$(DEB_BUILDDIR)/CMakeCache.txt: debian/CMakeCache.txt.debian - cp $< $@ - echo PYTHON_EXECUTABLE:FILEPATH=/usr/bin/$(PYVERS) >> $@ - echo PYTHON_INCLUDE_PATH:PATH=/usr/include/$(PYVERS) >> $@ - echo PYTHON_LIBRARY:FILEPATH=/usr/lib/lib$(PYVERS).so >> $@ - echo TCL_INCLUDE_PATH:PATH=/usr/include/tcl$(TCLVERS) >> $@ - echo TCL_LIBRARY:FILEPATH=/usr/lib/libtcl$(TCLVERS).so >> $@ - echo TCL_TCLSH:FILEPATH=/usr/bin/tclsh$(TCLVERS) >> $@ - echo TK_INCLUDE_PATH:PATH=/usr/include/tcl$(TCLVERS) >> $@ - echo TK_LIBRARY:FILEPATH=/usr/lib/libtk$(TCLVERS).so >> $@ +DEB_CMAKE_EXTRA_FLAGS = \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + -DBUILD_EXAMPLES:BOOL=OFF \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_TESTING:BOOL=OFF \ + -DCMAKE_BUILD_TYPE:STRING=RELEASE \ + -DBUILD_DOXYGEN:BOOL=OFF \ + -DCMAKE_CXX_FLAGS:STRING=-Wno-deprecated \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DITK_CSWIG_JAVA:BOOL=ON \ + -DITK_CSWIG_PYTHON:BOOL=ON \ + -DITK_CSWIG_TCL:BOOL=ON \ + -DITK_DATA_ROOT:PATH=ITK_DATA_ROOT_NOTFOUND \ + -DITK_USE_SYSTEM_GDCM:BOOL=ON \ + -DITK_USE_SYSTEM_JPEG:BOOL=ON \ + -DITK_USE_SYSTEM_PNG:BOOL=ON \ + -DITK_USE_SYSTEM_TIFF:BOOL=ON \ + -DITK_USE_SYSTEM_ZLIB:BOOL=ON \ + -DITK_USE_SYSTEM_VXL:BOOL=OFF \ + -DUSE_FFTWD:BOOL=ON \ + -DUSE_FFTWF:BOOL=ON \ + -DITK_USE_CONCEPT_CHECKING:BOOL=ON \ + -DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \ + -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/$(PYVERS) \ + -DPYTHON_INCLUDE_PATH:PATH=/usr/include/$(PYVERS) \ + -DPYTHON_LIBRARY:FILEPATH=/usr/lib/lib$(PYVERS).so \ + -DTCL_INCLUDE_PATH:PATH=/usr/include/tcl$(TCLVERS) \ + -DTCL_LIBRARY:FILEPATH=/usr/lib/libtcl$(TCLVERS).so \ + -DTCL_TCLSH:FILEPATH=/usr/bin/tclsh$(TCLVERS) \ + -DTK_INCLUDE_PATH:PATH=/usr/include/tcl$(TCLVERS) \ + -DTK_LIBRARY:FILEPATH=/usr/lib/libtk$(TCLVERS).so -common-configure-arch:: $(DEB_BUILDDIR)/CMakeCache.txt - cd $(DEB_BUILDDIR) && cmake .. - common-build-arch:: echo "$(pkg_tcl): non-dev-pkg-with-shlib-symlink" > debian/$(pkg_tcl).lintian-overrides echo "$(pkg_tcl): package-name-doesnt-match-sonames" >> debian/$(pkg_tcl).lintian-overrides _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
