Commit 50d8963d authored by bonnell's avatar bonnell

Modified cmake build variables that we use, in order to get

a correct build on windows.  Newer global variables
'do the right thing' with dlls. (A brief explanation further down).

Added VISIT_PLUGIN_TARGET_PREFIX macro for plugins.  It modifies
the prefix for a target, allowing plugins on windows to be located
in a good place.  (The macro does nothing on non-windows).

Updated GenerateCMake.h, and re-ran for all plugins to make the
plugin mods easier.  As a result, all plot plugins now have 
'ENGINE' defined, whereas only those that really needed it
before were using it.


Brief explanation of build var changes:

global vars: 
    CMAKE_LIBRARY_OUTPUT_DIRECTORY 
    CMAKE_RUNTIME_OUTPUT_DIRECTORY 
    CMAKE_ARCHIVE_OUTPUT_DIRECTORY

they replace: 
    LIBRARY_OUTPUT_PATH 
    EXECUTABLE_OUTPUT_PATH
    ARCHIVE_OUTPUT_PATH

they initialize local target vars: 
    LIBRARY_OUTPUT_DIRECTORY
    RUNTIME_OUTPUT_DIRECTORY 
    ARCHIVE_OUTPUT_DIRECTORY

The global vars are set in our root CMakeLists.txt, and
can be overridden by setting the local var equivalent for 
any target.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@9724 18c085ea-50e0-402c-830e-de6fd14e8384
parent d641e143
......@@ -44,9 +44,9 @@
FUNCTION(THIRD_PARTY_INSTALL_LIBRARY LIBFILE)
IF(WIN32)
IF(NOT EXISTS ${EXECUTABLE_OUTPUT_PATH}/ThirdParty)
FILE(MAKE_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/ThirdParty)
ENDIF(NOT EXISTS ${EXECUTABLE_OUTPUT_PATH}/ThirdParty)
IF(NOT EXISTS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ThirdParty)
FILE(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ThirdParty)
ENDIF(NOT EXISTS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ThirdParty)
ENDIF(WIN32)
SET(tmpLIBFILE ${LIBFILE})
GET_FILENAME_COMPONENT(LIBEXT ${tmpLIBFILE} EXT)
......@@ -104,7 +104,7 @@ FUNCTION(THIRD_PARTY_INSTALL_LIBRARY LIBFILE)
IF(WIN32)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy
${curPATH}/${curNAMEWE}.dll
${EXECUTABLE_OUTPUT_PATH}/ThirdParty)
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ThirdParty)
ENDIF(WIN32)
# On Apple, we need to make the library be executable relative.
......@@ -159,7 +159,7 @@ FUNCTION(THIRD_PARTY_INSTALL_LIBRARY LIBFILE)
GET_FILENAME_COMPONENT(curPATH ${tmpLIBFILE} PATH)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy
${curPATH}/${curNAMEWE}.dll
${EXECUTABLE_OUTPUT_PATH}/ThirdParty)
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ThirdParty)
ENDIF(WIN32)
# On Apple, we need to make the library be executable relative.
......
......@@ -136,27 +136,29 @@ ENDIF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
IF (WIN32)
MESSAGE(STATUS "Trying to include config-site/windows.cmake")
INCLUDE(config-site/windows.cmake)
SET(CMAKE_SKIP_RPATH ON CACHE INTERNAL "VisIt builds with rpath set." FORCE)
ENDIF (WIN32)
#-----------------------------------------------------------------------------
# Output directories.
#-----------------------------------------------------------------------------
IF(NOT LIBRARY_OUTPUT_PATH)
SET(LIBRARY_OUTPUT_PATH ${VISIT_BINARY_DIR}/lib CACHE INTERNAL "Single output directory for building all libraries.")
ENDIF(NOT LIBRARY_OUTPUT_PATH)
IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${VISIT_BINARY_DIR}/lib CACHE INTERNAL "Single output directory for building all libraries.")
ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
IF(NOT EXECUTABLE_OUTPUT_PATH)
SET(EXECUTABLE_OUTPUT_PATH ${VISIT_BINARY_DIR}/exe CACHE INTERNAL "Single output directory for building all executables.")
ENDIF(NOT EXECUTABLE_OUTPUT_PATH)
IF(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${VISIT_BINARY_DIR}/lib CACHE INTERNAL "Single output directory for building all libraries.")
ENDIF(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
IF (WIN32 AND NOT RUNTIME_OUTPUT_PATH)
SET(RUNTIME_OUTPUT_PATH ${VISIT_BINARY_DIR}/exe CACHE INTERNAL "Single output directory for building all executables.")
ENDIF(WIN32 AND NOT RUNTIME_OUTPUT_PATH)
IF (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${VISIT_BINARY_DIR}/exe CACHE INTERNAL "Single output directory for building all executables.")
ENDIF(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
SET(VISIT_LIBRARY_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
SET(VISIT_EXECUTABLE_DIR ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
SET(VISIT_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR})
SET(VISIT_EXECUTABLE_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR})
SET(CXX_TEST_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
#-----------------------------------------------------------------------------
# configure options
......@@ -423,6 +425,12 @@ INSTALL(DIRECTORY avt common engine gui launcher mdserver third_party_builtin vi
PATTERN "CMakeFiles" EXCLUDE
)
MACRO(VISIT_PLUGIN_TARGET_PREFIX)
IF(WIN32)
SET_TARGET_PROPERTIES(${ARGN} PROPERTIES PREFIX "../lib")
ENDIF(WIN32)
ENDMACRO(VISIT_PLUGIN_TARGET_PREFIX)
#-----------------------------------------------------------------------------
# Detect packages here. We could probably write macros that we can include from
# elsewhere for this.
......@@ -628,6 +636,9 @@ ELSE(CMAKE_HOST_UNIX)
IF(WIN32)
SET(ZLIB_LIBRARY_DIR ${VISIT_WINDOWS_DIR}/ThirdParty/zlib/lib/${VISIT_MSVC_VERSION})
SET(ZLIB_LIB ${ZLIB_LIBRARY_DIR}/zlib1.lib)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy
${ZLIB_LIBRARY_DIR}/zlib1.dll
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ThirdParty)
ELSE(WIN32)
SET(ZLIB_LIB vtkzlib)
ENDIF(WIN32)
......@@ -1019,7 +1030,11 @@ CONFIGURE_FILE(${VISIT_SOURCE_DIR}/common/misc/ConfigureInfo.C.in
# version of VisIt
SET(VISIT_INCLUDE_DIR ${VISIT_SOURCE_DIR} CACHE INTERNAL "Path to VisIt's includes")
SET(VISIT_LIBRARY_DIR ${VISIT_SOURCE_DIR}/lib CACHE INTENAL "Path to VisIt's libraries")
SET(VISIT_PLUGIN_DIR ${VISIT_BINARY_DIR}/plugins CACHE INTERNAL "Path to VisIt's plugins")
IF(NOT WIN32)
SET(VISIT_PLUGIN_DIR ${VISIT_BINARY_DIR}/plugins CACHE INTERNAL "Path to VisIt's plugins")
ELSE(NOT WIN32)
SET(VISIT_PLUGIN_DIR ${VISIT_EXECUTABLE_DIR} CACHE INTERNAL "Path to VisIt's plugins")
ENDIF(NOT WIN32)
# Store some configure information into a C file (like version, SVN version
# and platform things that change).
......
......@@ -81,7 +81,7 @@ ${VISIT_SOURCE_DIR}/avt/DBAtts/SIL
)
# Add link directories needed.
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY})
ADD_LIBRARY(avtdbatts ${METADATA_SOURCES} ${SIL_SOURCES})
......
......@@ -71,7 +71,7 @@ ${VTK_INCLUDE_DIRS}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
#********************************* SERIAL ************************************
ADD_LIBRARY(avtddf_ser ${AVTDDF_SOURCES})
......
......@@ -108,7 +108,7 @@ ${VTK_INCLUDE_DIRS}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
# Unless we're doing a VISIT_DBIO_ONLY build then we need avtmir
IF(NOT VISIT_DBIO_ONLY)
......
......@@ -306,7 +306,7 @@ ${VTK_INCLUDE_DIRS}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
#********************************* SERIAL ************************************
ADD_LIBRARY(avtexpressions_ser ${AVTEXPRESSIONS_SOURCES})
......
......@@ -63,7 +63,7 @@ ${VTK_INCLUDE_DIRS}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
#********************************* SERIAL ************************************
ADD_LIBRARY(avtwriter_ser ${AVTWRITER_SOURCES})
......
......@@ -109,7 +109,7 @@ ${VTK_INCLUDE_DIRS}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
#********************************* SERIAL ************************************
ADD_LIBRARY(avtfilters_ser ${AVTFILTERS_SOURCES})
......
......@@ -59,7 +59,7 @@ ${VTK_INCLUDE_DIRS}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
ADD_LIBRARY(avtivp ${AVTIVP_SOURCES})
TARGET_LINK_LIBRARIES(avtivp avtmath visitcommon visit_vtk vtkCommon vtkFiltering)
......
......@@ -110,7 +110,7 @@ ${VTK_INCLUDE_DIRS}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
#********************************* SERIAL ************************************
ADD_LIBRARY(avtmir_ser ${AVTMIR_SOURCES})
......
......@@ -55,7 +55,7 @@ ${VISIT_COMMON_INCLUDES}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY})
ADD_LIBRARY(avtmath ${AVTMATH_SOURCES})
TARGET_LINK_LIBRARIES(avtmath visitcommon)
......
......@@ -218,7 +218,7 @@ ${VTK_INCLUDE_DIRS}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
# Unless we're doing a VISIT_DBIO_ONLY build then we need avtmath
IF(NOT VISIT_DBIO_ONLY)
......
......@@ -169,7 +169,7 @@ IF(QT_MAC_USE_COCOA)
ENDIF(QT_MAC_USE_COCOA)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR} )
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR} )
IF(QT_MAC_USE_COCOA)
LINK_DIRECTORIES(${QT_LIBRARY_DIR})
......
......@@ -73,7 +73,7 @@ ${QT_QTOPENGL_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS} ${QT_LIBRARY_DIR} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS} ${QT_LIBRARY_DIR} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
ADD_LIBRARY(avtqtviswindow ${AVTQTVISWINDOW_SOURCES})
TARGET_LINK_LIBRARIES(avtqtviswindow visitcommon avtviswindow_ser vtkqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
......
......@@ -179,7 +179,7 @@ ${VTK_INCLUDE_DIRS}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
#********************************* SERIAL ************************************
ADD_LIBRARY(avtquery_ser ${AVTQUERY_SOURCES})
......
......@@ -55,7 +55,7 @@ ${VTK_INCLUDE_DIRS}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
ADD_LIBRARY(avtshapelets ${AVTSHAPELETS_SOURCES})
TARGET_LINK_LIBRARIES(avtshapelets visitcommon avtmath vtkCommon vtkFiltering)
......
......@@ -53,7 +53,7 @@ ${VTK_INCLUDE_DIRS}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
ADD_LIBRARY(avtview ${AVTVIEW_SOURCES})
TARGET_LINK_LIBRARIES(avtview visitcommon vtkRendering)
......
......@@ -169,7 +169,7 @@ ${VTK_INCLUDE_DIRS}
)
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_DIR} ${GLEW_LIBRARY_DIR})
#********************************* SERIAL ************************************
ADD_LIBRARY(avtviswindow_ser ${AVTVISWINDOW_SOURCES})
......
......@@ -96,7 +96,7 @@ ENDFOREACH(VISIT_BIN_ITEM)
#----------------------------------------------------------------------------
IF(WIN32)
INCLUDE_DIRECTORIES(${VISIT_COMMON_INCLUDES})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH})
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY})
ADD_EXECUTABLE(visit_exe visit.c)
SET_TARGET_PROPERTIES(visit_exe PROPERTIES OUTPUT_NAME visit)
SET_SOURCE_FILES_PROPERTIES(visit.c PROPERTIES LANGUAGE CXX)
......
......@@ -30,8 +30,6 @@ VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk-5.0.0d/${VISIT_MSVC_VERSI
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/Qt/lib/${VISIT_MSVC_VERSION})
VISIT_OPTION_DEFAULT(QT_DIR ${VISITHOME}/Qt)
SET(QT_QMAKE_EXECUTABLE ${VISIT_QT_BIN}/qmake.exe)
#VISIT_OPTION_DEFAULT(VISIT_QT_BIN C:/Qt/4.4.3/MSVC7/bin)
#SET(QT_QMAKE_EXECUTABLE C:/Qt/4.4.3/MSVC7/bin/qmake.exe)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/Python25/${VISIT_MSVC_VERSION})
......
......@@ -49,8 +49,6 @@ ${ADIOS_INCLUDE_DIR}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${ADIOS_LIBRARY_DIR} )
ADD_LIBRARY(IADIOSDatabase ${LIBI_SOURCES})
......@@ -86,3 +84,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -50,8 +50,6 @@ ${VTK_INCLUDE_DIRS}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IANALYZEDatabase ${LIBI_SOURCES})
......@@ -87,3 +85,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -48,8 +48,6 @@ ${VTK_INCLUDE_DIRS}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IANSYSDatabase ${LIBI_SOURCES})
......@@ -85,3 +83,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -48,8 +48,6 @@ ${VTK_INCLUDE_DIRS}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IAUXFileDatabase ${LIBI_SOURCES})
......@@ -85,3 +83,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -55,8 +55,6 @@ ${ADVIO_INCLUDE_DIR}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${ADVIO_LIBRARY_DIR} )
ADD_LIBRARY(IAdventureDatabase ${LIBI_SOURCES})
......@@ -92,3 +90,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -48,8 +48,6 @@ ${VTK_INCLUDE_DIRS}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IAugDecompDatabase ${LIBI_SOURCES})
......@@ -85,3 +83,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
<?xml version="1.0"?>
<Plugin name="BOV" type="database" label="BOV" version="1.0" enabled="true" mdspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD" haswriter="true" hasoptions="false">
<LIBS>
${Z_LIB}
${ZLIB_LIB}
</LIBS>
<FilePatterns>
*.bov
......
......@@ -49,8 +49,6 @@ ${VTK_INCLUDE_DIRS}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IBOVDatabase ${LIBI_SOURCES})
......@@ -86,3 +84,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -49,8 +49,6 @@ ${VISIT_INCLUDE_DIR}/third_party_builtin/bow
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IBOWDatabase ${LIBI_SOURCES})
......@@ -86,3 +84,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -55,8 +55,6 @@ IF(WIN32)
ADD_DEFINITIONS(-DBL_FORT_USE_UPPERCASE)
ENDIF(WIN32)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${BOXLIB2D_LIBRARY_DIR} )
ADD_LIBRARY(IBoxlib2DDatabase ${LIBI_SOURCES})
......@@ -92,3 +90,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -55,8 +55,6 @@ IF(WIN32)
ADD_DEFINITIONS(-DBL_FORT_USE_UPPERCASE)
ENDIF(WIN32)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${BOXLIB3D_LIBRARY_DIR} )
ADD_LIBRARY(IBoxlib3DDatabase ${LIBI_SOURCES})
......@@ -92,3 +90,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -49,8 +49,6 @@ ${CCMIO_INCLUDE_DIR} ${MESA_INCLUDE_DIR}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${CCMIO_LIBRARY_DIR} )
ADD_LIBRARY(ICCMDatabase ${LIBI_SOURCES})
......@@ -86,3 +84,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -52,8 +52,6 @@ ${VTK_INCLUDE_DIRS}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(ICEAucdDatabase ${LIBI_SOURCES})
......@@ -89,3 +87,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -49,8 +49,6 @@ ${CGNS_INCLUDE_DIR}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${CGNS_LIBRARY_DIR} )
ADD_LIBRARY(ICGNSDatabase ${LIBI_SOURCES})
......@@ -86,3 +84,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -48,8 +48,6 @@ ${VTK_INCLUDE_DIRS}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(ICMATDatabase ${LIBI_SOURCES})
......@@ -85,3 +83,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -39,6 +39,12 @@
# Added Rect and Hex back to the optional plugins.
#
#****************************************************************************/
IF(NOT WIN32)
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${VISIT_PLUGIN_DIR}/databases)
ELSE(NOT WIN32)
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${VISIT_PLUGIN_DIR}/databases)
ENDIF(NOT WIN32)
SET(THIRDPARTY_DEPENDENT_PLUGINS)
MACRO(THIRDPARTY_DEPENDENT_PLUGINS libname targets)
......
......@@ -48,8 +48,6 @@ ${VTK_INCLUDE_DIRS}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(ICTRLDatabase ${LIBI_SOURCES})
......@@ -85,3 +83,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -49,8 +49,6 @@ ${PDB_INCLUDE_DIR}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${PDB_LIBRARY_DIR} )
ADD_LIBRARY(ICaleDatabase ${LIBI_SOURCES})
......@@ -86,3 +84,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -54,8 +54,6 @@ IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
ADD_LIBRARY(IChomboDatabase ${LIBI_SOURCES})
......@@ -91,3 +89,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -48,8 +48,6 @@ ${VTK_INCLUDE_DIRS}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(IClawDatabase ${LIBI_SOURCES})
......@@ -85,3 +83,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -52,8 +52,6 @@ IF(WIN32)
ADD_DEFINITIONS(-DMFHDFLIB_ -D_HDFLIB_)
ENDIF(WIN32)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF4_LIBRARY_DIR} )
ADD_LIBRARY(ICosmosDatabase ${LIBI_SOURCES})
......@@ -89,3 +87,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -52,8 +52,6 @@ IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
ADD_LIBRARY(ICosmosPPDatabase ${LIBI_SOURCES})
......@@ -89,3 +87,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -48,8 +48,6 @@ ${VTK_INCLUDE_DIRS}
)
SET(LIBRARY_OUTPUT_PATH ${VISIT_PLUGIN_DIR}/databases)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
ADD_LIBRARY(ICurve2DDatabase ${LIBI_SOURCES})
......@@ -85,3 +83,6 @@ IF(VISIT_PARALLEL)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
VISIT_PLUGIN_TARGET_PREFIX(${INSTALLTARGETS})
......@@ -52,8 +52,6 @@ ${VTK_INCLUDE_DIRS}
)