floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added check for MSVC before enabling fortran. 

Currently forcing gfortran, instead of assuming ifort.
This commit is contained in:
Hank Anderson 2015-02-24 14:31:45 -06:00
parent a8002b0c5f
commit 504cdb10ed
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -9,7 +9,6 @@ set(OpenBLAS_MINOR_VERSION 2)
set(OpenBLAS_PATCH_VERSION 13) set(OpenBLAS_PATCH_VERSION 13)
set(OpenBLAS_VERSION "${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.${OpenBLAS_PATCH_VERSION}") set(OpenBLAS_VERSION "${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.${OpenBLAS_PATCH_VERSION}")
enable_language(Fortran)
enable_language(ASM) enable_language(ASM)
message(WARNING "CMake support is experimental. This will not produce the same Makefiles that OpenBLAS ships with. Only x86 support is currently available.") message(WARNING "CMake support is experimental. This will not produce the same Makefiles that OpenBLAS ships with. Only x86 support is currently available.")

7
cmake/f_check.cmake
View File

@ -20,6 +20,13 @@
# NEEDBUNDERSCORE # NEEDBUNDERSCORE
# NEED2UNDERSCORES # NEED2UNDERSCORES
if (MSVC)
# had to do this for MSVC, else CMake automatically assumes I have ifort... -hpa
include(CMakeForceCompiler)
CMAKE_FORCE_Fortran_COMPILER(gfortran GNU)
endif ()
enable_language(Fortran)
if (NOT ONLY_CBLAS) if (NOT ONLY_CBLAS)
# N.B. f_check is not cross-platform, so instead try to use CMake variables # N.B. f_check is not cross-platform, so instead try to use CMake variables
# run f_check (appends to TARGET files) # run f_check (appends to TARGET files)