mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 06:29:01 +08:00
47d206e149
* [many ports] improve compatibility with WSL and mixed case filesystems * [treehopper] express dependency on libusb, which was not working on non-win32 platforms and is still broken there * [libharu] add compatibility with non-win32 platforms * [geogram] fix openblas on linux [clapack] better integration with linux environment [visit-struct] put cmake config file in the expected folder [geogram] remove trailing underscore to enable compatibility with OpenBLAS * [openblas] playing with underscore, without success * [openblas/lapack] fix library integration * [clapack] improve target handling in cmake module * [openblas] promote self-generated config to default cmake module, otherwise internal ones thinks wrongly that openblas can also solve lapack libs * [clapack,openblas] improve libraries integration * [many ports] fix cmake unnecessary target paths, wrong config paths, empty default dependencies, unnecessary [core] tags * [suitesparse] improve integration with new lapack/openblas mechanism * [suitesparse] add no underscore postfix also for linux * [ceres] fix integration with newer openblas/lapack configs * [aws-c-event-stream] fix regression * [systemc] fix regression * [libwebp,geogram] trigger rebuild * [libwebp,pthread4w] fix regressions * [glbinding] fix cmake module installation * [globjects] disentangle unnecessary dependency from qt5 * [jasper] remove broken and unnecessary patches * [libwebp] fix regression * [many ports] avoid using BUILD_SHARED_LIBS which is uninitialized in port files * [clapack] correctly find dlls * [clapack] use a generic blas as dependency * [fizz,g2o] restore expected version * fix mistake * [many ports] remove WIN32, APPLE and UNIX (again, they keep creeping in) from ports since they are broken and usually break non-win32 ports * [libressl,openssl] do not try to build one if the other is already installed * [itk] update ref and patch to avoid regression * [libressl,openssl] implement full strategy to fix CI * [libwebp] disable components that are broken on macOS * [ogre] enable macOS build * [freeimage,jxrlib,ogre,openexr,protobuf] port patches from #5169 * [ogre] add missing install command * [ffmpeg] enable wrapper for cmake module * [ffmpeg] add avresample module finder * [ffmpeg] improve module detection and exported symbols * [ffmpeg] add variables to cache * [thrift] remove unnecessary build option * [allegro5] fix shared/static inversion * [protobuf] cleanup * [libressl] cleanup * [moos-core] cleanup * commented features must not be separated from other features, otherwise vcpkg complains * [itk] fix regression * [shogun,itk] fix regressions * [ogre] fix regression * [opusfile] add compatibility with non-win32 * [itk] fix regression * [sndfile,libsndfile] remove duplicate, redirect sndfile to libsndfile * add missing dependencies * [ismrmrd] fix regression * [ffmpeg] trigger rebuild * [clapack,openblas,libogg] fix regressions on macOS * [libtins] fix regression * force rebuild windows regressions, unable to reproduce locally * [mosquitto] enable non-win32 builds * [json-dto] force rebuild, unable to reproduce regression locally * [many ports] uniform naming and path length requests * fix regression * fix regression * [ffmpeg] fixes for downstream projects * clean up - thanks to reviewers * trigger rebuild of regressions on macOS * trigger rebuild of regressions on macOS - part2 * Add core back * Use VCPKG_CONCURRENCY * Add core back to suitesparse * Add core back to curl * Add core back to magnum * Add core back to magnum * Add core back to magnum * Add core back to cgal
78 lines
2.7 KiB
Diff
78 lines
2.7 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 320ccc6..414ac8e 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1,7 +1,6 @@
|
|
cmake_minimum_required(VERSION 2.6)
|
|
project(CLAPACK C)
|
|
-enable_testing()
|
|
-include(CTest)
|
|
+find_package(BLAS REQUIRED)
|
|
|
|
if(WIN32 AND NOT CYGWIN)
|
|
set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/winsecond.c)
|
|
@@ -11,7 +10,6 @@ else()
|
|
set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/second.c)
|
|
set(DSECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/dsecnd.c)
|
|
endif()
|
|
-enable_testing()
|
|
option(USE_BLAS_WRAP "pre-pend f2c_ to each function in blas" OFF)
|
|
if(NOT USE_BLAS_WRAP)
|
|
# _zrotg_ seems to be missing in the wrap header
|
|
@@ -19,16 +17,15 @@ if(NOT USE_BLAS_WRAP)
|
|
endif()
|
|
include_directories(${CLAPACK_SOURCE_DIR}/INCLUDE)
|
|
add_subdirectory(F2CLIBS)
|
|
-add_subdirectory(BLAS)
|
|
add_subdirectory(SRC)
|
|
-add_subdirectory(TESTING)
|
|
set(CLAPACK_VERSION 3.2.1)
|
|
-set(CPACK_PACKAGE_VERSION_MAJOR 3)
|
|
-set(CPACK_PACKAGE_VERSION_MINOR 2)
|
|
-set(CPACK_PACKAGE_VERSION_PATCH 1)
|
|
-include(CPack)
|
|
-export(TARGETS f2c blas lapack FILE clapack-targets.cmake)
|
|
+export(TARGETS f2c lapack FILE ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-targets.cmake)
|
|
configure_file(${CLAPACK_SOURCE_DIR}/clapack-config-version.cmake.in
|
|
- ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY)
|
|
+ ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-config-version.cmake @ONLY)
|
|
configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in
|
|
- ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY)
|
|
+ ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-config.cmake @ONLY)
|
|
+install(FILES
|
|
+ ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/clapack.h
|
|
+ ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/f2c.h
|
|
+ DESTINATION include)
|
|
+
|
|
diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt
|
|
index 43d7b3f..6fa3598 100644
|
|
--- a/F2CLIBS/libf2c/CMakeLists.txt
|
|
+++ b/F2CLIBS/libf2c/CMakeLists.txt
|
|
@@ -60,3 +60,11 @@ include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c)
|
|
include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c)
|
|
add_library(f2c ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h)
|
|
set_property(TARGET f2c PROPERTY PREFIX lib)
|
|
+if(UNIX)
|
|
+ target_link_libraries(f2c m)
|
|
+endif()
|
|
+install(TARGETS f2c
|
|
+ RUNTIME DESTINATION bin
|
|
+ LIBRARY DESTINATION lib
|
|
+ ARCHIVE DESTINATION lib)
|
|
+
|
|
diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
|
|
index ac4cce3..07dc8c7 100644
|
|
--- a/SRC/CMakeLists.txt
|
|
+++ b/SRC/CMakeLists.txt
|
|
@@ -376,5 +376,9 @@ if(BUILD_COMPLEX16)
|
|
set(ALLOBJ ${ZLASRC} ${ALLAUX} ${DZLAUX})
|
|
endif()
|
|
add_library(lapack ${ALLOBJ} ${ALLXOBJ})
|
|
-target_link_libraries(lapack blas)
|
|
+target_link_libraries(lapack ${BLAS_LIBRARIES} f2c)
|
|
+install(TARGETS lapack
|
|
+ RUNTIME DESTINATION bin
|
|
+ LIBRARY DESTINATION lib
|
|
+ ARCHIVE DESTINATION lib)
|
|
|