Commit cabec366 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell
Browse files

Build system updates moving to vtkDomainsChemistry

Several updates to the build system and export macros necessary after
moving the chemistry module.

Change-Id: I5cdddac67d9ffe80aea48db8ac1cab3c7a7cbaab
parent 8cc5e245
......@@ -24,8 +24,8 @@ set_source_files_properties(
)
# Generate configured header file
configure_file(${vtkChemistryCore_SOURCE_DIR}/vtkChemistryConfigure.h.in
${vtkChemistryCore_BINARY_DIR}/vtkChemistryConfigure.h IMMEDIATE)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/vtkChemistryConfigure.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/vtkChemistryConfigure.h" IMMEDIATE)
set(${vtk-module}_NO_HeaderTest 1) # TODO: Fix headers and enable test.
vtk_module_library(vtkChemistryCore ${Module_SRCS})
vtk_module_library(${vtk-module} ${Module_SRCS})
......@@ -39,14 +39,14 @@ foreach(test ${TestsToRun})
else()
set(_error_threshold 10)
endif()
add_test(NAME Chemistry-${TName}
add_test(NAME ${vtk-module}Cxx-${TName}
COMMAND ${vtk-module}CxxTests ${TName}
-D ${VTK_DATA_ROOT}
-T ${VTK_TEST_OUTPUT_DIR}
-V Baseline/Chemistry/${TName}.png
-E ${_error_threshold})
else()
add_test(NAME Chemistry-${TName}
add_test(NAME ${vtk-module}Cxx-${TName}
COMMAND ${vtk-module}CxxTests ${TName})
endif()
endforeach ()
vtk_module(vtkChemistryCore
vtk_module(vtkDomainsChemistry
GROUPS
StandAlone
DEPENDS
......
......@@ -33,7 +33,7 @@
#ifndef __vtkBlueObeliskData_h
#define __vtkBlueObeliskData_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkObject.h"
#include "vtkNew.h" // For vtkNew
......@@ -46,7 +46,7 @@ class vtkUnsignedShortArray;
// Hidden STL reference: vtkstd::vector<vtkAbstractArray*>
class MyStdVectorOfVtkAbstractArrays;
class VTKCHEMISTRYCORE_EXPORT vtkBlueObeliskData : public vtkObject
class VTKDOMAINSCHEMISTRY_EXPORT vtkBlueObeliskData : public vtkObject
{
public:
vtkTypeMacro(vtkBlueObeliskData,vtkObject);
......
......@@ -33,7 +33,7 @@
#ifndef __vtkBlueObeliskDataParser_h
#define __vtkBlueObeliskDataParser_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkXMLParser.h"
#include <vtkSmartPointer.h> // For vtkSmartPointer
......@@ -45,7 +45,7 @@ class vtkStdString;
class vtkStringArray;
class vtkUnsignedShortArray;
class VTKCHEMISTRYCORE_EXPORT vtkBlueObeliskDataParser : public vtkXMLParser
class VTKDOMAINSCHEMISTRY_EXPORT vtkBlueObeliskDataParser : public vtkXMLParser
{
public:
vtkTypeMacro(vtkBlueObeliskDataParser, vtkXMLParser);
......
......@@ -19,12 +19,12 @@
#ifndef __vtkCMLMoleculeReader_h
#define __vtkCMLMoleculeReader_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkDataReader.h"
class vtkMolecule;
class VTKCHEMISTRYCORE_EXPORT vtkCMLMoleculeReader : public vtkDataReader
class VTKDOMAINSCHEMISTRY_EXPORT vtkCMLMoleculeReader : public vtkDataReader
{
public:
static vtkCMLMoleculeReader *New();
......
......@@ -13,11 +13,11 @@
=========================================================================*/
#ifndef __vtkChemistryConfigure_h
#define __vtkChemistryConfigure_h
#ifndef __vtkDomainsChemistryConfigure_h
#define __vtkDomainsChemistryConfigure_h
/* Where the Blue Obelisk Data Repository files are installed */
#define VTK_BODR_DATA_PATH "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_SHARE_DIR_CM24@/vtkChemistry/vtkBODRData"
#define VTK_BODR_DATA_PATH_BUILD "@VTK_SOURCE_DIR@/Chemistry/Core"
#define VTK_BODR_DATA_PATH_BUILD "@VTK_SOURCE_DIR@/Domains/Chemistry"
#endif
......@@ -30,13 +30,13 @@
#ifndef __vtkMoleculeAlgorithm_h
#define __vtkMoleculeAlgorithm_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkAlgorithm.h"
class vtkDataSet;
class vtkMolecule;
class VTKCHEMISTRYCORE_EXPORT vtkMoleculeAlgorithm : public vtkAlgorithm
class VTKDOMAINSCHEMISTRY_EXPORT vtkMoleculeAlgorithm : public vtkAlgorithm
{
public:
static vtkMoleculeAlgorithm *New();
......
......@@ -21,7 +21,7 @@
#ifndef __vtkMoleculeMapper_h
#define __vtkMoleculeMapper_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkMapper.h"
#include "vtkNew.h" // For vtkNew
......@@ -36,7 +36,7 @@ class vtkSelection;
class vtkSphereSource;
class vtkTrivialProducer;
class VTKCHEMISTRYCORE_EXPORT vtkMoleculeMapper : public vtkMapper
class VTKDOMAINSCHEMISTRY_EXPORT vtkMoleculeMapper : public vtkMapper
{
public:
static vtkMoleculeMapper *New();
......
......@@ -31,12 +31,12 @@
#ifndef __vtkMoleculeToAtomBallFilter_h
#define __vtkMoleculeToAtomBallFilter_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkMoleculeToPolyDataFilter.h"
class vtkMolecule;
class VTKCHEMISTRYCORE_EXPORT vtkMoleculeToAtomBallFilter
class VTKDOMAINSCHEMISTRY_EXPORT vtkMoleculeToAtomBallFilter
: public vtkMoleculeToPolyDataFilter
{
public:
......
......@@ -18,12 +18,12 @@
#ifndef __vtkMoleculeToBondStickFilter_h
#define __vtkMoleculeToBondStickFilter_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkMoleculeToPolyDataFilter.h"
class vtkMolecule;
class VTKCHEMISTRYCORE_EXPORT vtkMoleculeToBondStickFilter
class VTKDOMAINSCHEMISTRY_EXPORT vtkMoleculeToBondStickFilter
: public vtkMoleculeToPolyDataFilter
{
public:
......
......@@ -21,12 +21,12 @@
#ifndef __vtkMoleculeToPolyDataFilter_h
#define __vtkMoleculeToPolyDataFilter_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkPolyDataAlgorithm.h"
class vtkMolecule;
class VTKCHEMISTRYCORE_EXPORT vtkMoleculeToPolyDataFilter
class VTKDOMAINSCHEMISTRY_EXPORT vtkMoleculeToPolyDataFilter
: public vtkPolyDataAlgorithm
{
public:
......
......@@ -18,7 +18,7 @@
#ifndef __vtkOpenQubeElectronicData_h
#define __vtkOpenQubeElectronicData_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkAbstractElectronicData.h"
#include "vtkNew.h" // for vtkNew
......@@ -30,7 +30,7 @@ namespace OpenQube {
class vtkImageData;
class vtkDataSetCollection;
class VTKCHEMISTRYCORE_EXPORT vtkOpenQubeElectronicData
class VTKDOMAINSCHEMISTRY_EXPORT vtkOpenQubeElectronicData
: public vtkAbstractElectronicData
{
public:
......
......@@ -20,7 +20,7 @@
#ifndef __vtkOpenQubeMoleculeSource_h
#define __vtkOpenQubeMoleculeSource_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkDataReader.h"
class vtkMolecule;
......@@ -31,7 +31,7 @@ namespace OpenQube
class BasisSet;
}
class VTKCHEMISTRYCORE_EXPORT vtkOpenQubeMoleculeSource : public vtkDataReader
class VTKDOMAINSCHEMISTRY_EXPORT vtkOpenQubeMoleculeSource : public vtkDataReader
{
public:
static vtkOpenQubeMoleculeSource *New();
......
......@@ -23,7 +23,7 @@
#ifndef __vtkPeriodicTable_h
#define __vtkPeriodicTable_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkObject.h"
#include "vtkNew.h"
......@@ -32,7 +32,7 @@ class vtkColor3f;
class vtkLookupTable;
class vtkStdString;
class VTKCHEMISTRYCORE_EXPORT vtkPeriodicTable : public vtkObject
class VTKDOMAINSCHEMISTRY_EXPORT vtkPeriodicTable : public vtkObject
{
public:
vtkTypeMacro(vtkPeriodicTable, vtkObject);
......
......@@ -18,14 +18,14 @@
#ifndef __vtkProgrammableElectronicData_h
#define __vtkProgrammableElectronicData_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkAbstractElectronicData.h"
class vtkImageData;
class StdVectorOfImageDataPointers;
class VTKCHEMISTRYCORE_EXPORT vtkProgrammableElectronicData
class VTKDOMAINSCHEMISTRY_EXPORT vtkProgrammableElectronicData
: public vtkAbstractElectronicData
{
public:
......
......@@ -31,13 +31,13 @@
#ifndef __vtkSimpleBondPerceiver_h
#define __vtkSimpleBondPerceiver_h
#include "vtkChemistryCoreModule.h" // For export macro
#include "vtkDomainsChemistryModule.h" // For export macro
#include "vtkMoleculeAlgorithm.h"
class vtkDataSet;
class vtkMolecule;
class VTKCHEMISTRYCORE_EXPORT vtkSimpleBondPerceiver :
class VTKDOMAINSCHEMISTRY_EXPORT vtkSimpleBondPerceiver :
public vtkMoleculeAlgorithm
{
public:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment