Commit 9249f851 authored by bonnell's avatar bonnell

More changes to use boost's cstdint.hpp

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10218 18c085ea-50e0-402c-830e-de6fd14e8384
parent b68eb7a7
......@@ -543,7 +543,9 @@ ENDIF(VISIT_TUVOK)
# Set up boost (interval) library
SET(HAVE_BILIB 1)
SET(BOOST_INCLUDE_DIR ${VISIT_BINARY_DIR}/third_party_builtin/bilib/boost_1_42_0)
SET(BOOST_INCLUDE_DIR ${VISIT_SOURCE_DIR}/third_party_builtin/bilib/boost_1_42_0 CACHE PATH "Path to boost lib")
# Set up the SLIVR library if it was enabled.
IF(VISIT_SLIVR)
......
......@@ -4,6 +4,7 @@
${HDF5_INCLUDE_DIR}
${FASTBIT_INCLUDE_DIR}
${H5PART_INCLUDE_DIR}
${BOOST_INCLUDE_DIR}
</CXXFLAGS>
<LDFLAGS>
${HDF5_LIBRARY_DIR}
......
......@@ -4,6 +4,7 @@
${HDF5_INCLUDE_DIR}
${FASTBIT_INCLUDE_DIR}
${H5PART_INCLUDE_DIR}
${BOOST_INCLUDE_DIR}
</CXXFLAGS>
<LDFLAGS>
${HDF5_LIBRARY_DIR}
......
......@@ -47,6 +47,7 @@ ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
${BOOST_INCLUDE_DIR}
)
......
<?xml version="1.0"?>
<Plugin name="Miranda" type="database" label="Miranda" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" dbtype="MTMD" haswriter="false" hasoptions="true" filePatternsStrict="false">
<Plugin name="Miranda" type="database" label="Miranda" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" dbtype="MTMD" haswriter="false" hasoptions="true" filePatternsStrict="false">
<CXXFLAGS>
${BOOST_INCLUDE_DIR}
</CXXFLAGS>
<FilePatterns>
*.mir
*.raw
......
......@@ -44,10 +44,11 @@
#include <string>
#include <boost/cstdint.hpp>
using boost::int32_t;
#ifdef _WIN32
#include <direct.h> /* for _getcwd */
#else
#include <inttypes.h>
#include <unistd.h>
#endif
......@@ -81,9 +82,6 @@ using std::string;
#endif
#endif
#ifdef _WIN32
typedef int int32_t;
#endif
// ****************************************************************************
......
......@@ -45,6 +45,7 @@ ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
${BOOST_INCLUDE_DIR}
)
......
<?xml version="1.0"?>
<Plugin name="Nek5000" type="database" label="Nek5000" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" dbtype="MTMD" haswriter="false" hasoptions="false">
<CXXFLAGS>
${BOOST_INCLUDE_DIR}
</CXXFLAGS>
<FilePatterns>
*.nek3d
*.nek2d
......
......@@ -96,11 +96,8 @@ using std::string;
#endif
#endif
#ifdef WIN32
typedef __int64 int64_t;
#else
#include <inttypes.h>
#endif
#include <boost/cstdint.hpp>
using boost::int64_t;
// ****************************************************************************
......
<?xml version="1.0"?>
<Plugin name="SAS" type="database" label="SAS" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" dbtype="MTMD" haswriter="false" hasoptions="false">
<CXXFLAGS>
${BOOST_INCLUDE_DIR}
</CXXFLAGS>
<FilePatterns>
*.sasgeom
*.sasdata
......
<?xml version="1.0"?>
<Plugin name="paraDIS" type="database" label="paraDIS simulation dump metafile" version="1.0a1" enabled="true" mdspecificcode="false" onlyengine="false" noengine="false" dbtype="STSD" haswriter="false" hasoptions="false">
<Files components="M">
avtparaDISFileFormat.C
paraDIS_lib/paradis.C
paraDIS_lib/paradis_c_interface.C
RC_c_lib/args.c
RC_c_lib/debugutil.c
RC_c_lib/fileutils.c
RC_c_lib/inventor.c
RC_cpp_lib/RangeList.C
RC_cpp_lib/timer.C
RC_cpp_lib/pathutil.C
avtparaDISFileFormat.C
paraDIS_lib/paradis.C
paraDIS_lib/paradis_c_interface.C
RC_c_lib/args.c
RC_c_lib/debugutil.c
RC_c_lib/fileutils.c
RC_c_lib/inventor.c
RC_cpp_lib/RangeList.C
RC_cpp_lib/timer.C
RC_cpp_lib/pathutil.C
</Files>
<Files components="E">
avtparaDISFileFormat.C
paraDIS_lib/paradis.C
paraDIS_lib/paradis_c_interface.C
RC_c_lib/args.c
RC_c_lib/debugutil.c
RC_c_lib/fileutils.c
RC_c_lib/inventor.c
RC_cpp_lib/RangeList.C
RC_cpp_lib/timer.C
RC_cpp_lib/pathutil.C
avtparaDISFileFormat.C
paraDIS_lib/paradis.C
paraDIS_lib/paradis_c_interface.C
RC_c_lib/args.c
RC_c_lib/debugutil.c
RC_c_lib/fileutils.c
RC_c_lib/inventor.c
RC_cpp_lib/RangeList.C
RC_cpp_lib/timer.C
RC_cpp_lib/pathutil.C
</Files>
<CXXFLAGS>
-DNO_BOOST
-IparaDIS_lib
-IRC_c_lib
-IRC_cpp_lib
${BOOST_INCLUDE_DIR}
</CXXFLAGS>
<FilePatterns>
*.prds
......
......@@ -39,7 +39,6 @@
# Added Windows-specific version of EXECUTE_PROCESS.
#
#****************************************************************************/
cmake_minimum_required(VERSION 2.6)
INSTALL(FILES ${BOOST_FILES}
DESTINATION ${VISIT_INSTALLED_VERSION_INCLUDE}/boost_1_42_0
......
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