Hello community, here is the log from the commit of package CSXCAD for openSUSE:Factory checked in at 2016-09-11 00:54:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/CSXCAD (Old) and /work/SRC/openSUSE:Factory/.CSXCAD.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "CSXCAD" Changes: -------- --- /work/SRC/openSUSE:Factory/CSXCAD/CSXCAD.changes 2016-04-30 23:29:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.CSXCAD.new/CSXCAD.changes 2016-09-11 00:54:17.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 26 21:39:05 UTC 2016 - [email protected] + +- Set SRPM group field, and bump license to LGPL-3.0+. + +------------------------------------------------------------------- +Fri Aug 26 18:13:15 UTC 2016 - [email protected] + +- Update to version 0.6.1 + * Bug fixes. +- Drop obsolete + * CSXCAD-cxx-flags.patch + * CSXCAD-vtk7.patch +- Fix build with HDF5 + * CSXCAD-hdf5.patch + +------------------------------------------------------------------- Old: ---- CSXCAD-0.6.0.tar.gz CSXCAD-cxx-flags.patch CSXCAD-vtk7.patch New: ---- CSXCAD-0.6.1.tar.gz CSXCAD-hdf5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CSXCAD.spec ++++++ --- /var/tmp/diff_new_pack.fnph00/_old 2016-09-11 00:54:18.000000000 +0200 +++ /var/tmp/diff_new_pack.fnph00/_new 2016-09-11 00:54:18.000000000 +0200 @@ -18,27 +18,25 @@ Name: CSXCAD %define octpkg csxcad -Version: 0.6.0 +Version: 0.6.1 Release: 0 %define so_ver 0 %define libname lib%{name}%{so_ver} Summary: A C++ library to describe geometrical objects and their properties -License: LGPL-3.0 -Group: System/Libraries +License: LGPL-3.0+ +Group: Productivity/Scientific/Physics Url: http://openems.de Source0: https://github.com/thliebig/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM CSXCAD-cxx-flags.patch -- Fix additional cxx flags -Patch1: CSXCAD-cxx-flags.patch -# PATCH-FIX-UPSTREAM CSXCAD-vtk.patch -- Fix linking for VTK >= 6.3 -Patch2: CSXCAD-vtk.patch +# PATCH-FIX-UPSTREAM CSXCAD-vtk.patch +Patch1: CSXCAD-vtk.patch # PATCH-FIX-OPENSUSE CSXCAD-no-build-date.patch -- Remove build time from binaries -Patch3: CSXCAD-no-build-date.patch +Patch2: CSXCAD-no-build-date.patch # PATCH-FIX-OPENSUSE CSXCAD-octave-AppCSXCAD-load.patch -- Fix AppCSXCAD.sh load -Patch4: CSXCAD-octave-AppCSXCAD-load.patch +Patch3: CSXCAD-octave-AppCSXCAD-load.patch # PATCH-FIX-OPENSUSE CSXCAD-readme-octave-package.patch -- Add correct instruction about Octave and MATLAB packages -Patch5: CSXCAD-readme-octave-package.patch -# PATCH-FIX-OPENSUSE CSXCAD-vtk7.patch -- Fix build against vtk7 -Patch6: CSXCAD-vtk7.patch +Patch4: CSXCAD-readme-octave-package.patch +# PATCH-FIX-UPSTREAM CSXCAD-HDF5.patch +Patch5: CSXCAD-hdf5.patch BuildRequires: boost-devel BuildRequires: cgal-devel BuildRequires: cmake @@ -46,6 +44,7 @@ BuildRequires: gcc-c++ BuildRequires: hdf5-devel BuildRequires: octave-devel +BuildRequires: python3-devel BuildRequires: tinyxml-devel BuildRequires: vtk-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -104,19 +103,15 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -cat > DESCRIPTION << 'EOF' -Name: %{octpkg} -Version: %{version} -Date: 2015-10-10 -Author: Thorsten Liebig -Maintainer: Thorsten Liebig -Title: Describing geometrical objects and their properties -Description: CSXCAD is a library to describe geometrical objects and their physical -or non-physical properties. -Categories: openEMS -EOF +echo "Name: %{octpkg}" >> DESCRIPTION +echo "Version: %{version}" >> DESCRIPTION +echo "Date: 2015-10-10" >> DESCRIPTION +echo "Author: Thorsten Liebig" >> DESCRIPTION +echo "Maintainer: Thorsten Liebig" >> DESCRIPTION +echo "Title: Describing geometrical objects and their properties" >> DESCRIPTION +echo "Description: CSXCAD is a library to describe geometrical objects and their physical or non-physical properties." >> DESCRIPTION +echo "Categories: openEMS" >> DESCRIPTION mkdir octave_build cp -r matlab octave_build ++++++ CSXCAD-0.6.0.tar.gz -> CSXCAD-0.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/CMakeLists.txt new/CSXCAD-0.6.1/CMakeLists.txt --- old/CSXCAD-0.6.0/CMakeLists.txt 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/CMakeLists.txt 2016-05-12 21:08:27.000000000 +0200 @@ -13,7 +13,7 @@ # default set(LIB_VERSION_MAJOR 0) set(LIB_VERSION_MINOR 6) -set(LIB_VERSION_PATCH 0) +set(LIB_VERSION_PATCH 1) set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH}) set(VERSION "v${LIB_VERSION_STRING}") @@ -67,14 +67,24 @@ # fparser # $ cmake -D FPARSER_ROOT_DIR=~/opt/openEMS . +IF(NOT EXISTS ${FPARSER_ROOT_DIR}) + SET(FPARSER_ROOT_DIR /usr) +ENDIF() +message(STATUS "FPARSER_ROOT_DIR: ${FPARSER_ROOT_DIR}" ) find_library(fparser_LIBRARIES NAMES fparser - HINTS ${FPARSER_ROOT_DIR}/lib + HINTS ${FPARSER_ROOT_DIR}/lib${LIB_SUFFIX} + NO_CMAKE_FIND_ROOT_PATH +) +message(STATUS "fparser_LIBRARIES: ${fparser_LIBRARIES}" ) +find_path(fparser_INCLUDE_DIR + NAMES fparser.hh + HINTS ${FPARSER_ROOT_DIR}/include ${FPARSER_ROOT_DIR}/include/fparser NO_CMAKE_FIND_ROOT_PATH ) -message(STATUS "fparser: ${fparser_LIBRARIES}" ) +message(STATUS "fparser_INCLUDE_DIR: ${fparser_INCLUDE_DIR}" ) #TODO test if fparser was found -INCLUDE_DIRECTORIES( ${FPARSER_ROOT_DIR}/include ) +INCLUDE_DIRECTORIES( ${fparser_INCLUDE_DIR} ) # TinyXML module from https://github.com/ros/cmake_modules find_package(TinyXML REQUIRED) @@ -94,7 +104,7 @@ # cgal needs, fail o Linux otherwise if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") - set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-frounding-math" ) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -frounding-math" ) endif() # TODO what are the needed libs? @@ -111,35 +121,23 @@ find_package(VTK 6.1 REQUIRED) else() # prefer >=6.1, fallback to >=5.4 - find_package(VTK REQUIRED) + find_package(VTK 6.1 COMPONENTS vtkIOGeometry vtkIOPLY NO_MODULE) + IF (NOT ${VTK_FOUND}) + find_package(VTK REQUIRED) + endif() endif() message(STATUS "Found package VTK. Using version " ${VTK_VERSION}) include(${VTK_USE_FILE}) INCLUDE_DIRECTORIES (${VTK_INCLUDE_DIR}) -if("${VTK_MAJOR_VERSION}" EQUAL 6) - set( vtk_LIBS - vtkCommonCore - vtkCommonDataModel - vtkIOLegacy - vtkIOXML - vtkIOGeometry - vtkIOPLY - vtksys - vtkIOCore - ) +if("${VTK_MAJOR_VERSION}" GREATER 5) + set( vtk_LIBS ${VTK_LIBRARIES} ) else() set( vtk_LIBS vtkCommon - vtkFiltering - vtkGraphics - vtkHybrid - vtkIO - vtkRendering - vtkWidgets - QVTK ) endif() +message(STATUS "vtk libraries " ${vtk_LIBS}) # depend on fparser.hh ADD_SUBDIRECTORY( src ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/CSXCAD.pro new/CSXCAD-0.6.1/CSXCAD.pro --- old/CSXCAD-0.6.0/CSXCAD.pro 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/CSXCAD.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,266 +0,0 @@ -# -# Copyright (C) 2010,2011 Thorsten Liebig ([email protected]) -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -CONFIG -= qt -CONFIG += rtti exceptions shared -TEMPLATE = lib -INCLUDEPATH += . -OBJECTS_DIR = obj - -VERSION = 0.6.0 - -# add git revision -GITREV = $$system(git describe --tags) -isEmpty(GITREV):GITREV=$$VERSION -DEFINES += GIT_VERSION=\\\"$$GITREV\\\" - -# remove unnecessary webkit define -DEFINES -= QT_WEBKIT - -exists(localPaths.pri) { - include(localPaths.pri) -} - -unix:!macx { - LIBS += -ltinyxml - DEFINES += TIXML_USE_STL - LIBS += -lhdf5_hl -lhdf5 - LIBS += -lCGAL - - #vtk - isEmpty(VTK_INCLUDEPATH) { - INCLUDEPATH += /usr/include/vtk-5.2 \ - /usr/include/vtk-5.4 \ - /usr/include/vtk-5.6 \ - /usr/include/vtk-5.8 \ - /usr/include/vtk-5.10 \ - /usr/include/vtk-6.0 \ - /usr/include/vtk-6.1 \ - /usr/include/vtk-6.2 \ - /usr/include/vtk-6.3 \ - /usr/include/vtk - } else { - INCLUDEPATH += $$VTK_INCLUDEPATH - } - - #hdf5 - !isEmpty(HDF5_ROOT) {LIBS += -L$$HDF5_ROOT} - INCLUDEPATH += /usr/include/hdf5/serial - INCLUDEPATH += /usr/include/mpi - - #fparser - isEmpty(FPARSER_ROOT) { - FPARSER_ROOT = /usr - } else { - INCLUDEPATH += $$FPARSER_ROOT/include - LIBS += -L$$FPARSER_ROOT/lib - QMAKE_LFLAGS += \'-Wl,-rpath,$$FPARSER_ROOT/lib\' - } - LIBS += -lfparser -} - -win32 { - DEFINES += BUILD_CSXCAD_LIB - - isEmpty(WIN32_LIB_ROOT) { - WIN32_LIB_ROOT = .. - } - - # #3rd party libraries# - # fparser - INCLUDEPATH += $$WIN32_LIB_ROOT/fparser/include - LIBS += -L$$WIN32_LIB_ROOT/fparser/bin -lfparser4 - # tinyxml - INCLUDEPATH += $$WIN32_LIB_ROOT/tinyxml/include - LIBS += -L$$WIN32_LIB_ROOT/tinyxml/bin -ltinyxml2 - DEFINES += TIXML_USE_STL - # hdf5 - INCLUDEPATH += $$WIN32_LIB_ROOT/hdf5/include - LIBS += -L$$WIN32_LIB_ROOT/hdf5/lib -lhdf5_hl -lhdf5 - # zlib - LIBS += -L$$WIN32_LIB_ROOT/zlib/lib -lz - # vtk - INCLUDEPATH += $$WIN32_LIB_ROOT/vtk/include/vtk-5.10 - LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lvtkIO -lvtkFiltering - #boost, needed by cgal - INCLUDEPATH += $$WIN32_LIB_ROOT/boost/include - LIBS += -L$$WIN32_LIB_ROOT/boost/lib -lboost_thread -lboost_system -lboost_date_time -lboost_serialization - #cgal - INCLUDEPATH += $$WIN32_LIB_ROOT/cgal/include - LIBS += -L$$WIN32_LIB_ROOT/cgal/bin -lCGAL -} - -macx { - LIBS += -ltinyxml - DEFINES += TIXML_USE_STL - LIBS += -lhdf5_hl -lhdf5 - LIBS += -lCGAL - - #vtk5 provided with Homebrew - isEmpty(VTK_INCLUDEPATH) { - INCLUDEPATH += \ - /usr/local/opt/vtk5/include \ - /usr/local/opt/vtk5/include/vtk-5.10 - - } else { - INCLUDEPATH += $$VTK_INCLUDEPATH - } - - LIBS += -L/usr/local/opt/vtk5/lib/vtk-5.10 -lvtkCommon -lvtkIO -lvtkFiltering - LIBS += -L/usr/local/lib -lboost_thread-mt -lboost_system -lboost_date_time -lboost_serialization - - #hdf5 (is this MPI?) - INCLUDEPATH += /usr/local/opt/hd5/include - - #fparser - #isEmpty(FPARSER_ROOT) { - # FPARSER_ROOT = /usr - #} else { - INCLUDEPATH += $$FPARSER_ROOT/include - LIBS += -L$$FPARSER_ROOT/lib - QMAKE_LFLAGS += \'-Wl,-rpath,$$FPARSER_ROOT/lib\' - #} - LIBS += -lfparser -} - -# vtk includes deprecated header files; silence the corresponding warning -QMAKE_CXXFLAGS += -Wno-deprecated -frounding-math - -# enable this flag to use with valgrind! valgrind emulates a buggy FPU -# QMAKE_CXXFLAGS += -DCGAL_DISABLE_ROUNDING_MATH_CHECK=ON - -# Input -PUB_HEADERS += src/ContinuousStructure.h \ - src/CSPrimitives.h \ - src/CSProperties.h \ - src/CSRectGrid.h \ - src/CSXCAD_Global.h \ - src/ParameterObjects.h \ - src/CSFunctionParser.h \ - src/CSUseful.h \ - src/ParameterCoord.h \ - src/CSTransform.h \ - src/CSBackgroundMaterial.h \ - src/CSPrimPoint.h \ - src/CSPrimBox.h \ - src/CSPrimMultiBox.h \ - src/CSPrimSphere.h \ - src/CSPrimSphericalShell.h \ - src/CSPrimCylinder.h \ - src/CSPrimCylindricalShell.h \ - src/CSPrimPolygon.h \ - src/CSPrimLinPoly.h \ - src/CSPrimRotPoly.h \ - src/CSPrimPolyhedron.h \ - src/CSPrimPolyhedronReader.h \ - src/CSPrimCurve.h \ - src/CSPrimWire.h \ - src/CSPrimUserDefined.h \ - src/CSPropUnknown.h \ - src/CSPropMaterial.h \ - src/CSPropDispersiveMaterial.h \ - src/CSPropLorentzMaterial.h \ - src/CSPropDebyeMaterial.h \ - src/CSPropDiscMaterial.h \ - src/CSPropLumpedElement.h \ - src/CSPropMetal.h \ - src/CSPropConductingSheet.h \ - src/CSPropExcitation.h \ - src/CSPropProbeBox.h \ - src/CSPropDumpBox.h \ - src/CSPropResBox.h - -HEADERS += $$PUB_HEADERS \ - src/CSPrimPolyhedron_p.h - -SOURCES += src/ContinuousStructure.cpp \ - src/CSPrimitives.cpp \ - src/CSProperties.cpp \ - src/CSRectGrid.cpp \ - src/ParameterObjects.cpp \ - src/CSFunctionParser.cpp \ - src/CSUseful.cpp \ - src/ParameterCoord.cpp \ - src/CSTransform.cpp \ - src/CSPrimPoint.cpp \ - src/CSPrimBox.cpp \ - src/CSPrimMultiBox.cpp \ - src/CSPrimSphere.cpp \ - src/CSPrimSphericalShell.cpp \ - src/CSPrimCylinder.cpp \ - src/CSPrimCylindricalShell.cpp \ - src/CSPrimPolygon.cpp \ - src/CSPrimLinPoly.cpp \ - src/CSPrimRotPoly.cpp \ - src/CSPrimPolyhedron.cpp \ - src/CSPrimPolyhedronReader.cpp \ - src/CSPrimCurve.cpp \ - src/CSPrimWire.cpp \ - src/CSPrimUserDefined.cpp \ - src/CSPropUnknown.cpp \ - src/CSPropMaterial.cpp \ - src/CSPropDispersiveMaterial.cpp \ - src/CSPropLorentzMaterial.cpp \ - src/CSPropDebyeMaterial.cpp \ - src/CSPropDiscMaterial.cpp \ - src/CSPropLumpedElement.cpp \ - src/CSPropMetal.cpp \ - src/CSPropConductingSheet.cpp \ - src/CSPropExcitation.cpp \ - src/CSPropProbeBox.cpp \ - src/CSPropDumpBox.cpp \ - src/CSPropResBox.cpp \ - src/CSBackgroundMaterial.cpp - -# -# create tar file -# -tarball.target = tarball -tarball.commands = git archive --format=tar --prefix=CSXCAD-$$VERSION/ HEAD | bzip2 > CSXCAD-$${VERSION}.tar.bz2 -QMAKE_EXTRA_TARGETS += tarball - -# -# INSTALL -# -isEmpty(PREFIX) { - PREFIX = /usr/local -} -install.target = install -install.commands = mkdir -p \"$$PREFIX/lib$$LIB_SUFFIX\" -install.commands += && mkdir -p \"$$PREFIX/include/CSXCAD\" -install.commands += && mkdir -p \"$$PREFIX/share/CSXCAD/matlab\" -install.commands += && cp $$PUB_HEADERS \"$$PREFIX/include/CSXCAD/\" -unix:!macx:install.commands += && cp -at \"$$PREFIX/lib$$LIB_SUFFIX/\" libCSXCAD.so* -win32:install.commands += && cp -at \"$$PREFIX/lib$$LIB_SUFFIX/\" release/CSXCAD0.dll -macx:install.commands += && cp libCSXCAD*.dylib \"$$PREFIX/lib$$LIB_SUFFIX/\" -install.commands += && cp -r matlab/* \"$$PREFIX/share/CSXCAD/matlab\" -QMAKE_EXTRA_TARGETS += install - -# -# create .PHONY target -# -phony.target = .PHONY -phony.depends = $$QMAKE_EXTRA_TARGETS -QMAKE_EXTRA_TARGETS += phony - -# -# create documentation -# use -# make docs -# to start doxygen. It will generate html, latex and compressed help for QtCreator -# -include(doc.pri) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/doc.pri new/CSXCAD-0.6.1/doc.pri --- old/CSXCAD-0.6.0/doc.pri 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/doc.pri 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -OTHER_FILES += $$PWD/doxydoc - -docs.target = docs -docs.commands = CSXCAD_VERSION=$$VERSION doxygen $$PWD/doxydoc - -QMAKE_EXTRA_TARGETS += docs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/src/CSPrimCurve.cpp new/CSXCAD-0.6.1/src/CSPrimCurve.cpp --- old/CSXCAD-0.6.0/src/CSPrimCurve.cpp 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/src/CSPrimCurve.cpp 2016-05-12 21:08:27.000000000 +0200 @@ -71,6 +71,15 @@ points.at(point_index)->SetValue(nu,val); } +bool CSPrimCurve::GetPoint(size_t point_index, double point[3]) +{ + if (point_index>=GetNumberOfPoints()) return false; + point[0] = points.at(point_index)->GetValue(0); + point[1] = points.at(point_index)->GetValue(1); + point[2] = points.at(point_index)->GetValue(2); + return true; +} + bool CSPrimCurve::GetPoint(size_t point_index, double* point, CoordinateSystem c_system, bool transform) { if (point_index>=GetNumberOfPoints()) return false; @@ -82,6 +91,11 @@ return true; } +void CSPrimCurve::ClearPoints() +{ + points.clear(); +} + bool CSPrimCurve::GetBoundBox(double dBoundBox[6], bool /*PreserveOrientation*/) { // cerr << "CSPrimCurve::GetBoundBox: Warning: The bounding box for this object is not calculated properly... " << std::endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/src/CSPrimCurve.h new/CSXCAD-0.6.1/src/CSPrimCurve.h --- old/CSXCAD-0.6.0/src/CSPrimCurve.h 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/src/CSPrimCurve.h 2016-05-12 21:08:27.000000000 +0200 @@ -38,9 +38,12 @@ virtual void SetCoord(size_t point_index, int nu, std::string val); virtual size_t GetNumberOfPoints() {return points.size();} + virtual bool GetPoint(size_t point_index, double point[3]); //! Get the point coordinates for the given index in the specified coordinate system virtual bool GetPoint(size_t point_index, double* point, CoordinateSystem c_system, bool transform=true); + virtual void ClearPoints(); + virtual bool GetBoundBox(double dBoundBox[6], bool PreserveOrientation=false); virtual bool IsInside(const double* Coord, double tol=0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/src/CSPrimPolyhedron.cpp new/CSXCAD-0.6.1/src/CSPrimPolyhedron.cpp --- old/CSXCAD-0.6.0/src/CSPrimPolyhedron.cpp 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/src/CSPrimPolyhedron.cpp 2016-05-12 21:08:27.000000000 +0200 @@ -193,7 +193,7 @@ //build tree delete d_ptr->m_PolyhedronTree; - d_ptr->m_PolyhedronTree = new CGAL::AABB_tree< Traits >(d_ptr->m_Polyhedron.facets_begin(),d_ptr->m_Polyhedron.facets_end()); + d_ptr->m_PolyhedronTree = new CGAL::AABB_tree< Traits >(faces(d_ptr->m_Polyhedron).first,faces(d_ptr->m_Polyhedron).second,d_ptr->m_Polyhedron); //update local bounding box GetBoundBox(m_BoundBox); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/src/CSPrimPolyhedronReader.cpp new/CSXCAD-0.6.1/src/CSPrimPolyhedronReader.cpp --- old/CSXCAD-0.6.0/src/CSPrimPolyhedronReader.cpp 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/src/CSPrimPolyhedronReader.cpp 2016-05-12 21:08:27.000000000 +0200 @@ -35,6 +35,7 @@ Type = POLYHEDRONREADER; PrimTypeName = "PolyhedronReader"; m_filetype = UNKNOWN; + m_filename = std::string(); } CSPrimPolyhedronReader::CSPrimPolyhedronReader(CSPrimPolyhedronReader* primPHReader, CSProperties *prop) : CSPrimPolyhedron(primPHReader, prop) @@ -51,6 +52,7 @@ Type = POLYHEDRONREADER; PrimTypeName = "PolyhedronReader"; m_filetype = UNKNOWN; + m_filename = std::string(); } CSPrimPolyhedronReader::~CSPrimPolyhedronReader() @@ -105,7 +107,7 @@ else m_filetype=UNKNOWN; - if (ReadFile(m_filename)==false) + if (ReadFile()==false) { std::cerr << "CSPrimPolyhedronReader::ReadFromXML: Failed to read file." << std::endl; return false; @@ -114,7 +116,7 @@ return BuildTree(); } -bool CSPrimPolyhedronReader::ReadFile(std::string filename) +bool CSPrimPolyhedronReader::ReadFile() { vtkPolyData *polydata = NULL; switch (m_filetype) @@ -122,7 +124,7 @@ case STL_FILE: { vtkSTLReader* reader = vtkSTLReader::New(); - reader->SetFileName(filename.c_str()); + reader->SetFileName(m_filename.c_str()); reader->SetMerging(1); polydata = reader->GetOutput(0); reader->Update(); @@ -131,7 +133,7 @@ case PLY_FILE: { vtkPLYReader* reader = vtkPLYReader::New(); - reader->SetFileName(filename.c_str()); + reader->SetFileName(m_filename.c_str()); polydata = reader->GetOutput(0); reader->Update(); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/src/CSPrimPolyhedronReader.h new/CSXCAD-0.6.1/src/CSPrimPolyhedronReader.h --- old/CSXCAD-0.6.0/src/CSPrimPolyhedronReader.h 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/src/CSPrimPolyhedronReader.h 2016-05-12 21:08:27.000000000 +0200 @@ -40,13 +40,14 @@ virtual void SetFilename(std::string name) {m_filename=name;} virtual std::string GetFilename() const {return m_filename;} + virtual void SetFileType(FileType ft) {m_filetype=ft;} virtual FileType GetFileType() const {return m_filetype;} virtual bool Update(std::string *ErrStr=NULL); virtual bool Write2XML(TiXmlElement &elem, bool parameterised=true); virtual bool ReadFromXML(TiXmlNode &root); - virtual bool ReadFile(std::string filename); + virtual bool ReadFile(); protected: std::string m_filename; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/src/CSPrimPolyhedron_p.h new/CSXCAD-0.6.1/src/CSPrimPolyhedron_p.h --- old/CSXCAD-0.6.0/src/CSPrimPolyhedron_p.h 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/src/CSPrimPolyhedron_p.h 2016-05-12 21:08:27.000000000 +0200 @@ -6,8 +6,7 @@ #include <CGAL/Polyhedron_3.h> #include <CGAL/AABB_tree.h> #include <CGAL/AABB_traits.h> -#include <CGAL/AABB_polyhedron_triangle_primitive.h> -#include <CGAL/AABB_polyhedron_segment_primitive.h> +#include <CGAL/AABB_face_graph_triangle_primitive.h> typedef CGAL::Simple_cartesian<double> Kernel; @@ -25,7 +24,7 @@ }; typedef Kernel::Point_3 Point; -typedef CGAL::AABB_polyhedron_triangle_primitive<Kernel,Polyhedron> Primitive; +typedef CGAL::AABB_face_graph_triangle_primitive<Polyhedron> Primitive; typedef CGAL::AABB_traits<Kernel, Primitive> Traits; typedef CGAL::Simple_cartesian<double>::Ray_3 Ray; typedef Kernel::Segment_3 Segment; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/src/CSPrimitives.cpp new/CSXCAD-0.6.1/src/CSPrimitives.cpp --- old/CSXCAD-0.6.0/src/CSPrimitives.cpp 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/src/CSPrimitives.cpp 2016-05-12 21:08:27.000000000 +0200 @@ -77,49 +77,38 @@ /*********************CSPrimitives********************************************************************/ CSPrimitives::CSPrimitives(unsigned int ID, ParameterSet* paraSet, CSProperties* prop) { - clProperty=NULL; + this->Init(); SetProperty(prop); uiID=ID; clParaSet=paraSet; - m_Transform=NULL; - iPriority=0; - PrimTypeName = std::string("Base Type"); - m_Primtive_Used = false; - m_MeshType = CARTESIAN; - m_PrimCoordSystem = UNDEFINED_CS; - m_BoundBox_CoordSys = UNDEFINED_CS; - m_Dimension = 0; - for (int n=0;n<6;++n) - m_BoundBox[n]=0; - m_BoundBoxValid = false; } CSPrimitives::CSPrimitives(CSPrimitives* prim, CSProperties *prop) { - clProperty=NULL; + this->Init(); if (prop==NULL) SetProperty(prim->clProperty); else SetProperty(prop); - uiID=g_PrimUniqueIDCounter++; clParaSet=prim->clParaSet; m_Transform=CSTransform::New(prim->m_Transform); iPriority=prim->iPriority; - PrimTypeName = std::string("Base Type"); - m_Primtive_Used = false; m_MeshType = prim->m_MeshType; m_PrimCoordSystem = prim->m_PrimCoordSystem; m_Dimension = prim->m_Dimension; - for (int n=0;n<6;++n) - m_BoundBox[n]=0; } - CSPrimitives::CSPrimitives(ParameterSet* paraSet, CSProperties* prop) { - clProperty=NULL; + this->Init(); SetProperty(prop); clParaSet=paraSet; +} + +void CSPrimitives::Init() +{ + clProperty=NULL; + clParaSet=NULL; m_Transform=NULL; uiID=g_PrimUniqueIDCounter++; iPriority=0; @@ -127,9 +116,11 @@ m_Primtive_Used = false; m_MeshType = CARTESIAN; m_PrimCoordSystem = UNDEFINED_CS; + m_BoundBox_CoordSys = UNDEFINED_CS; m_Dimension = 0; for (int n=0;n<6;++n) m_BoundBox[n]=0; + m_BoundBoxValid = false; } void CSPrimitives::SetProperty(CSProperties *prop) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/src/CSPrimitives.h new/CSXCAD-0.6.1/src/CSPrimitives.h --- old/CSXCAD-0.6.0/src/CSPrimitives.h 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/src/CSPrimitives.h 2016-05-12 21:08:27.000000000 +0200 @@ -72,6 +72,8 @@ public: virtual ~CSPrimitives(); + virtual void Init(); + //! Primitive type definitions. enum PrimitiveType { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/src/CSPropDiscMaterial.cpp new/CSXCAD-0.6.1/src/CSPropDiscMaterial.cpp --- old/CSXCAD-0.6.0/src/CSPropDiscMaterial.cpp 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/src/CSPropDiscMaterial.cpp 2016-05-12 21:08:27.000000000 +0200 @@ -26,9 +26,6 @@ #include "ParameterCoord.h" #include "CSPropDiscMaterial.h" -#define vtkRenderingCore_AUTOINIT4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL) -#define vtkRenderingVolume_AUTOINIT 1(vtkRenderingVolumeOpenGL) - CSPropDiscMaterial::CSPropDiscMaterial(ParameterSet* paraSet) : CSPropMaterial(paraSet) { Type=(CSProperties::PropertyType)(DISCRETE_MATERIAL | MATERIAL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/src/ContinuousStructure.cpp new/CSXCAD-0.6.1/src/ContinuousStructure.cpp --- old/CSXCAD-0.6.0/src/ContinuousStructure.cpp 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/src/ContinuousStructure.cpp 2016-05-12 21:08:27.000000000 +0200 @@ -399,7 +399,7 @@ return ObjArea; } -const char* ContinuousStructure::Update() +std::string ContinuousStructure::Update() { ErrString.clear(); @@ -410,7 +410,7 @@ for (size_t i=0;i<vPrimitives.size();++i) vPrimitives.at(i)->Update(&ErrString); - return ErrString.c_str(); + return std::string(ErrString); } void ContinuousStructure::clear() @@ -461,8 +461,13 @@ bool ContinuousStructure::Write2XML(const char* file, bool parameterised, bool sparse) { + return this->Write2XML(std::string(file), parameterised, sparse); +} + +bool ContinuousStructure::Write2XML(std::string file, bool parameterised, bool sparse) +{ TiXmlDocument doc(file); - doc.InsertEndChild(TiXmlDeclaration("1.0","ISO-8859-1","yes")); + doc.InsertEndChild(TiXmlDeclaration("1.0","UTF-8","yes")); if (Write2XML(&doc,parameterised,sparse)==false) return false; @@ -621,7 +626,7 @@ ErrString.clear(); TiXmlDocument doc(file); - if (!doc.LoadFile()) { ErrString.append("Error: File-Loading failed!!! File: ");ErrString.append(file); return ErrString.c_str();} + if (!doc.LoadFile(TIXML_ENCODING_UTF8)) { ErrString.append("Error: File-Loading failed!!! File: ");ErrString.append(file); return ErrString.c_str();} return ReadFromXML(&doc); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/src/ContinuousStructure.h new/CSXCAD-0.6.1/src/ContinuousStructure.h --- old/CSXCAD-0.6.0/src/ContinuousStructure.h 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/src/ContinuousStructure.h 2016-05-12 21:08:27.000000000 +0200 @@ -157,7 +157,7 @@ //! Check whether the structure is valid. virtual bool isGeometryValid(); //! Update all primitives and properties e.g. with respect to changed parameter settings. \return Gives an error message in case of a found error. - const char* Update(); + std::string Update(); //! Get an array containing the absolute size of the current structure. double* GetObjectArea(); @@ -177,6 +177,7 @@ \param parameterised Include full parameters (default) or parameter-values only. */ virtual bool Write2XML(const char* file, bool parameterised=true, bool sparse=false); + virtual bool Write2XML(std::string file, bool parameterised=true, bool sparse=false); //! Read a structure from file. /*! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CSXCAD-0.6.0/src/ParameterObjects.cpp new/CSXCAD-0.6.1/src/ParameterObjects.cpp --- old/CSXCAD-0.6.0/src/ParameterObjects.cpp 2015-10-10 14:14:05.000000000 +0200 +++ new/CSXCAD-0.6.1/src/ParameterObjects.cpp 2016-05-12 21:08:27.000000000 +0200 @@ -27,15 +27,10 @@ double dHelp; PS.SetValue(val); // set default value - if (elem.QueryDoubleAttribute(attr,&dHelp)==TIXML_SUCCESS) - PS.SetValue(dHelp); // set double value if found - else - { - const char* chHelp=elem.Attribute(attr); - if (chHelp==NULL) - return false; - PS.SetValue(chHelp); // set string value if found - } + const char* chHelp=elem.Attribute(attr); + if (chHelp==NULL) + return false; + PS.SetValue(chHelp); // set string value if found return true; } ++++++ CSXCAD-hdf5.patch ++++++ Index: CSXCAD-0.6.1/CMakeLists.txt =================================================================== --- CSXCAD-0.6.1.orig/CMakeLists.txt +++ CSXCAD-0.6.1/CMakeLists.txt @@ -90,7 +90,7 @@ INCLUDE_DIRECTORIES( ${fparser_INCLUDE_D find_package(TinyXML REQUIRED) ADD_DEFINITIONS( -DTIXML_USE_STL ) -find_package(HDF5 1.8 COMPONENTS C HL REQUIRED) +find_package(HDF5 1.8 COMPONENTS CXX HL REQUIRED) INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIR}) link_directories(${HDF5_LIBRARY_DIRS}) # hdf5 compat ++++++ CSXCAD-vtk.patch ++++++ --- /var/tmp/diff_new_pack.fnph00/_old 2016-09-11 00:54:18.000000000 +0200 +++ /var/tmp/diff_new_pack.fnph00/_new 2016-09-11 00:54:18.000000000 +0200 @@ -1,356 +1,17 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a5101d..0413d6f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -69,7 +69,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CSXCAD_SOURCE_DIR}/cmake/Modules/" - # $ cmake -D FPARSER_ROOT_DIR=~/opt/openEMS . - find_library(fparser_LIBRARIES - NAMES fparser -- HINTS ${FPARSER_ROOT_DIR}/lib -+ HINTS ${FPARSER_ROOT_DIR}/lib${LIB_SUFFIX} - NO_CMAKE_FIND_ROOT_PATH - ) - message(STATUS "fparser: ${fparser_LIBRARIES}" ) -@@ -111,35 +111,23 @@ if (WIN32) +Index: CSXCAD-0.6.1/CMakeLists.txt +=================================================================== +--- CSXCAD-0.6.1.orig/CMakeLists.txt ++++ CSXCAD-0.6.1/CMakeLists.txt +@@ -120,11 +120,7 @@ find_package(Boost 1.46 COMPONENTS + if (WIN32) find_package(VTK 6.1 REQUIRED) else() - # prefer >=6.1, fallback to >=5.4 -- find_package(VTK REQUIRED) -+ find_package(VTK 6.1 COMPONENTS vtkIOGeometry NO_MODULE) -+ IF (NOT ${VTK_FOUND}) -+ find_package(VTK REQUIRED) -+ endif() +- # prefer >=6.1, fallback to >=5.4 +- find_package(VTK 6.1 COMPONENTS vtkIOGeometry vtkIOPLY NO_MODULE) +- IF (NOT ${VTK_FOUND}) +- find_package(VTK REQUIRED) +- endif() ++ find_package(VTK REQUIRED) endif() message(STATUS "Found package VTK. Using version " ${VTK_VERSION}) - include(${VTK_USE_FILE}) - INCLUDE_DIRECTORIES (${VTK_INCLUDE_DIR}) - if("${VTK_MAJOR_VERSION}" EQUAL 6) -- set( vtk_LIBS -- vtkCommonCore -- vtkCommonDataModel -- vtkIOLegacy -- vtkIOXML -- vtkIOGeometry -- vtkIOPLY -- vtksys -- vtkIOCore -- ) -+ set( vtk_LIBS ${VTK_LIBRARIES} ) - else() - set( vtk_LIBS - vtkCommon -- vtkFiltering -- vtkGraphics -- vtkHybrid -- vtkIO -- vtkRendering -- vtkWidgets -- QVTK - ) - endif() -+message(STATUS "vtk libraries " ${vtk_LIBS}) - # depend on fparser.hh - ADD_SUBDIRECTORY( src ) - -diff --git a/CSXCAD.pro b/CSXCAD.pro -deleted file mode 100644 -index 880b665..0000000 ---- a/CSXCAD.pro -+++ /dev/null -@@ -1,266 +0,0 @@ --# --# Copyright (C) 2010,2011 Thorsten Liebig ([email protected]) --# --# This program is free software: you can redistribute it and/or modify --# it under the terms of the GNU Lesser General Public License as published --# by the Free Software Foundation, either version 3 of the License, or --# (at your option) any later version. --# --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU Lesser General Public License for more details. --# --# You should have received a copy of the GNU Lesser General Public License --# along with this program. If not, see <http://www.gnu.org/licenses/>. --# -- --CONFIG -= qt --CONFIG += rtti exceptions shared --TEMPLATE = lib --INCLUDEPATH += . --OBJECTS_DIR = obj -- --VERSION = 0.6.0 -- --# add git revision --GITREV = $$system(git describe --tags) --isEmpty(GITREV):GITREV=$$VERSION --DEFINES += GIT_VERSION=\\\"$$GITREV\\\" -- --# remove unnecessary webkit define --DEFINES -= QT_WEBKIT -- --exists(localPaths.pri) { -- include(localPaths.pri) --} -- --unix:!macx { -- LIBS += -ltinyxml -- DEFINES += TIXML_USE_STL -- LIBS += -lhdf5_hl -lhdf5 -- LIBS += -lCGAL -- -- #vtk -- isEmpty(VTK_INCLUDEPATH) { -- INCLUDEPATH += /usr/include/vtk-5.2 \ -- /usr/include/vtk-5.4 \ -- /usr/include/vtk-5.6 \ -- /usr/include/vtk-5.8 \ -- /usr/include/vtk-5.10 \ -- /usr/include/vtk-6.0 \ -- /usr/include/vtk-6.1 \ -- /usr/include/vtk-6.2 \ -- /usr/include/vtk-6.3 \ -- /usr/include/vtk -- } else { -- INCLUDEPATH += $$VTK_INCLUDEPATH -- } -- -- #hdf5 -- !isEmpty(HDF5_ROOT) {LIBS += -L$$HDF5_ROOT} -- INCLUDEPATH += /usr/include/hdf5/serial -- INCLUDEPATH += /usr/include/mpi -- -- #fparser -- isEmpty(FPARSER_ROOT) { -- FPARSER_ROOT = /usr -- } else { -- INCLUDEPATH += $$FPARSER_ROOT/include -- LIBS += -L$$FPARSER_ROOT/lib -- QMAKE_LFLAGS += \'-Wl,-rpath,$$FPARSER_ROOT/lib\' -- } -- LIBS += -lfparser --} -- --win32 { -- DEFINES += BUILD_CSXCAD_LIB -- -- isEmpty(WIN32_LIB_ROOT) { -- WIN32_LIB_ROOT = .. -- } -- -- # #3rd party libraries# -- # fparser -- INCLUDEPATH += $$WIN32_LIB_ROOT/fparser/include -- LIBS += -L$$WIN32_LIB_ROOT/fparser/bin -lfparser4 -- # tinyxml -- INCLUDEPATH += $$WIN32_LIB_ROOT/tinyxml/include -- LIBS += -L$$WIN32_LIB_ROOT/tinyxml/bin -ltinyxml2 -- DEFINES += TIXML_USE_STL -- # hdf5 -- INCLUDEPATH += $$WIN32_LIB_ROOT/hdf5/include -- LIBS += -L$$WIN32_LIB_ROOT/hdf5/lib -lhdf5_hl -lhdf5 -- # zlib -- LIBS += -L$$WIN32_LIB_ROOT/zlib/lib -lz -- # vtk -- INCLUDEPATH += $$WIN32_LIB_ROOT/vtk/include/vtk-5.10 -- LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lvtkIO -lvtkFiltering -- #boost, needed by cgal -- INCLUDEPATH += $$WIN32_LIB_ROOT/boost/include -- LIBS += -L$$WIN32_LIB_ROOT/boost/lib -lboost_thread -lboost_system -lboost_date_time -lboost_serialization -- #cgal -- INCLUDEPATH += $$WIN32_LIB_ROOT/cgal/include -- LIBS += -L$$WIN32_LIB_ROOT/cgal/bin -lCGAL --} -- --macx { -- LIBS += -ltinyxml -- DEFINES += TIXML_USE_STL -- LIBS += -lhdf5_hl -lhdf5 -- LIBS += -lCGAL -- -- #vtk5 provided with Homebrew -- isEmpty(VTK_INCLUDEPATH) { -- INCLUDEPATH += \ -- /usr/local/opt/vtk5/include \ -- /usr/local/opt/vtk5/include/vtk-5.10 -- -- } else { -- INCLUDEPATH += $$VTK_INCLUDEPATH -- } -- -- LIBS += -L/usr/local/opt/vtk5/lib/vtk-5.10 -lvtkCommon -lvtkIO -lvtkFiltering -- LIBS += -L/usr/local/lib -lboost_thread-mt -lboost_system -lboost_date_time -lboost_serialization -- -- #hdf5 (is this MPI?) -- INCLUDEPATH += /usr/local/opt/hd5/include -- -- #fparser -- #isEmpty(FPARSER_ROOT) { -- # FPARSER_ROOT = /usr -- #} else { -- INCLUDEPATH += $$FPARSER_ROOT/include -- LIBS += -L$$FPARSER_ROOT/lib -- QMAKE_LFLAGS += \'-Wl,-rpath,$$FPARSER_ROOT/lib\' -- #} -- LIBS += -lfparser --} -- --# vtk includes deprecated header files; silence the corresponding warning --QMAKE_CXXFLAGS += -Wno-deprecated -frounding-math -- --# enable this flag to use with valgrind! valgrind emulates a buggy FPU --# QMAKE_CXXFLAGS += -DCGAL_DISABLE_ROUNDING_MATH_CHECK=ON -- --# Input --PUB_HEADERS += src/ContinuousStructure.h \ -- src/CSPrimitives.h \ -- src/CSProperties.h \ -- src/CSRectGrid.h \ -- src/CSXCAD_Global.h \ -- src/ParameterObjects.h \ -- src/CSFunctionParser.h \ -- src/CSUseful.h \ -- src/ParameterCoord.h \ -- src/CSTransform.h \ -- src/CSBackgroundMaterial.h \ -- src/CSPrimPoint.h \ -- src/CSPrimBox.h \ -- src/CSPrimMultiBox.h \ -- src/CSPrimSphere.h \ -- src/CSPrimSphericalShell.h \ -- src/CSPrimCylinder.h \ -- src/CSPrimCylindricalShell.h \ -- src/CSPrimPolygon.h \ -- src/CSPrimLinPoly.h \ -- src/CSPrimRotPoly.h \ -- src/CSPrimPolyhedron.h \ -- src/CSPrimPolyhedronReader.h \ -- src/CSPrimCurve.h \ -- src/CSPrimWire.h \ -- src/CSPrimUserDefined.h \ -- src/CSPropUnknown.h \ -- src/CSPropMaterial.h \ -- src/CSPropDispersiveMaterial.h \ -- src/CSPropLorentzMaterial.h \ -- src/CSPropDebyeMaterial.h \ -- src/CSPropDiscMaterial.h \ -- src/CSPropLumpedElement.h \ -- src/CSPropMetal.h \ -- src/CSPropConductingSheet.h \ -- src/CSPropExcitation.h \ -- src/CSPropProbeBox.h \ -- src/CSPropDumpBox.h \ -- src/CSPropResBox.h -- --HEADERS += $$PUB_HEADERS \ -- src/CSPrimPolyhedron_p.h -- --SOURCES += src/ContinuousStructure.cpp \ -- src/CSPrimitives.cpp \ -- src/CSProperties.cpp \ -- src/CSRectGrid.cpp \ -- src/ParameterObjects.cpp \ -- src/CSFunctionParser.cpp \ -- src/CSUseful.cpp \ -- src/ParameterCoord.cpp \ -- src/CSTransform.cpp \ -- src/CSPrimPoint.cpp \ -- src/CSPrimBox.cpp \ -- src/CSPrimMultiBox.cpp \ -- src/CSPrimSphere.cpp \ -- src/CSPrimSphericalShell.cpp \ -- src/CSPrimCylinder.cpp \ -- src/CSPrimCylindricalShell.cpp \ -- src/CSPrimPolygon.cpp \ -- src/CSPrimLinPoly.cpp \ -- src/CSPrimRotPoly.cpp \ -- src/CSPrimPolyhedron.cpp \ -- src/CSPrimPolyhedronReader.cpp \ -- src/CSPrimCurve.cpp \ -- src/CSPrimWire.cpp \ -- src/CSPrimUserDefined.cpp \ -- src/CSPropUnknown.cpp \ -- src/CSPropMaterial.cpp \ -- src/CSPropDispersiveMaterial.cpp \ -- src/CSPropLorentzMaterial.cpp \ -- src/CSPropDebyeMaterial.cpp \ -- src/CSPropDiscMaterial.cpp \ -- src/CSPropLumpedElement.cpp \ -- src/CSPropMetal.cpp \ -- src/CSPropConductingSheet.cpp \ -- src/CSPropExcitation.cpp \ -- src/CSPropProbeBox.cpp \ -- src/CSPropDumpBox.cpp \ -- src/CSPropResBox.cpp \ -- src/CSBackgroundMaterial.cpp -- --# --# create tar file --# --tarball.target = tarball --tarball.commands = git archive --format=tar --prefix=CSXCAD-$$VERSION/ HEAD | bzip2 > CSXCAD-$${VERSION}.tar.bz2 --QMAKE_EXTRA_TARGETS += tarball -- --# --# INSTALL --# --isEmpty(PREFIX) { -- PREFIX = /usr/local --} --install.target = install --install.commands = mkdir -p \"$$PREFIX/lib$$LIB_SUFFIX\" --install.commands += && mkdir -p \"$$PREFIX/include/CSXCAD\" --install.commands += && mkdir -p \"$$PREFIX/share/CSXCAD/matlab\" --install.commands += && cp $$PUB_HEADERS \"$$PREFIX/include/CSXCAD/\" --unix:!macx:install.commands += && cp -at \"$$PREFIX/lib$$LIB_SUFFIX/\" libCSXCAD.so* --win32:install.commands += && cp -at \"$$PREFIX/lib$$LIB_SUFFIX/\" release/CSXCAD0.dll --macx:install.commands += && cp libCSXCAD*.dylib \"$$PREFIX/lib$$LIB_SUFFIX/\" --install.commands += && cp -r matlab/* \"$$PREFIX/share/CSXCAD/matlab\" --QMAKE_EXTRA_TARGETS += install -- --# --# create .PHONY target --# --phony.target = .PHONY --phony.depends = $$QMAKE_EXTRA_TARGETS --QMAKE_EXTRA_TARGETS += phony -- --# --# create documentation --# use --# make docs --# to start doxygen. It will generate html, latex and compressed help for QtCreator --# --include(doc.pri) -diff --git a/doc.pri b/doc.pri -deleted file mode 100644 -index 50731d4..0000000 ---- a/doc.pri -+++ /dev/null -@@ -1,6 +0,0 @@ --OTHER_FILES += $$PWD/doxydoc -- --docs.target = docs --docs.commands = CSXCAD_VERSION=$$VERSION doxygen $$PWD/doxydoc -- --QMAKE_EXTRA_TARGETS += docs -diff --git a/src/CSPropDiscMaterial.cpp b/src/CSPropDiscMaterial.cpp -index d0aeb2c..12f565a 100644 ---- a/src/CSPropDiscMaterial.cpp -+++ b/src/CSPropDiscMaterial.cpp -@@ -26,9 +26,6 @@ - #include "ParameterCoord.h" - #include "CSPropDiscMaterial.h" - --#define vtkRenderingCore_AUTOINIT4(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingFreeTypeOpenGL,vtkRenderingOpenGL) --#define vtkRenderingVolume_AUTOINIT 1(vtkRenderingVolumeOpenGL) -- - CSPropDiscMaterial::CSPropDiscMaterial(ParameterSet* paraSet) : CSPropMaterial(paraSet) - { - Type=(CSProperties::PropertyType)(DISCRETE_MATERIAL | MATERIAL); --- -2.6.2 -
