Changeset 05325a3 in tol
- Timestamp:
- Aug 1, 2015, 10:40:00 AM (11 years ago)
- Branches:
- 1941-docker-image-to-test, devel, master
- Children:
- 865a39d3
- Parents:
- a42cfe4
- Location:
- tol
- Files:
-
- 4 edited
-
CMakeLists.txt (modified) (3 diffs)
-
cmake/mingw-m64.toolchain.cmake (modified) (1 diff)
-
cmake/modules/FindCLAPACK.cmake (modified) (1 diff)
-
contrib/cint/tolCint.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
tol/CMakeLists.txt
ra42cfe4 r05325a3 214 214 if( CBLAS_FOUND ) 215 215 set( HAVE_CBLAS_H 1 CACHE INTERNAL "" ) 216 if( TRACE_COMPONENTS_FOUND )217 message( "CBLAS_INCLUDE_DIR = ${CBLAS_INCLUDE_DIR}" )218 message( "CBLAS_LIBRARY = ${CBLAS_LIBRARY}" )219 message( "CBLAS_LIBRARIES = ${CBLAS_LIBRARIES}" )220 endif( TRACE_COMPONENTS_FOUND )221 216 else( CBLAS_FOUND ) 222 217 message( STATUS "CBLAS not found, using gslcblas = ${GSLCBLAS_LIBRARY}" ) 223 set( CBLAS_LIBRARY ${GSL_CBLAS_LIBRARY} ) 224 set( CBLAS_LIBRARIES ${GSL_CBLAS_LIBRARIES} ) 225 set( CBLAS_INCLUDE_DIR ${GSL_INCLUDE_DIRS} ) 218 unset( HAVE_CBLAS_H CACHE ) 219 set( CBLAS_LIBRARY ${GSLCBLAS_LIBRARY} CACHE INTERNAL "") 220 set( CBLAS_LIBRARIES ${GSLCBLAS_LIBRARY} CACHE INTERNAL "" ) 221 set( CBLAS_INCLUDE_DIR ${GSL_INCLUDE_DIRS} CACHE INTERNAL "") 226 222 endif( CBLAS_FOUND ) 223 if( TRACE_COMPONENTS_FOUND ) 224 message( "CBLAS_INCLUDE_DIR = ${CBLAS_INCLUDE_DIR}" ) 225 message( "CBLAS_LIBRARY = ${CBLAS_LIBRARY}" ) 226 message( "CBLAS_LIBRARIES = ${CBLAS_LIBRARIES}" ) 227 endif( TRACE_COMPONENTS_FOUND ) 227 228 228 229 # CLAPACK configuration … … 341 342 create_header_links( ) 342 343 343 set( write_config_h 1)344 set( write_config_h 0 ) 344 345 if( write_config_h ) 345 346 message( STATUS "Invoking CONFIGURE_FILE" ) … … 409 410 file( GLOB RT_DLL ${dll_pattern} ) 410 411 list( APPEND RT_DLL ${LAPACK_LIBRARIES} ) 411 foreach( dll lib clapack.dll libcblas.dll libboost_filesystem.dll libboost_system.dll)412 foreach( dll libboost_filesystem.dll libboost_system.dll) 412 413 list( APPEND RT_DLL "${TOL_EXTERNAL_PREFIX}/lib/${dll}" ) 413 414 endforeach( ) 414 415 list( GET RT_DLL 0 rt_dll0) 415 416 get_filename_component( name_rt_dll0 ${rt_dll0} NAME ) 417 message( "OJO ${CMAKE_INSTALL_PREFIX}/bin/${name_rt_dll0}") 416 418 if( NOT EXISTS "${CMAKE_INSTALL_PREFIX}/bin/${name_rt_dll0}" ) 417 419 file( INSTALL ${RT_DLL} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" ) -
tol/cmake/mingw-m64.toolchain.cmake
ra42cfe4 r05325a3 1 1 set(CMAKE_SYSTEM_NAME Windows) 2 2 3 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -mno-align-double"CACHE STRING "c++ flags" )4 set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -mno-align-double"CACHE STRING "c flags" )5 set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb" CACHE STRING "c++ flags in Debug" )6 set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb"CACHE STRING "c flags in Debug" )7 set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2"CACHE STRING "c++ flags in Release" )8 set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2"CACHE STRING "c flags in Release" )9 set( LINKER_SHARED_FLAGS "${LINKER_SHARED_FLAGS} -m64"CACHE STRING "linker flags" )3 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -mno-align-double" CACHE STRING "c++ flags" ) 4 set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -mno-align-double" CACHE STRING "c flags" ) 5 set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -m64 -O0 -ggdb -mno-align-double" CACHE STRING "c++ flags in Debug" ) 6 set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -m64 -O0 -ggdb -mno-align-double" CACHE STRING "c flags in Debug" ) 7 set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -m64 -O2 -mno-align-double" CACHE STRING "c++ flags in Release" ) 8 set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -m64 -O2 -mno-align-double" CACHE STRING "c flags in Release" ) 9 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m64" CACHE STRING "linker flags" ) -
tol/cmake/modules/FindCLAPACK.cmake
ra42cfe4 r05325a3 49 49 check_library_exists( "${CLAPACK_LIBRARY}" ${CLAPACK_NAME}_dpotrf "" FOUND_CLAPACK_DPOTRF ) 50 50 if( NOT FOUND_CLAPACK_DPOTRF ) 51 message( FATAL_ERROR"Could not find cblas_dtrsm in ${CLAPACK_LIBRARY}, take a look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. You most likely have to set CLAPACK_LIBRARY by hand (i.e. -DLAPACK_LIBRARY='/path/to/libclapack.so') !" )51 message( WARNING "Could not find cblas_dtrsm in ${CLAPACK_LIBRARY}, take a look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. You most likely have to set CLAPACK_LIBRARY by hand (i.e. -DLAPACK_LIBRARY='/path/to/libclapack.so') !" ) 52 52 endif( NOT FOUND_CLAPACK_DPOTRF ) 53 53 endif( CLAPACK_FOUND ) -
tol/contrib/cint/tolCint.cpp
ra42cfe4 r05325a3 406 406 } 407 407 408 #ifdef COMPILE_CINT_FUNCTIONS 408 409 //-------------------------------------------------------------------- 409 410 DeclareContensClass(BDat, BDatTemporary, BDatCint_SetCINTSYSDIR); … … 763 764 } 764 765 766 #endif
Note: See TracChangeset
for help on using the changeset viewer.
