Commit 9417ab1a authored by Ben Boeckel's avatar Ben Boeckel

Merge branch 'upstream-visit' into fix-include-directories

* upstream-visit:
  visit 2019-03-05 (98028dbe)
parents 7ae8a9bb 57707b18
......@@ -135,14 +135,15 @@ TARGET_LINK_LIBRARIES(avtdatabase_ser
#visitcommon
#avtdbatts
#${AVTMIR_SER}
#avtpipeline_ser
#visit_vtk
avtpipeline_ser
visit_vtk
VTK::CommonCore
PRIVATE
VTK::CommonDataModel
VTK::CommonExecutionModel)
target_include_directories(avtpipeline_ser
target_include_directories(avtdatabase_ser
PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../VisWindow/VisWindow>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Database>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Formats>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Ghost>")
......@@ -156,7 +157,7 @@ else ()
#TARGET_LINK_LIBRARIES(avtdatabase_par visitcommon avtdbatts ${AVTMIR_PAR} avtpipeline_par visit_vtk tess2)
TARGET_LINK_LIBRARIES(avtdatabase_par PUBLIC visitcommon avtdbatts ${AVTMIR_PAR} avtpipeline_par visit_vtk)
VISIT_INSTALL_TARGETS(avtdatabase_par)
target_include_directories(avtpipeline_par
target_include_directories(avtdatabase_par
PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../VisWindow/VisWindow>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Database>"
......
......@@ -296,7 +296,11 @@ target_include_directories(avtpipeline_ser
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Data>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Pipeline>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Sinks>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Sources>")
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Sources>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../VisWindow/VisWindow>"
PRIVATE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../Database/Database>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../Database/Ghost>")
if (FALSE)
IF(HAVE_LIB_R)
......@@ -340,7 +344,11 @@ else ()
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Data>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Pipeline>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Sinks>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Sources>")
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Sources>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../VisWindow/VisWindow>"
PRIVATE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../Database/Database>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../Database/Ghost>")
#TARGET_LINK_LIBRARIES(avtpipeline_par visitcommon ${AVTMATH} avtdbatts
# visit_vtk lightweight_visit_vtk vtkCommonCore
......
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