Switch VisIt to use VTK_ADD_LIBRARY commands.

This allows us to accumulate VisIt's targets in order to export them.

AvtAlgorithms/CMakeLists.txt

@@ -46,7 +46,7 @@ ${VISIT_SOURCE_DIR}/visit_vtk/full
 ${VISIT_SOURCE_DIR}/visit_vtk/lightweight
 ${VTK_INCLUDE_DIRS}
 )
-ADD_LIBRARY(vtkVisItAVTAlgorithms ${Kit_SRCS})
+VTK_ADD_LIBRARY(vtkVisItAVTAlgorithms ${Kit_SRCS})
 IF(VISIT_PARALLEL)    
   TARGET_LINK_LIBRARIES(vtkVisItAVTAlgorithms visitcommon avtdatabase_par avtpipeline_par visit_vtk avtivp)    
 ELSE(VISIT_PARALLEL)	

CMake/VisItCommon.cmake

@@ -27,7 +27,7 @@ MACRO(VISIT_INSTALL_TARGETS target)
 ENDMACRO(VISIT_INSTALL_TARGETS)
 
 FUNCTION(ADD_PARALLEL_LIBRARY target)
-    ADD_LIBRARY(${target} ${ARGN})
+    VTK_ADD_LIBRARY(${target} ${ARGN})
     IF(VISIT_PARALLEL_CXXFLAGS)
         SET(PAR_COMPILE_FLAGS "")
         FOREACH (X ${VISIT_PARALLEL_CXXFLAGS})

avt/DBAtts/CMakeLists.txt

@@ -84,7 +84,7 @@ ${AVT_DBATTS_SOURCE_DIR}/SIL
 # Add link directories needed.
 LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY})
 
-ADD_LIBRARY(avtdbatts ${METADATA_SOURCES} ${SIL_SOURCES})
+VTK_ADD_LIBRARY(avtdbatts ${METADATA_SOURCES} ${SIL_SOURCES})
 
 TARGET_LINK_LIBRARIES(avtdbatts visitcommon)
 

avt/Database/CMakeLists.txt

@@ -109,7 +109,7 @@ LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
 
 
 #********************************* SERIAL ************************************
-ADD_LIBRARY(avtdatabase_ser ${AVTDATABASE_SOURCES})
+VTK_ADD_LIBRARY(avtdatabase_ser ${AVTDATABASE_SOURCES})
 TARGET_LINK_LIBRARIES(avtdatabase_ser visitcommon avtdbatts ${AVTMIR_SER} avtpipeline_ser visit_vtk)
 VISIT_INSTALL_TARGETS(avtdatabase_ser)
 

avt/IVP/CMakeLists.txt

@@ -61,7 +61,7 @@ ${VTK_INCLUDE_DIRS}
 # Add link directories
 LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
 
-ADD_LIBRARY(avtivp ${AVTIVP_SOURCES})
+VTK_ADD_LIBRARY(avtivp ${AVTIVP_SOURCES})
 TARGET_LINK_LIBRARIES(avtivp avtmath visitcommon visit_vtk vtkCommon vtkFiltering)
 
 VISIT_INSTALL_TARGETS(avtivp)

avt/Math/CMakeLists.txt

@@ -59,7 +59,7 @@ ${VTK_INCLUDE_DIRS}
 # Add link directories
 LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
 
-ADD_LIBRARY(avtmath ${AVTMATH_SOURCES})
+VTK_ADD_LIBRARY(avtmath ${AVTMATH_SOURCES})
 TARGET_LINK_LIBRARIES(avtmath visitcommon vtkCommon)
 
 VISIT_INSTALL_TARGETS(avtmath)

avt/Pipeline/CMakeLists.txt

@@ -223,7 +223,7 @@ LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
 
 
 #********************************* SERIAL ************************************
-ADD_LIBRARY(avtpipeline_ser ${ALL_SOURCES})
+VTK_ADD_LIBRARY(avtpipeline_ser ${ALL_SOURCES})
 
 TARGET_LINK_LIBRARIES(avtpipeline_ser visitcommon avtmath avtdbatts lightweight_visit_vtk vtkGraphics ${ZLIB_LIB})
 VISIT_INSTALL_TARGETS(avtpipeline_ser)

common/CMakeLists.txt

@@ -283,7 +283,7 @@ IF(WIN32)
         PROPERTIES LANGUAGE CXX)
 ENDIF(WIN32)
 
-ADD_LIBRARY(visitcommon
+VTK_ADD_LIBRARY(visitcommon
     ${COMM_SOURCES} ${COMM_WIN32_SOURCES}
     ${EXCEPTION_SOURCES}
     ${EXPRESSION_SOURCES}

databases/CMakeLists.txt

@@ -126,14 +126,11 @@ SET(KIT_UPCASE "VISITDATABASES")
 include_directories(BEFORE
   ${VISIT_DB_INC_DIRS}
   )
-  
+
 include_directories(
   ${VISITBRIDGE_INCLUDE_DIRS}
   )
 
-
-
-
 if(HAVE_LIBSILO AND VISIT_BUILD_READER_Silo)
   include_directories(${SILO_INCLUDE_DIR})
 endif(HAVE_LIBSILO AND VISIT_BUILD_READER_Silo)
@@ -151,14 +148,13 @@ SET_SOURCE_FILES_PROPERTIES(
   WRAP_EXCLUDE
   )
 
-  
 #setup the kit so we get client server bindings  
 SET(VTK_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 INCLUDE(${VTK_CMAKE_DIR}/vtkExportKit.cmake)
 VTK_EXPORT_KIT("${KIT}" "${KIT_UPCASE}" "${Kit_SRCS}")
   
 #build all the readers into a single library
-add_library(vtk${KIT} ${Kit_SRCS} ${VISIT_DB_SOURCES})    
+vtk_add_library(vtk${KIT} ${Kit_SRCS} ${VISIT_DB_SOURCES})
 
 target_link_libraries(vtk${KIT} vtkVisItAVTAlgorithms vtkNetCDF) 
 if(PARAVIEW_HDF5_LIBRARIES)

visit_vtk/full/CMakeLists.txt

@@ -114,7 +114,7 @@ get_directory_property(tmp_include_dirs INCLUDE_DIRECTORIES)
 set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES
   "${VISIT_SOURCE_DIR}/parser;${tmp_include_dirs}")
 
-ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
+VTK_ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
 TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging vtktiff)
 
 VISIT_INSTALL_TARGETS(visit_vtk)

visit_vtk/lightweight/CMakeLists.txt

@@ -74,7 +74,7 @@ ${VISIT_SOURCE_DIR}/visit_vtk/lightweight
 # Add link directories needed to use our libraries and VTK.
 LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
 
-ADD_LIBRARY(lightweight_visit_vtk
+VTK_ADD_LIBRARY(lightweight_visit_vtk
     ${LIGHTWEIGHT_VISIT_VTK_SOURCES}
 )