File tree Expand file tree Collapse file tree 4 files changed +8
-6
lines changed
Expand file tree Collapse file tree 4 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -150,7 +150,7 @@ option(HIPO "Build HIPO" OFF)
150150message (STATUS "Build HIPO: ${HIPO} " )
151151option (BUILD_OPENBLAS "Build OpenBLAS" OFF )
152152message (STATUS "Build OpenBLAS: ${BUILD_OPENBLAS} " )
153- option (OPENBLAS_WIN_32 "Build 32bit OpenBLAS on Windows " OFF )
153+ option (OPENBLAS_32 "Build 32-bit OpenBLAS" OFF )
154154
155155if (HIPO AND CSHARP)
156156 message (ERROR "HIPO is only available in C++. Not yet supported in C#." )
Original file line number Diff line number Diff line change @@ -22,6 +22,7 @@ if (BUILD_OPENBLAS)
2222 if (CMAKE_SIZEOF_VOID_P EQUAL 4)
2323 message (STATUS "ARM architecture detected. Applying -DTARGET=ARMV7." )
2424 list (APPEND OPENBLAS_MINIMAL_FLAGS -DTARGET=ARMV7)
25+ set (SKIP_PARSE_GETARCH TRUE )
2526 else ()
2627 message (STATUS "ARM architecture detected. Applying -DTARGET=ARMV8." )
2728 list (APPEND OPENBLAS_MINIMAL_FLAGS -DTARGET=ARMV8)
@@ -31,10 +32,11 @@ if (BUILD_OPENBLAS)
3132 # CMAKE_SIZEOF_VOID_P is 4 for 32-bit builds, 8 for 64-bit builds.
3233 if (WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
3334 message (STATUS "32-bit target detected. Applying 32-bit configuration flags for OpenBLAS." )
35+ set (OPENBLAS_32 ON )
3436
35- set (OPENBLAS_WIN_32 ON )
36-
37- list ( APPEND OPENBLAS_MINIMAL_FLAGS -DCMAKE_GENERATOR_PLATFORM= Win32 )
37+ if ( WIN32 )
38+ list ( APPEND OPENBLAS_MINIMAL_FLAGS -DCMAKE_GENERATOR_PLATFORM= Win32 )
39+ endif ( )
3840
3941 # Crucial for static linking: Force OpenBLAS to use the static runtime
4042 if (NOT BUILD_SHARED_LIBS )
Original file line number Diff line number Diff line change 1313#cmakedefine HIGHS_HAVE_BUILTIN_CLZ
1414#cmakedefine HIGHS_HAVE_BITSCAN_REVERSE
1515#cmakedefine BLAS_LIBRARIES "@BLAS_LIBRARIES@"
16- #cmakedefine OPENBLAS_WIN_32
16+ #cmakedefine OPENBLAS_32
1717
1818
1919#define HIGHS_GITHASH "@GITHASH@"
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ IntegerModel getBlasIntegerModel() {
3232 const float X[3 ] = {1 .0f , 2 .0f , 3 .0f };
3333
3434 // Check windows
35- #ifndef OPENBLAS_WIN_32
35+ #ifndef OPENBLAS_32
3636 blas_model = IntegerModel::lp32;
3737#else
3838
You can’t perform that action at this time.
0 commit comments