Changeset da4af657 in tol

Timestamp:

Oct 6, 2015, 6:32:39 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

ec3efea

Parents:

0becf48

Message:

se introduce las variables TOL_CBLAS_INCLUDE_DIR y TOL_CBLAS_LIBRARIES para no sobreescribir CBLAS_xxx ya que esto puede confundir a FindCBLAS.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6918 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol

Files:

• CMakeLists.txt (modified) (2 diffs)
• bmath/blinalg/CMakeLists.txt (modified) (1 diff)
• bmath/bprdist/CMakeLists.txt (modified) (1 diff)
• bmath/bstat/CMakeLists.txt (modified) (1 diff)
• btol/bmodel/CMakeLists.txt (modified) (1 diff)
• btol/matrix_type/CMakeLists.txt (modified) (1 diff)
• btol/vmatrix_type/CMakeLists.txt (modified) (1 diff)

tol/CMakeLists.txt

@@ -236 +236 @@
 if( CBLAS_FOUND )
   set( HAVE_CBLAS_H 1 CACHE INTERNAL "" )
+  set( TOL_CBLAS_LIBRARIES ${CBLAS_LIBRARIES} )
+  set( TOL_CBLAS_INCLUDE_DIR ${CBLAS_INCLUDE_DIR} )
 else( CBLAS_FOUND )
   message( STATUS "CBLAS not found, using gslcblas = ${GSLCBLAS_LIBRARY}" )
   unset( HAVE_CBLAS_H CACHE )
-  set( CBLAS_LIBRARY ${GSLCBLAS_LIBRARY} CACHE INTERNAL "")
-  set( CBLAS_LIBRARIES ${GSLCBLAS_LIBRARY} CACHE INTERNAL "" )
-  set( CBLAS_INCLUDE_DIR ${GSL_INCLUDE_DIRS} CACHE INTERNAL "")
+  set( TOL_CBLAS_LIBRARIES ${GSLCBLAS_LIBRARY} CACHE INTERNAL "" )
+  set( TOL_CBLAS_INCLUDE_DIR ${GSL_INCLUDE_DIRS} CACHE INTERNAL "")
 endif( CBLAS_FOUND )
 if( TRACE_COMPONENTS_FOUND )
-  message( "CBLAS_INCLUDE_DIR = ${CBLAS_INCLUDE_DIR}" )
-  message( "CBLAS_LIBRARY = ${CBLAS_LIBRARY}" )
-  message( "CBLAS_LIBRARIES = ${CBLAS_LIBRARIES}" )
+  message( "TOL_CBLAS_INCLUDE_DIR = ${TOL_CBLAS_INCLUDE_DIR}" )
+  message( "TOL_CBLAS_LIBRARIES = ${TOL_CBLAS_LIBRARIES}" )
 endif( TRACE_COMPONENTS_FOUND )
 
@@ -401 +401 @@
 endif( WIN32 )
 target_link_libraries( tol 
-  ${GSL_LIBRARY} ${CBLAS_LIBRARIES} ${CLAPACK_LIBRARIES}
+  ${GSL_LIBRARY} ${TOL_CBLAS_LIBRARIES} ${CLAPACK_LIBRARIES}
   ${BZIP2_LIBRARIES} ${Boost_LIBRARIES}
   ${FFTW_LIBRARIES} ${ZLIB_LIBRARIES}

tol/bmath/blinalg/CMakeLists.txt

@@ -6 +6 @@
   
 target_include_directories( blinalg PRIVATE 
-  ${CBLAS_INCLUDE_DIR} ${CLAPACK_INCLUDE_DIR} )
+  ${TOL_CBLAS_INCLUDE_DIR} ${CLAPACK_INCLUDE_DIR} )

tol/bmath/bprdist/CMakeLists.txt

@@ -5 +5 @@
   "${PROJECT_SOURCE_DIR}/contrib"
   "${PROJECT_SOURCE_DIR}/bmath/gsl_ext" 
-  ${CBLAS_INCLUDE_DIR} ${CLAPACK_INCLUDE_DIR} )
+  ${TOL_CBLAS_INCLUDE_DIR} ${CLAPACK_INCLUDE_DIR} )
   

tol/bmath/bstat/CMakeLists.txt

@@ -4 +4 @@
   ar.cpp  arma.cpp  linreg.cpp  logit.cpp  stat.cpp  test.cpp unitroot.cpp )
 target_include_directories( bstat PRIVATE 
-  ${CBLAS_INCLUDE_DIR} ${CLAPACK_INCLUDE_DIR} )
+  ${TOL_CBLAS_INCLUDE_DIR} ${CLAPACK_INCLUDE_DIR} )
   

tol/btol/bmodel/CMakeLists.txt

@@ -5 +5 @@
   estim.cpp  modcalc.cpp  model.cpp    sparselinreg.cpp )
 target_include_directories( bmodel PRIVATE 
-  ${CBLAS_INCLUDE_DIR} ${CLAPACK_INCLUDE_DIR} ${CHOLMOD_INCLUDE_DIR} )
+  ${TOL_CBLAS_INCLUDE_DIR} ${CLAPACK_INCLUDE_DIR} ${CHOLMOD_INCLUDE_DIR} )

tol/btol/matrix_type/CMakeLists.txt

@@ -5 +5 @@
 target_include_directories( matrix_type PRIVATE 
   "${FFTW_INCLUDES}" "${PROJECT_SOURCE_DIR}/bmath/gsl_ext" 
-  ${CMAKE_CURRENT_SOURCE_DIR} ${CBLAS_INCLUDE_DIR} ${CLAPACK_INCLUDE_DIR} )
+  ${CMAKE_CURRENT_SOURCE_DIR} ${TOL_CBLAS_INCLUDE_DIR} ${CLAPACK_INCLUDE_DIR} )

tol/btol/vmatrix_type/CMakeLists.txt

@@ -10 +10 @@
   "${CHOLMOD_INCLUDE_DIR}"
   "${PROJECT_SOURCE_DIR}/bmath/gsl_ext" 
-  "${CBLAS_INCLUDE_DIR}" )
+  "${TOL_CBLAS_INCLUDE_DIR}" )