diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-09-04 18:59:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 18:59:21 -0700 |
| commit | bb61fc16628994678ee3855008972a28797ba5a7 (patch) | |
| tree | 419d508bdf29a0edd04976e9ece7f8aa43e332b8 /ports/lapack-reference/FindLAPACK.cmake | |
| parent | c41328a87c1436820f9e3dd2c970d407de52eaf7 (diff) | |
| download | vcpkg-bb61fc16628994678ee3855008972a28797ba5a7.tar.gz vcpkg-bb61fc16628994678ee3855008972a28797ba5a7.zip | |
[blaze][ceres][clapack][geogram][lapack][lapack-reference][opencv4][selene] Fix deps issues (#13229)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/lapack-reference/FindLAPACK.cmake')
| -rw-r--r-- | ports/lapack-reference/FindLAPACK.cmake | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/ports/lapack-reference/FindLAPACK.cmake b/ports/lapack-reference/FindLAPACK.cmake index b6df00319..a411c7c18 100644 --- a/ports/lapack-reference/FindLAPACK.cmake +++ b/ports/lapack-reference/FindLAPACK.cmake @@ -86,6 +86,7 @@ This module defines the following variables: find_package(LAPACK)
#]=======================================================================]
+enable_language(C)
# Check the language being used
if(NOT (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED OR CMAKE_Fortran_COMPILER_LOADED))
if(LAPACK_FIND_REQUIRED)
@@ -109,20 +110,6 @@ set(CMAKE_REQUIRED_QUIET ${LAPACK_FIND_QUIETLY}) set(LAPACK_FOUND FALSE)
set(LAPACK95_FOUND FALSE)
-set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-if(BLA_STATIC)
- if(WIN32)
- set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})
- else()
- set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- endif()
-else()
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- # for ubuntu's libblas3gf and liblapack3gf packages
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} .so.3gf)
- endif()
-endif()
-
# TODO: move this stuff to a separate module
macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _addlibdir _subdirs _blas)
@@ -202,11 +189,8 @@ set(LAPACK_LINKER_FLAGS) set(LAPACK_LIBRARIES)
set(LAPACK95_LIBRARIES)
-if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
- find_package(BLAS)
-else()
- find_package(BLAS REQUIRED)
-endif()
+include(CMakeFindDependencyMacro)
+find_dependency(BLAS)
if(BLAS_FOUND)
set(LAPACK_LINKER_FLAGS ${BLAS_LINKER_FLAGS})
@@ -565,4 +549,3 @@ if(NOT TARGET LAPACK::LAPACK) endif()
cmake_pop_check_state()
-set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
|