Commit dc837125 authored by Ben Boeckel's avatar Ben Boeckel

Merge pull request #347 from Kitware/master

Update release-v1
parents 9f2f14f8 c488d1ba
......@@ -61,6 +61,12 @@ if(MOAB_FOUND)
include(MOABTargets.cmake)
endif()
#Certain version of moab define a scope variable called BUILD_SHARED_LIBS
#which hides the cache version of said variable. So we defend against
#this by unsetting the variable
unset(BUILD_SHARED_LIBS)
set_target_properties(MOAB PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${MOAB_INCLUDE_DIR}"
)
......
......@@ -82,7 +82,7 @@ mark_as_advanced(
################################################################################
# Options that the user controls
################################################################################
option(BUILD_SHARED_LIBS "Build SMTK using shared libraries" OFF)
option(BUILD_SHARED_LIBS "Build SMTK using shared libraries" ON)
option(SMTK_NO_SYSTEM_BOOST "Allow boost to search for system installed boost" ON)
# Option to build Qt ui compoments for attributes
option(SMTK_ENABLE_TESTING "Enable Testing" ON)
......@@ -481,7 +481,7 @@ export(PACKAGE SMTK)
#
# Required to happen before we include the docs directory
set(MOAB_ROOT_DIR "${MOAB_ROOT_DIR}")
set(SMTK_MODULE_DIR "${SMTK_SOURCE_DIR}/CMake")
set(SMTK_MODULE_DIR "${CMAKE_BINARY_DIR}/lib/cmake/SMTK")
set(SMTK_CONFIG_DIR "${PROJECT_BINARY_DIR}")
configure_file(
${PROJECT_SOURCE_DIR}/CMake/SMTKConfig.cmake.in
......
......@@ -44,6 +44,8 @@ set(smtk_srcs
add_library(smtkCore ${smtk_srcs})
target_include_directories(smtkCore
PUBLIC
$<BUILD_INTERFACE:${SMTK_SOURCE_DIR}>
$<BUILD_INTERFACE:${SMTK_BINARY_DIR}>
$<INSTALL_INTERFACE:include/smtk/${SMTK_VERSION}>
)
target_link_libraries(smtkCore
......
......@@ -38,6 +38,11 @@ set_source_files_properties(
set(${vtk-module}_NO_HeaderTest 1)
set(VTK_INSTALL_NO_HEADERS 1)
vtk_module_library(${vtk-module} ${srcs})
target_include_directories(${vtk-module}
PUBLIC
$<BUILD_INTERFACE:${SMTK_SOURCE_DIR}>
$<BUILD_INTERFACE:${SMTK_BINARY_DIR}>
$<INSTALL_INTERFACE:include/smtk/${SMTK_VERSION}>)
if(SMTK_ENABLE_REMUS_SUPPORT)
#Remus is needed
......
......@@ -63,6 +63,11 @@ set_source_files_properties(
set(${vtk-module}_NO_HeaderTest 1)
set(VTK_INSTALL_NO_HEADERS 1)
vtk_module_library(${vtk-module} ${srcs})
target_include_directories(${vtk-module}
PUBLIC
$<BUILD_INTERFACE:${SMTK_SOURCE_DIR}>
$<BUILD_INTERFACE:${SMTK_BINARY_DIR}>
$<INSTALL_INTERFACE:include/smtk/${SMTK_VERSION}>)
if(SMTK_ENABLE_REMUS_SUPPORT)
#Remus is needed
......
......@@ -235,6 +235,11 @@ set(_module_src
set(vtkSMTKDiscreteModel_NO_HeaderTest 1)
set(VTK_INSTALL_NO_HEADERS 1)
vtk_module_library(vtkSMTKDiscreteModel ${_module_src})
target_include_directories(${vtk-module}
PUBLIC
$<BUILD_INTERFACE:${SMTK_SOURCE_DIR}>
$<BUILD_INTERFACE:${SMTK_BINARY_DIR}>
$<INSTALL_INTERFACE:include/smtk/${SMTK_VERSION}>)
target_link_libraries(vtkSMTKDiscreteModel LINK_PRIVATE ${UUID_LIBS})
......
......@@ -16,7 +16,7 @@
#ifndef __smtkdiscrete_DISCRETEMESH_H
#define __smtkdiscrete_DISCRETEMESH_H
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "DiscreteMeshCellIdIterator.h" //needed for iterator
#include "vtkType.h" //needed for vtkIdType
......
......@@ -20,7 +20,7 @@
#ifndef __smtkdiscrete_vtkDiscreteModel_h
#define __smtkdiscrete_vtkDiscreteModel_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "Model/vtkModel.h"
......
......@@ -14,7 +14,7 @@
#ifndef __smtkdiscrete_vtkDiscreteModelEdge_h
#define __smtkdiscrete_vtkDiscreteModelEdge_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "Model/vtkModelEdge.h"
#include "vtkDiscreteModelGeometricEntity.h"
......
......@@ -14,7 +14,7 @@
#ifndef __smtkdiscrete_vtkDiscreteModelEntity_h
#define __smtkdiscrete_vtkDiscreteModelEntity_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkObject.h"
......
......@@ -18,7 +18,7 @@
#ifndef __smtkdiscrete_vtkDiscreteModelEntityGroup_h
#define __smtkdiscrete_vtkDiscreteModelEntityGroup_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkModelEntity.h"
......
......@@ -14,7 +14,7 @@
#ifndef __smtkdiscrete_vtkDiscreteModelFace_h
#define __smtkdiscrete_vtkDiscreteModelFace_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkModelFace.h"
#include "vtkDiscreteModelGeometricEntity.h"
#include "ModelEdgeHelper.h"
......
......@@ -21,7 +21,7 @@
#ifndef __smtkdiscrete_vtkDiscreteModelGeometricEntity_h
#define __smtkdiscrete_vtkDiscreteModelGeometricEntity_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkDiscreteModelEntity.h"
......
......@@ -14,7 +14,7 @@
#ifndef __smtkdiscrete_vtkDiscreteModelRegion_h
#define __smtkdiscrete_vtkDiscreteModelRegion_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "Model/vtkModelRegion.h"
#include "vtkDiscreteModelGeometricEntity.h"
......
......@@ -14,7 +14,7 @@
#ifndef __smtkdiscrete_vtkDiscreteModelVertex_h
#define __smtkdiscrete_vtkDiscreteModelVertex_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkModelVertex.h"
#include "vtkDiscreteModelGeometricEntity.h"
......
......@@ -26,7 +26,7 @@
#ifndef __smtkdiscrete_vtkDiscreteModelWrapper_h
#define __smtkdiscrete_vtkDiscreteModelWrapper_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkDataObjectTree.h"
#include "vtkSmartPointer.h"
#include "vtkWeakPointer.h"
......
......@@ -19,7 +19,7 @@
#ifndef __smtkdiscrete_vtkMergeEventData_h
#define __smtkdiscrete_vtkMergeEventData_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkObject.h"
......
......@@ -21,7 +21,7 @@
#ifndef __smtkdiscrete_vtkModel3dm2DGridRepresentation_h
#define __smtkdiscrete_vtkModel3dm2DGridRepresentation_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkModelGridRepresentation.h"
......
......@@ -22,7 +22,7 @@
#ifndef __smtkdiscrete_vtkModel3dmGridRepresentation_h
#define __smtkdiscrete_vtkModel3dmGridRepresentation_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkModelGridRepresentation.h"
......
......@@ -25,7 +25,7 @@
#ifndef __smtkdiscrete_vtkModelBCGridRepresentation_h
#define __smtkdiscrete_vtkModelBCGridRepresentation_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkModelGridRepresentation.h"
#include "vtkSmartPointer.h"
......
......@@ -19,7 +19,7 @@
#ifndef __smtkdiscrete_vtkModelGeneratedGridRepresentation_h
#define __smtkdiscrete_vtkModelGeneratedGridRepresentation_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkModelGridRepresentation.h"
#include <vector>
......
......@@ -17,7 +17,7 @@
#ifndef __smtkdiscrete_vtkModelGridRepresentation_h
#define __smtkdiscrete_vtkModelGridRepresentation_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include <vtkObject.h>
......
......@@ -14,7 +14,7 @@
#ifndef __smtkdiscrete_vtkModelMaterial_h
#define __smtkdiscrete_vtkModelMaterial_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkModelEntity.h"
......
......@@ -16,7 +16,7 @@
#ifndef __smtkdiscrete_vtkModelUserName_h
#define __smtkdiscrete_vtkModelUserName_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkObject.h"
......
......@@ -21,7 +21,7 @@
#ifndef __smtkdiscrete_vtkSplitEventData_h
#define __smtkdiscrete_vtkSplitEventData_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "vtkObject.h"
......
......@@ -28,7 +28,7 @@
#ifndef __smtkdiscrete_vtkXMLModelReader_h
#define __smtkdiscrete_vtkXMLModelReader_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "Serialize/vtkSerializer.h"
......
......@@ -45,7 +45,7 @@
#ifndef __smtkdiscrete_vtkXMLModelWriter_h
#define __smtkdiscrete_vtkXMLModelWriter_h
#include "vtkSMTKDiscreteModelModule.h" // For export macro
#include "smtk/bridge/discrete/kernel/vtkSMTKDiscreteModelModule.h" // For export macro
#include "Serialize/vtkSerializer.h"
......
......@@ -113,6 +113,11 @@ set(_module_src
set(vtkCmbDiscreteModel_NO_HeaderTest 1)
set(VTK_INSTALL_NO_HEADERS 1)
vtk_module_library(vtkCmbDiscreteModel ${_module_src})
target_include_directories(${vtk-module}
PUBLIC
$<BUILD_INTERFACE:${SMTK_SOURCE_DIR}>
$<BUILD_INTERFACE:${SMTK_BINARY_DIR}>
$<INSTALL_INTERFACE:include/smtk/${SMTK_VERSION}>)
target_link_libraries(vtkCmbDiscreteModel
LINK_PUBLIC
......
......@@ -21,6 +21,11 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ${VTK_DEFINITIONS})
set(vtkSMTKExt_NO_HeaderTest 1)
set(VTK_INSTALL_NO_HEADERS 1)
vtk_module_library(vtkSMTKExt ${VTKLibSrcs})
target_include_directories(vtkSMTKExt
PUBLIC
$<BUILD_INTERFACE:${SMTK_SOURCE_DIR}>
$<BUILD_INTERFACE:${SMTK_BINARY_DIR}>
$<INSTALL_INTERFACE:include/smtk/${SMTK_VERSION}>)
target_link_libraries(vtkSMTKExt
LINK_PUBLIC
......
project(cJSON)
add_library(cJSON STATIC cJSON.c)
target_include_directories(cJSON
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include/smtk/${SMTK_VERSION}>)
if (BUILD_SHARED_LIBS OR SMTK_ENABLE_PYTHON_WRAPPING)
# Set position-independent flag when other project libs are shared.
......
......@@ -15,7 +15,7 @@ set(MOAB_CC @CC@)
set(MOAB_FC @FC@)
set(MOAB_F77 @F77@)
set(BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
set(MOAB_BUILT_SHARED_LIBS @BUILD_SHARED_LIBS@)
set(MOAB_USE_MPI @MOAB_USE_MPI@)
set(MPI_DIR "@MPI_DIR@")
set(MOAB_USE_HDF @MOAB_USE_HDF@)
......
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