revert blas exclusion code

Daleang · May 10, 2014 · d34b23f · d34b23f
1 parent fb87782
commit d34b23f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 27 deletions.
diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
@@ -32,13 +32,6 @@ else()
 endif()
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
-# blas/lapack behavior
-if ("$ENV{RSTUDIO_NO_LINK_BLAS}" STREQUAL "1")
- set(RSTUDIO_LINK_BLAS FALSE)
-else()
- set(RSTUDIO_LINK_BLAS TRUE)
-endif()
-
 # default to debug builds
 if(NOT CMAKE_BUILD_TYPE)
  set(CMAKE_BUILD_TYPE "Debug")

diff --git a/cmake/modules/FindLibR.cmake b/cmake/modules/FindLibR.cmake
@@ -129,22 +129,20 @@ else()
  endif()
 
  # look for lapack
- if(RSTUDIO_LINK_BLAS)
- find_library(LIBR_LAPACK_LIBRARY NAMES Rlapack
- HINTS ${LIBR_LIB_DIR} ${LIBRARY_ARCH_HINT_PATH} ${LIBR_HOME}/bin)
- if(LIBR_LAPACK_LIBRARY)
- set(LIBR_LIBRARIES ${LIBR_LIBRARIES} ${LIBR_LAPACK_LIBRARY})
- if(UNIX)
- set(LIBR_LIBRARIES ${LIBR_LIBRARIES} gfortran)
- endif()
+ find_library(LIBR_LAPACK_LIBRARY NAMES Rlapack
+ HINTS ${LIBR_LIB_DIR} ${LIBRARY_ARCH_HINT_PATH} ${LIBR_HOME}/bin)
+ if(LIBR_LAPACK_LIBRARY)
+ set(LIBR_LIBRARIES ${LIBR_LIBRARIES} ${LIBR_LAPACK_LIBRARY})
+ if(UNIX)
+ set(LIBR_LIBRARIES ${LIBR_LIBRARIES} gfortran)
  endif()
+ endif()
 
- # look for blas
- find_library(LIBR_BLAS_LIBRARY NAMES Rblas
- HINTS ${LIBR_LIB_DIR} ${LIBRARY_ARCH_HINT_PATH} ${LIBR_HOME}/bin)
- if(LIBR_BLAS_LIBRARY)
- set(LIBR_LIBRARIES ${LIBR_LIBRARIES} ${LIBR_BLAS_LIBRARY})
- endif()
+ # look for blas
+ find_library(LIBR_BLAS_LIBRARY NAMES Rblas
+ HINTS ${LIBR_LIB_DIR} ${LIBRARY_ARCH_HINT_PATH} ${LIBR_HOME}/bin)
+ if(LIBR_BLAS_LIBRARY)
+ set(LIBR_LIBRARIES ${LIBR_LIBRARIES} ${LIBR_BLAS_LIBRARY})
  endif()
 
  # look for rgraphapp on win32

diff --git a/package/linux/make-package b/package/linux/make-package
@@ -16,12 +16,6 @@ then
  exit 1
 fi
 
-# don't link to the R blas on redhat/fedora
-if [ "$1" == "RPM" ]
-then
- export RSTUDIO_NO_LINK_BLAS="1"
-fi
-
 # set build type( if necessary) and build dir
 if test -z "$CMAKE_BUILD_TYPE"
 then