Skip to content

Commit f919ec4

Browse files
committed
fix cmake windows blas lookup
1 parent 3938ce1 commit f919ec4

File tree

3 files changed

+40
-8
lines changed

3 files changed

+40
-8
lines changed

HiGHS.sln

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.5.2.0
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Highs", "nuget\Highs.csproj", "{906CCF22-9F98-849C-F4C4-760DF67E239A}"
6+
EndProject
7+
Global
8+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9+
Debug|Any CPU = Debug|Any CPU
10+
Release|Any CPU = Release|Any CPU
11+
EndGlobalSection
12+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13+
{906CCF22-9F98-849C-F4C4-760DF67E239A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14+
{906CCF22-9F98-849C-F4C4-760DF67E239A}.Debug|Any CPU.Build.0 = Debug|Any CPU
15+
{906CCF22-9F98-849C-F4C4-760DF67E239A}.Release|Any CPU.ActiveCfg = Release|Any CPU
16+
{906CCF22-9F98-849C-F4C4-760DF67E239A}.Release|Any CPU.Build.0 = Release|Any CPU
17+
EndGlobalSection
18+
GlobalSection(SolutionProperties) = preSolution
19+
HideSolutionNode = FALSE
20+
EndGlobalSection
21+
GlobalSection(ExtensibilityGlobals) = postSolution
22+
SolutionGuid = {6E7574DF-1DA9-4376-9391-CD823C5D98FC}
23+
EndGlobalSection
24+
EndGlobal

cmake/FindHipoDeps.cmake

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,22 @@ if (WIN32)
99
find_package(OpenBLAS CONFIG NO_DEFAULT_PATH)
1010

1111
if(OpenBLAS_FOUND)
12-
message(STATUS "OpenBLAS CMake config path: ${metis_DIR}")
13-
else()
14-
find_package(OpenBLAS CONFIG REQUIRED)
15-
if(OpenBLAS_FOUND)
16-
message(STATUS "OpenBLAS CMake config path: ${metis_DIR}")
12+
message(STATUS "OpenBLAS CMake config path: ${OpenBLAS_DIR}")
13+
endif()
14+
endif()
15+
if ((BLAS_ROOT STREQUAL "") OR (NOT OpenBLAS_Found))
16+
find_package(OpenBLAS CONFIG REQUIRED)
17+
18+
if(OpenBLAS_FOUND)
19+
if(TARGET OpenBLAS::OpenBLAS)
20+
message(STATUS "OpenBLAS CMake config path: ${OpenBLAS_DIR}")
21+
elseif(OPENBLAS_LIB)
22+
message(STATUS "Linking against OpenBLAS via raw library: ${OPENBLAS_LIB}")
1723
endif()
24+
else()
25+
message(FATAL_ERROR "No BLAS library found")
1826
endif()
19-
message(STATUS "OpenBLAS CMake config path: ${OpenBLAS_DIR}")
27+
endif()
2028
elseif(NOT APPLE)
2129
# LINUX
2230

highs/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ else()
193193

194194
if(TARGET OpenBLAS::OpenBLAS)
195195
target_link_libraries(highs PRIVATE OpenBLAS::OpenBLAS)
196-
elseif(DEFINED OPENBLAS_LIB)
196+
elseif(OPENBLAS_LIB)
197197
message(STATUS "Linking against OpenBLAS via raw library: ${OPENBLAS_LIB}")
198198
target_link_libraries(highs PRIVATE ${OPENBLAS_LIB})
199199
target_include_directories(highs PRIVATE ${OPENBLAS_INCLUDE_DIR})
@@ -202,7 +202,7 @@ else()
202202
endif()
203203

204204
target_compile_definitions(highs PRIVATE HIPO_USES_OPENBLAS)
205-
else()
205+
else()
206206
# LINUX
207207
if(BLAS_LIB)
208208
target_link_libraries(highs "${BLAS_LIB}")

0 commit comments

Comments
 (0)