diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-12-27 18:52:54 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-12-27 18:52:54 +0000 |
| commit | b5dc9522da2f16b459e14b9169fa0eee6a46a084 (patch) | |
| tree | 6c86bcaaabbe5a2f41db2b5b85161b4c0213d7df /sci-libs/vtk/files | |
| parent | Revert back to ~ppc64; bug #368723 (diff) | |
| download | gentoo-2-b5dc9522da2f16b459e14b9169fa0eee6a46a084.tar.gz gentoo-2-b5dc9522da2f16b459e14b9169fa0eee6a46a084.tar.bz2 gentoo-2-b5dc9522da2f16b459e14b9169fa0eee6a46a084.zip | |
Version Bump, #396119
(Portage version: 2.2.0_alpha83/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/vtk/files')
| -rw-r--r-- | sci-libs/vtk/files/vtk-5.8.0-R.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/sci-libs/vtk/files/vtk-5.8.0-R.patch b/sci-libs/vtk/files/vtk-5.8.0-R.patch new file mode 100644 index 000000000000..ce6dcde59e9d --- /dev/null +++ b/sci-libs/vtk/files/vtk-5.8.0-R.patch @@ -0,0 +1,45 @@ +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. + |