1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
diff --git a/CMake/FindR.cmake b/CMake/FindR.cmake
index ee49570..c830db0 100644
--- a/CMake/FindR.cmake
+++ b/CMake/FindR.cmake
@@ -18,13 +18,12 @@ IF (R_COMMAND)
ENDIF (R_COMMAND)
SET(CMAKE_FIND_APPBUNDLE ${TEMP_CMAKE_FIND_APPBUNDLE})
-FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/local/lib /usr/local/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h")
+FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/lib /usr/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h")
FIND_LIBRARY(R_LIBRARY_BASE R PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "R library (example libR.a, libR.dylib, etc.).")
-FIND_LIBRARY(R_LIBRARY_BLAS Rblas PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rblas library (example libRblas.a, libRblas.dylib, etc.).")
-FIND_LIBRARY(R_LIBRARY_LAPACK Rlapack PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rlapack library (example libRlapack.a, libRlapack.dylib, etc.).")
+FIND_LIBRARY(R_LIBRARY_MATH Rmath PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rmath library (example libRmath.a, libRmath.dylib, etc.).")
FIND_LIBRARY(R_LIBRARY_READLINE readline DOC "(Optional) system readline library. Only required if the R libraries were build with readline support.")
-SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_BLAS} ${R_LIBRARY_LAPACK} ${R_LIBRARY_BASE})
+SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_MATH} ${R_LIBRARY_BASE})
IF (R_LIBRARY_READLINE)
SET(R_LIBRARIES ${R_LIBRARIES} ${R_LIBRARY_READLINE})
ENDIF (R_LIBRARY_READLINE)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d4e881..1a828a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1054,8 +1054,18 @@ IF(VTK_WRAP_JAVA)
ENDIF(JAVA_AWT_LIBRARY)
ENDIF(VTK_WRAP_JAVA)
+IF(VTK_USE_GNU_R)
+ FIND_PACKAGE(R)
+ENDIF(VTK_USE_GNU_R)
-
+IF(VTK_USE_BOOST)
+ if (VTK_USE_PARALLEL_BGL)
+ FIND_PACKAGE(Boost 1.39.0 REQUIRED
+ COMPONENTS mpi serialization filesystem system graph_parallel)
+ else (VTK_USE_PARALLEL_BGL)
+ FIND_PACKAGE(Boost REQUIRED)
+ endif (VTK_USE_PARALLEL_BGL)
+ENDIF(VTK_USE_BOOST)
#-----------------------------------------------------------------------------
# The entire VTK tree should use the same include path.
diff --git a/Graphics/vtkRInterface.cxx b/Graphics/vtkRInterface.cxx
index 324e845..56a4869 100644
--- a/Graphics/vtkRInterface.cxx
+++ b/Graphics/vtkRInterface.cxx
@@ -23,6 +23,7 @@
#undef HAVE_UINTPTR_T
#ifdef HAVE_VTK_UINTPTR_T
#define HAVE_UINTPTR_T HAVE_VTK_UINTPTR_T
+#include <stdint.h>
#endif
#include "vtkInformation.h"
|
GitWeb
