Commit 863a2fe1 authored by bonnell's avatar bonnell

Remove the definition of _HDF5USEDLL_ from hdf5 based plugins on windows, as...

Remove the definition of _HDF5USEDLL_ from hdf5 based plugins on windows, as this is now predefined in an hdf5 header.  This change prevents 'macro redefinition' warnings during compilation.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@18881 18c085ea-50e0-402c-830e-de6fd14e8384
parent 4b8486f6
......@@ -56,9 +56,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -52,9 +52,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -50,9 +50,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -52,9 +52,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -53,9 +53,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -50,9 +50,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -53,7 +53,6 @@ ${VTK_INCLUDE_DIRS}
IF(WIN32)
ADD_DEFINITIONS(-D_HDFDLL_ -D_MFHDFLIB_ -D_HDFLIB_ -DINTEL86)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF4_LIBRARY_DIR} ${HDF5_LIBRARY_DIR} )
......
......@@ -52,9 +52,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -50,9 +50,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -52,9 +52,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -77,9 +77,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} ${FASTBIT_LIBRARY_DIR} ${H5PART_LIBRARY_DIR} )
......
......@@ -50,9 +50,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -54,9 +54,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -50,9 +50,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -50,9 +50,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -50,9 +50,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -50,9 +50,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -50,9 +50,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -52,9 +52,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -52,9 +52,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -55,9 +55,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${SILO_LIBRARY_DIR} ${HDF5_LIBRARY_DIR} )
......
......@@ -94,9 +94,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${HDF5_LIBRARY_DIR} )
......
......@@ -51,9 +51,6 @@ ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
IF(WIN32)
ADD_DEFINITIONS(-D_HDF5USEDLL_)
ENDIF(WIN32)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} ${XDMF_LIBRARY_DIR} ${HDF5_LIBRARY_DIR} )
......
......@@ -138,6 +138,10 @@
// Set VISIT_ARCHIVE_DIR on windows to be /lib. Change minimum CMake
// version to 2.8.8.
//
// Kathleen Biagas, Mon Jul 30 15:40:10 MST 2012
// No longer add definition _HDF5USEDLL_ for hdf5 based plugins, as this
// is now predefined in an hdf5 header.
//
// ****************************************************************************
class CMakeGeneratorPlugin : public Plugin
......@@ -890,8 +894,6 @@ class CMakeGeneratorPlugin : public Plugin
{
if(libs[i].contains("BOXLIB"))
needWindowsDefines = true;
else if(libs[i].contains("HDF5"))
needWindowsDefines = true;
else if(libs[i].contains("HDF4"))
needWindowsDefines = true;
else if(libs[i].contains("FITS"))
......@@ -908,8 +910,6 @@ class CMakeGeneratorPlugin : public Plugin
{
if(libs[i].contains("BOXLIB"))
out << " ADD_DEFINITIONS(-DBL_FORT_USE_UPPERCASE)" << endl;
else if(libs[i].contains("HDF5"))
out << " ADD_DEFINITIONS(-D_HDF5USEDLL_)" << endl;
else if(libs[i].contains("HDF4"))
out << " ADD_DEFINITIONS(-D_HDFDLL_ -D_MFHDFLIB_ -D_HDFLIB_ -DINTEL86)" << endl;
else if(libs[i].contains("FITS"))
......
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