Updates will be applied April 15th at 12pm EDT (UTC-0400). GitLab could be a little slow between 12 - 12:45pm EDT.

Commit 2d323fc4 authored by VTK Developers's avatar VTK Developers Committed by Brad King

Remove trailing whitespace from all source files

Exclude ThirdParty, Utilities/MetaIO, and Utilities/KWSys as these
are maintained outside VTK.

Co-Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
Co-Author: Chris Harris <chris.harris@kitware.com>
Co-Author: Brad King <brad.king@kitware.com>
parent 144f03ca

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
## List all test sources ## List all test sources
set(MyTests set(MyTests
TestFlashReader.cxx TestFlashReader.cxx
TestEnzoReader.cxx TestEnzoReader.cxx
) )
## Create test source list ## Create test source list
create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx create_test_sourcelist(Tests ${vtk-module}CxxTests.cxx
${MyTests} ${MyTests}
EXTRA_INCLUDE vtkTestDriver.h EXTRA_INCLUDE vtkTestDriver.h
) )
vtk_module_test_executable(${vtk-module}CxxTests ${Tests}) vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
set(TestsToRun ${Tests}) set(TestsToRun ${Tests})
remove(TestsToRun ${vtk-module}CxxTests.cxx) remove(TestsToRun ${vtk-module}CxxTests.cxx)
......
vtk_module(vtkAMRCore vtk_module(vtkAMRCore
GROUPS GROUPS
StandAlone StandAlone
DEPENDS DEPENDS
vtkParallelCore vtkParallelCore
vtkFiltersGeneral vtkFiltersGeneral
vtkhdf5 vtkhdf5
......
...@@ -225,7 +225,7 @@ bool vtkAMRResampleFilter::FoundDonor( ...@@ -225,7 +225,7 @@ bool vtkAMRResampleFilter::FoundDonor(
this->NumberOfBlocksTested++; this->NumberOfBlocksTested++;
donorGrid->GetBounds(gbounds); donorGrid->GetBounds(gbounds);
if ((q[0] < gbounds[0]) || (q[0] > gbounds[1]) || if ((q[0] < gbounds[0]) || (q[0] > gbounds[1]) ||
(q[1] < gbounds[2]) || (q[1] > gbounds[3]) || (q[1] < gbounds[2]) || (q[1] > gbounds[3]) ||
(q[2] < gbounds[4]) || (q[2] > gbounds[5])) (q[2] < gbounds[4]) || (q[2] > gbounds[5]))
{ {
return false; return false;
...@@ -467,7 +467,7 @@ int vtkAMRResampleFilter::ProbeGridPointInAMR( ...@@ -467,7 +467,7 @@ int vtkAMRResampleFilter::ProbeGridPointInAMR(
{ {
assert( "pre: donorCellIdx is invalid" && assert( "pre: donorCellIdx is invalid" &&
(donorCellIdx >= 0) && (donorCellIdx < donorGrid->GetNumberOfCells()) ); (donorCellIdx >= 0) && (donorCellIdx < donorGrid->GetNumberOfCells()) );
this->NumberOfTimesFoundOnDonorLevel++; this->NumberOfTimesFoundOnDonorLevel++;
// Lets see if the cell is blanked - if it isn't then we found the highest // Lets see if the cell is blanked - if it isn't then we found the highest
// resolution grid that contains the point // resolution grid that contains the point
...@@ -544,7 +544,7 @@ int vtkAMRResampleFilter::ProbeGridPointInAMR( ...@@ -544,7 +544,7 @@ int vtkAMRResampleFilter::ProbeGridPointInAMR(
return donorCellIdx; return donorCellIdx;
} }
// Lets see if this is the highest resolution grid that contains the // Lets see if this is the highest resolution grid that contains the
// point // point
if (donorGrid->IsCellVisible(donorCellIdx)) if (donorGrid->IsCellVisible(donorCellIdx))
{ {
...@@ -586,7 +586,7 @@ int vtkAMRResampleFilter::ProbeGridPointInAMR( ...@@ -586,7 +586,7 @@ int vtkAMRResampleFilter::ProbeGridPointInAMR(
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void vtkAMRResampleFilter::SearchGridAncestors(double q[3], void vtkAMRResampleFilter::SearchGridAncestors(double q[3],
vtkOverlappingAMR *amrds, vtkOverlappingAMR *amrds,
unsigned int &level, unsigned int &level,
unsigned int &gridId, unsigned int &gridId,
...@@ -620,7 +620,7 @@ void vtkAMRResampleFilter::SearchGridAncestors(double q[3], ...@@ -620,7 +620,7 @@ void vtkAMRResampleFilter::SearchGridAncestors(double q[3],
cellId = -1; cellId = -1;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void vtkAMRResampleFilter::SearchGridDecendants(double q[3], void vtkAMRResampleFilter::SearchGridDecendants(double q[3],
vtkOverlappingAMR *amrds, vtkOverlappingAMR *amrds,
unsigned int maxLevel, unsigned int maxLevel,
unsigned int &level, unsigned int &level,
...@@ -670,7 +670,7 @@ void vtkAMRResampleFilter::SearchGridDecendants(double q[3], ...@@ -670,7 +670,7 @@ void vtkAMRResampleFilter::SearchGridDecendants(double q[3],
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
int vtkAMRResampleFilter:: int vtkAMRResampleFilter::
ProbeGridPointInAMRGraph(double q[3], vtkUniformGrid *&donorGrid, ProbeGridPointInAMRGraph(double q[3], vtkUniformGrid *&donorGrid,
unsigned int &donorLevel, unsigned int &donorGridId, unsigned int &donorLevel, unsigned int &donorGridId,
vtkOverlappingAMR *amrds, unsigned int maxLevel) vtkOverlappingAMR *amrds, unsigned int maxLevel)
{ {
assert( "pre: AMR dataset is NULL" && amrds != NULL ); assert( "pre: AMR dataset is NULL" && amrds != NULL );
...@@ -771,7 +771,7 @@ void vtkAMRResampleFilter::TransferToGridNodes( ...@@ -771,7 +771,7 @@ void vtkAMRResampleFilter::TransferToGridNodes(
{ {
g->GetPoint( pIdx, qPoint ); g->GetPoint( pIdx, qPoint );
donorCellIdx = donorCellIdx =
this->ProbeGridPointInAMRGraph(qPoint,donorGrid, this->ProbeGridPointInAMRGraph(qPoint,donorGrid,
donorLevel, donorGridId, donorLevel, donorGridId,
this->AMRMetaData,maxLevelToLoad ); this->AMRMetaData,maxLevelToLoad );
if( donorCellIdx != -1 ) if( donorCellIdx != -1 )
...@@ -795,11 +795,11 @@ void vtkAMRResampleFilter::TransferToGridNodes( ...@@ -795,11 +795,11 @@ void vtkAMRResampleFilter::TransferToGridNodes(
for(pIdx = 0; pIdx < g->GetNumberOfPoints(); ++pIdx ) for(pIdx = 0; pIdx < g->GetNumberOfPoints(); ++pIdx )
{ {
g->GetPoint( pIdx, qPoint ); g->GetPoint( pIdx, qPoint );
donorCellIdx = donorCellIdx =
this->ProbeGridPointInAMR(qPoint,donorGrid, donorLevel, this->ProbeGridPointInAMR(qPoint,donorGrid, donorLevel,
amrds,maxLevelToLoad ); amrds,maxLevelToLoad );
if( donorCellIdx != -1 ) if( donorCellIdx != -1 )
{ {
this->AverageLevel += donorLevel; this->AverageLevel += donorLevel;
...@@ -1074,7 +1074,7 @@ void vtkAMRResampleFilter::AdjustNumberOfSamplesInRegion( ...@@ -1074,7 +1074,7 @@ void vtkAMRResampleFilter::AdjustNumberOfSamplesInRegion(
a[2] = fabs(this->BiasVector[2]); a[2] = fabs(this->BiasVector[2]);
// Find the max component // Find the max component
int bdir = int bdir =
(a[0] > a[1]) ? ((a[0] > a[2]) ? 0 : 2) : ((a[1] > a[2]) ? 1 : 2); (a[0] > a[1]) ? ((a[0] > a[2]) ? 0 : 2) : ((a[1] > a[2]) ? 1 : 2);
if (bdir == 0) if (bdir == 0)
......
...@@ -216,7 +216,7 @@ class VTKAMRCORE_EXPORT vtkAMRResampleFilter : public vtkMultiBlockDataSetAlgori ...@@ -216,7 +216,7 @@ class VTKAMRCORE_EXPORT vtkAMRResampleFilter : public vtkMultiBlockDataSetAlgori
// first. The method returns the ID of the cell w.r.t. the donorGrid that // first. The method returns the ID of the cell w.r.t. the donorGrid that
// contains the probe point q. - Makes use of Parent/Child Info // contains the probe point q. - Makes use of Parent/Child Info
int ProbeGridPointInAMRGraph( int ProbeGridPointInAMRGraph(
double q[3],vtkUniformGrid *&donorGrid, double q[3],vtkUniformGrid *&donorGrid,
unsigned int &donorLevel, unsigned int &donorGridId, unsigned int &donorLevel, unsigned int &donorGridId,
vtkOverlappingAMR *amrds, unsigned int maxLevel ); vtkOverlappingAMR *amrds, unsigned int maxLevel );
...@@ -325,7 +325,7 @@ class VTKAMRCORE_EXPORT vtkAMRResampleFilter : public vtkMultiBlockDataSetAlgori ...@@ -325,7 +325,7 @@ class VTKAMRCORE_EXPORT vtkAMRResampleFilter : public vtkMultiBlockDataSetAlgori
// Find a decendant of the specified grid that contains the point. // Find a decendant of the specified grid that contains the point.
// If none is found then the original grid information is returned. // If none is found then the original grid information is returned.
// The search is limited to levels < maxLevel // The search is limited to levels < maxLevel
void SearchGridDecendants(double q[3], void SearchGridDecendants(double q[3],
vtkOverlappingAMR *amrds, vtkOverlappingAMR *amrds,
unsigned int maxLevel, unsigned int maxLevel,
unsigned int &level, unsigned int &level,
...@@ -335,7 +335,7 @@ class VTKAMRCORE_EXPORT vtkAMRResampleFilter : public vtkMultiBlockDataSetAlgori ...@@ -335,7 +335,7 @@ class VTKAMRCORE_EXPORT vtkAMRResampleFilter : public vtkMultiBlockDataSetAlgori
//Description: //Description:
// Find an ancestor of the specified grid that contains the point. // Find an ancestor of the specified grid that contains the point.
// If none is found then the original grid information is returned // If none is found then the original grid information is returned
void SearchGridAncestors(double q[3], void SearchGridAncestors(double q[3],
vtkOverlappingAMR *amrds, vtkOverlappingAMR *amrds,
unsigned int &level, unsigned int &level,
unsigned int &gridId, unsigned int &gridId,
......
...@@ -19,7 +19,7 @@ SET(CTEST_CUSTOM_MEMCHECK_IGNORE ...@@ -19,7 +19,7 @@ SET(CTEST_CUSTOM_MEMCHECK_IGNORE
HeaderTesting-Views HeaderTesting-Views
HeaderTesting-VolumeRendering HeaderTesting-VolumeRendering
HeaderTesting-Widgets HeaderTesting-Widgets
PrintSelf-Charts PrintSelf-Charts
PrintSelf-Common PrintSelf-Common
PrintSelf-Filtering PrintSelf-Filtering
...@@ -51,7 +51,7 @@ SET(CTEST_CUSTOM_MEMCHECK_IGNORE ...@@ -51,7 +51,7 @@ SET(CTEST_CUSTOM_MEMCHECK_IGNORE
TestSetObjectMacro-Views TestSetObjectMacro-Views
TestSetObjectMacro-VolumeRendering TestSetObjectMacro-VolumeRendering
TestSetObjectMacro-Widgets TestSetObjectMacro-Widgets
# this one runs python which then runs two program so no memory checking there # this one runs python which then runs two program so no memory checking there
Sockets-image Sockets-image
) )
...@@ -148,7 +148,7 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION ...@@ -148,7 +148,7 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION
".*warning.*relational operator.*always evaluates to.*" ".*warning.*relational operator.*always evaluates to.*"
".*warning.*controlling expression is constant" ".*warning.*controlling expression is constant"
"[Qq]t.*h.*warning.*types cannot be declared in anonymous unions" "[Qq]t.*h.*warning.*types cannot be declared in anonymous unions"
# QT on HP-UX uses -ldl while VTK uses -dldl. # QT on HP-UX uses -ldl while VTK uses -dldl.
"aCC: warning 983: The -ldl library specified on the command line is also added automatically by the compiler driver." "aCC: warning 983: The -ldl library specified on the command line is also added automatically by the compiler driver."
...@@ -224,8 +224,8 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION ...@@ -224,8 +224,8 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION
# VPIC has endianness checks that are fragile, suppress warnings generated by them for now # VPIC has endianness checks that are fragile, suppress warnings generated by them for now
"Utilities.VPIC.*warning" "Utilities.VPIC.*warning"
#boost #boost
"boost.*warning.*assignment operator could not be generated" "boost.*warning.*assignment operator could not be generated"
"boost.*warning.*type name first seen using .* now seen using .*" "boost.*warning.*type name first seen using .* now seen using .*"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
MACRO(CHECK_CXX_SOURCE_RUNS SOURCE VAR COMMENT) MACRO(CHECK_CXX_SOURCE_RUNS SOURCE VAR COMMENT)
IF("HAVE_${VAR}" MATCHES "^HAVE_${VAR}$") IF("HAVE_${VAR}" MATCHES "^HAVE_${VAR}$")
SET(MACRO_CHECK_FUNCTION_DEFINITIONS SET(MACRO_CHECK_FUNCTION_DEFINITIONS
"-D${VAR} ${CMAKE_REQUIRED_FLAGS}") "-D${VAR} ${CMAKE_REQUIRED_FLAGS}")
IF(CMAKE_REQUIRED_LIBRARIES) IF(CMAKE_REQUIRED_LIBRARIES)
SET(CHECK_CXX_SOURCE_COMPILES_ADD_LIBRARIES SET(CHECK_CXX_SOURCE_COMPILES_ADD_LIBRARIES
...@@ -44,14 +44,14 @@ MACRO(CHECK_CXX_SOURCE_RUNS SOURCE VAR COMMENT) ...@@ -44,14 +44,14 @@ MACRO(CHECK_CXX_SOURCE_RUNS SOURCE VAR COMMENT)
IF(HAVE_${VAR}) IF(HAVE_${VAR})
SET(${VAR} 1 CACHE INTERNAL "Test ${COMMENT}") SET(${VAR} 1 CACHE INTERNAL "Test ${COMMENT}")
MESSAGE(STATUS "Performing Test ${COMMENT} - Success") MESSAGE(STATUS "Performing Test ${COMMENT} - Success")
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
"Performing C++ SOURCE FILE Test ${COMMENT} succeded with the following output:\n" "Performing C++ SOURCE FILE Test ${COMMENT} succeded with the following output:\n"
"${OUTPUT}\n" "${OUTPUT}\n"
"Source file was:\n${SOURCE}\n") "Source file was:\n${SOURCE}\n")
ELSE(HAVE_${VAR}) ELSE(HAVE_${VAR})
MESSAGE(STATUS "Performing Test ${COMMENT} - Failed") MESSAGE(STATUS "Performing Test ${COMMENT} - Failed")
SET(${VAR} "" CACHE INTERNAL "Test ${COMMENT}") SET(${VAR} "" CACHE INTERNAL "Test ${COMMENT}")
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
"Performing C++ SOURCE FILE Test ${COMMENT} failed with the following output:\n" "Performing C++ SOURCE FILE Test ${COMMENT} failed with the following output:\n"
"${OUTPUT}\n" "${OUTPUT}\n"
"Source file was:\n${SOURCE}\n") "Source file was:\n${SOURCE}\n")
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
# Try to find nVidia's Cg compiler, runtime libraries, and include path. # Try to find nVidia's Cg compiler, runtime libraries, and include path.
# Once done this will define # Once done this will define
# #
# CG_FOUND - system has NVidia Cg and it can be used. # CG_FOUND - system has NVidia Cg and it can be used.
# CG_INCLUDE_PATH = directory where cg.h resides # CG_INCLUDE_PATH = directory where cg.h resides
# CG_LIBRARY = full path to libCg.so (Cg.DLL on win32) # CG_LIBRARY = full path to libCg.so (Cg.DLL on win32)
# CG_GL_LIBRARY = full path to libCgGL.so (CgGL.dll on win32) # CG_GL_LIBRARY = full path to libCgGL.so (CgGL.dll on win32)
# CG_COMPILER = full path to cgc (cgc.exe on win32) # CG_COMPILER = full path to cgc (cgc.exe on win32)
# #
# On OSX default to using the framework version of Cg. # On OSX default to using the framework version of Cg.
......
...@@ -21,7 +21,7 @@ if(WIN32) # The only platform it makes sense to check for DirectX SDK ...@@ -21,7 +21,7 @@ if(WIN32) # The only platform it makes sense to check for DirectX SDK
) )
mark_as_advanced(DirectX_INCLUDE_DIR) mark_as_advanced(DirectX_INCLUDE_DIR)
if(DirectX_INCLUDE_DIR) if(DirectX_INCLUDE_DIR)
set(DirectX_ROOT_DIR "${DirectX_INCLUDE_DIR}/..") set(DirectX_ROOT_DIR "${DirectX_INCLUDE_DIR}/..")
endif(DirectX_INCLUDE_DIR) endif(DirectX_INCLUDE_DIR)
# dlls are in DirectX_ROOT_DIR/Developer Runtime/x64|x86 # dlls are in DirectX_ROOT_DIR/Developer Runtime/x64|x86
...@@ -29,10 +29,10 @@ if(WIN32) # The only platform it makes sense to check for DirectX SDK ...@@ -29,10 +29,10 @@ if(WIN32) # The only platform it makes sense to check for DirectX SDK
set(DirectX_LIBRARY_PATHS) set(DirectX_LIBRARY_PATHS)
if(CMAKE_CL_64) if(CMAKE_CL_64)
set(DirectX_LIBRARY_PATHS set(DirectX_LIBRARY_PATHS
"${DirectX_ROOT_DIR}/Lib/x64") "${DirectX_ROOT_DIR}/Lib/x64")
else(CMAKE_CL_64) else(CMAKE_CL_64)
set(DirectX_LIBRARY_PATHS set(DirectX_LIBRARY_PATHS
"${DirectX_ROOT_DIR}/Lib/x86" "${DirectX_ROOT_DIR}/Lib") "${DirectX_ROOT_DIR}/Lib/x86" "${DirectX_ROOT_DIR}/Lib")
endif(CMAKE_CL_64) endif(CMAKE_CL_64)
......
...@@ -117,10 +117,10 @@ IF(FFMPEG_INCLUDE_DIR) ...@@ -117,10 +117,10 @@ IF(FFMPEG_INCLUDE_DIR)
IF(FFMPEG_avcodec_LIBRARY) IF(FFMPEG_avcodec_LIBRARY)
IF(FFMPEG_avutil_LIBRARY) IF(FFMPEG_avutil_LIBRARY)
SET( FFMPEG_FOUND "YES" ) SET( FFMPEG_FOUND "YES" )
SET( FFMPEG_BASIC_LIBRARIES SET( FFMPEG_BASIC_LIBRARIES
${FFMPEG_avcodec_LIBRARY} ${FFMPEG_avcodec_LIBRARY}
${FFMPEG_avformat_LIBRARY} ${FFMPEG_avformat_LIBRARY}
${FFMPEG_avutil_LIBRARY} ${FFMPEG_avutil_LIBRARY}
) )
# swscale is always a part of newer ffmpeg distros # swscale is always a part of newer ffmpeg distros
......
...@@ -25,7 +25,7 @@ FIND_PATH(GL2PS_INCLUDE_DIR gl2ps.h) ...@@ -25,7 +25,7 @@ FIND_PATH(GL2PS_INCLUDE_DIR gl2ps.h)
FIND_LIBRARY(GL2PS_LIBRARY NAMES gl2ps ) FIND_LIBRARY(GL2PS_LIBRARY NAMES gl2ps )
# handle the QUIETLY and REQUIRED arguments and set GL2PS_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set GL2PS_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GL2PS DEFAULT_MSG GL2PS_LIBRARY GL2PS_INCLUDE_DIR) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GL2PS DEFAULT_MSG GL2PS_LIBRARY GL2PS_INCLUDE_DIR)
......
...@@ -40,11 +40,11 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES OR NOT LIBPROJ4_FOUND ) ...@@ -40,11 +40,11 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES OR NOT LIBPROJ4_FOUND )
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES ) if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES )
if ( LIBPROJ4_REQUIRED ) if ( LIBPROJ4_REQUIRED )
message( FATAL_ERROR "LIBPROJ4 is required. Set LIBPROJ4_DIR" ) message( FATAL_ERROR "LIBPROJ4 is required. Set LIBPROJ4_DIR" )
endif ( LIBPROJ4_REQUIRED ) endif ( LIBPROJ4_REQUIRED )
else ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES ) else ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES )
set( LIBPROJ4_FOUND 1 ) set( LIBPROJ4_FOUND 1 )
mark_as_advanced( LIBPROJ4_FOUND ) mark_as_advanced( LIBPROJ4_FOUND )
endif ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES ) endif ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES )
......
...@@ -58,10 +58,10 @@ ELSE(NOT WIN32) ...@@ -58,10 +58,10 @@ ELSE(NOT WIN32)
SET(MATLAB_LIB_DIR ${MATLAB_ROOT_DIR}/extern/lib/${MATLAB_DIR_PREFIX}/microsoft CACHE FILEPATH DOCSTRING) SET(MATLAB_LIB_DIR ${MATLAB_ROOT_DIR}/extern/lib/${MATLAB_DIR_PREFIX}/microsoft CACHE FILEPATH DOCSTRING)
ENDIF(NOT WIN32) ENDIF(NOT WIN32)
# Find mex executable # Find mex executable
IF(NOT WIN32) IF(NOT WIN32)
FIND_PROGRAM(MATLAB_MEX_EXECUTABLE mex ${MATLAB_ROOT_DIR} DOC "Path to Matlab mex compiler") FIND_PROGRAM(MATLAB_MEX_EXECUTABLE mex ${MATLAB_ROOT_DIR} DOC "Path to Matlab mex compiler")
ELSE(NOT WIN32) ELSE(NOT WIN32)
FIND_FILE(MATLAB_MEX_EXECUTABLE mex.bat ${MATLAB_ROOT_DIR} DOC "Path to Matlab mex compiler") FIND_FILE(MATLAB_MEX_EXECUTABLE mex.bat ${MATLAB_ROOT_DIR} DOC "Path to Matlab mex compiler")
ENDIF(NOT WIN32) ENDIF(NOT WIN32)
......
# #
# Find the MySQL client includes and library # Find the MySQL client includes and library
# #
# This module defines # This module defines
# MYSQL_INCLUDE_DIRECTORIES, where to find mysql.h # MYSQL_INCLUDE_DIRECTORIES, where to find mysql.h
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# also defined, but not for general use are # also defined, but not for general use are
# MYSQL_LIBRARY, where to find the MySQL library. # MYSQL_LIBRARY, where to find the MySQL library.
# #
# XXX NOTE: This is not yet for general use. I'm pretty sure there # XXX NOTE: This is not yet for general use. I'm pretty sure there
# are other libraries I have to link against at the same time. # are other libraries I have to link against at the same time.
# #
...@@ -31,7 +31,7 @@ FIND_PATH(MYSQL_INCLUDE_DIRECTORIES mysql.h ...@@ -31,7 +31,7 @@ FIND_PATH(MYSQL_INCLUDE_DIRECTORIES mysql.h
DOC "Specify the directory containing mysql.h." DOC "Specify the directory containing mysql.h."
) )
FIND_LIBRARY( MYSQL_LIBRARY FIND_LIBRARY( MYSQL_LIBRARY
NAMES mysql libmysql mysqlclient NAMES mysql libmysql mysqlclient
PATHS PATHS
/usr/lib /usr/lib
...@@ -53,7 +53,7 @@ FIND_LIBRARY( MYSQL_LIBRARY ...@@ -53,7 +53,7 @@ FIND_LIBRARY( MYSQL_LIBRARY
IF (NOT WIN32) IF (NOT WIN32)
FIND_LIBRARY( MYSQL_EXTRA_LIBRARIES FIND_LIBRARY( MYSQL_EXTRA_LIBRARIES
NAMES z zlib NAMES z zlib
PATHS /usr/lib /usr/local/lib PATHS /usr/lib /usr/local/lib
DOC "If more libraries are necessary to link in a MySQL client (typically zlib), specify them here.") DOC "If more libraries are necessary to link in a MySQL client (typically zlib), specify them here.")
ELSE (NOT WIN32) ELSE (NOT WIN32)
SET( MYSQL_EXTRA_LIBRARIES "" ) SET( MYSQL_EXTRA_LIBRARIES "" )
......
# #
# Find the ODBC driver manager includes and library. # Find the ODBC driver manager includes and library.
# #
# ODBC is an open standard for connecting to different databases in a # ODBC is an open standard for connecting to different databases in a
# semi-vendor-independent fashion. First you install the ODBC driver # semi-vendor-independent fashion. First you install the ODBC driver
# manager. Then you need a driver for each separate database you want # manager. Then you need a driver for each separate database you want
# to connect to (unless a generic one works). VTK includes neither # to connect to (unless a generic one works). VTK includes neither
# the driver manager nor the vendor-specific drivers: you have to find # the driver manager nor the vendor-specific drivers: you have to find
# those yourself. # those yourself.
# #
# This module defines # This module defines
# ODBC_INCLUDE_DIRECTORIES, where to find sql.h # ODBC_INCLUDE_DIRECTORIES, where to find sql.h
# ODBC_LIBRARIES, the libraries to link against to use ODBC # ODBC_LIBRARIES, the libraries to link against to use ODBC
...@@ -29,7 +29,7 @@ FIND_PATH(ODBC_INCLUDE_DIRECTORIES sql.h ...@@ -29,7 +29,7 @@ FIND_PATH(ODBC_INCLUDE_DIRECTORIES sql.h
DOC "Specify the directory containing sql.h." DOC "Specify the directory containing sql.h."
) )
FIND_LIBRARY( ODBC_LIBRARY FIND_LIBRARY( ODBC_LIBRARY
NAMES odbc iodbc unixodbc NAMES odbc iodbc unixodbc
PATHS PATHS
/usr/lib /usr/lib
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
IF (NOT OSMESA_INCLUDE_DIR) IF (NOT OSMESA_INCLUDE_DIR)
FIND_PATH(OSMESA_INCLUDE_DIR GL/osmesa.h FIND_PATH(OSMESA_INCLUDE_DIR GL/osmesa.h
/usr/openwin/share/include /usr/openwin/share/include
/opt/graphics/OpenGL/include /opt/graphics/OpenGL/include
) )
ENDIF (NOT OSMESA_INCLUDE_DIR) ENDIF (NOT OSMESA_INCLUDE_DIR)
...@@ -17,8 +17,8 @@ ENDIF (NOT OSMESA_INCLUDE_DIR) ...@@ -17,8 +17,8 @@ ENDIF (NOT OSMESA_INCLUDE_DIR)
# in the main Mesa library # in the main Mesa library
IF (NOT OSMESA_LIBRARY) IF (NOT OSMESA_LIBRARY)
FIND_LIBRARY(OSMESA_LIBRARY OSMesa FIND_LIBRARY(OSMESA_LIBRARY OSMesa
/opt/graphics/OpenGL/lib /opt/graphics/OpenGL/lib
/usr/openwin/lib /usr/openwin/lib
) )
ENDIF (NOT OSMESA_LIBRARY) ENDIF (NOT OSMESA_LIBRARY)
......
# #
# - This module locates an installed R distribution. # - This module locates an installed R distribution.
# #
# Defines the following: # Defines the following:
# #
# R_INCLUDE_DIR - Path to R include directory # R_INCLUDE_DIR - Path to R include directory
# R_LIBRARY - Path to R library # R_LIBRARY - Path to R library
# R_COMMAND - Path to R command # R_COMMAND - Path to R command
# #
......
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
# - The stub libraries are now found in FindTclStub.cmake # - The stub libraries are now found in FindTclStub.cmake
# => they were only useful for people writing Tcl/Tk extensions. # => they were only useful for people writing Tcl/Tk extensions.
# - TCL_LIBRARY_DEBUG and TK_LIBRARY_DEBUG were removed. # - TCL_LIBRARY_DEBUG and TK_LIBRARY_DEBUG were removed.
# => these libs are not packaged by default with Tcl/Tk distributions. # => these libs are not packaged by default with Tcl/Tk distributions.