]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
2 | index 320ccc6..414ac8e 100644 | |
3 | --- a/CMakeLists.txt | |
4 | +++ b/CMakeLists.txt | |
5 | @@ -1,7 +1,6 @@ | |
6 | cmake_minimum_required(VERSION 2.6) | |
7 | project(CLAPACK C) | |
8 | -enable_testing() | |
9 | -include(CTest) | |
10 | +find_package(BLAS REQUIRED) | |
11 | ||
12 | if(WIN32 AND NOT CYGWIN) | |
13 | set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/winsecond.c) | |
14 | @@ -11,7 +10,6 @@ else() | |
15 | set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/second.c) | |
16 | set(DSECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/dsecnd.c) | |
17 | endif() | |
18 | -enable_testing() | |
19 | option(USE_BLAS_WRAP "pre-pend f2c_ to each function in blas" OFF) | |
20 | if(NOT USE_BLAS_WRAP) | |
21 | # _zrotg_ seems to be missing in the wrap header | |
22 | @@ -19,16 +17,15 @@ if(NOT USE_BLAS_WRAP) | |
23 | endif() | |
24 | include_directories(${CLAPACK_SOURCE_DIR}/INCLUDE) | |
25 | add_subdirectory(F2CLIBS) | |
26 | -add_subdirectory(BLAS) | |
27 | add_subdirectory(SRC) | |
28 | -add_subdirectory(TESTING) | |
29 | set(CLAPACK_VERSION 3.2.1) | |
30 | -set(CPACK_PACKAGE_VERSION_MAJOR 3) | |
31 | -set(CPACK_PACKAGE_VERSION_MINOR 2) | |
32 | -set(CPACK_PACKAGE_VERSION_PATCH 1) | |
33 | -include(CPack) | |
34 | -export(TARGETS f2c blas lapack FILE clapack-targets.cmake) | |
35 | +export(TARGETS f2c lapack FILE ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-targets.cmake) | |
36 | configure_file(${CLAPACK_SOURCE_DIR}/clapack-config-version.cmake.in | |
37 | - ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY) | |
38 | + ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-config-version.cmake @ONLY) | |
39 | configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in | |
40 | - ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY) | |
41 | + ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-config.cmake @ONLY) | |
42 | +install(FILES | |
43 | + ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/clapack.h | |
44 | + ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/f2c.h | |
45 | + DESTINATION include) | |
46 | + | |
47 | diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt | |
48 | index 43d7b3f..6fa3598 100644 | |
49 | --- a/F2CLIBS/libf2c/CMakeLists.txt | |
50 | +++ b/F2CLIBS/libf2c/CMakeLists.txt | |
51 | @@ -60,3 +60,11 @@ include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c) | |
52 | include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c) | |
53 | add_library(f2c ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h) | |
54 | set_property(TARGET f2c PROPERTY PREFIX lib) | |
55 | +if(UNIX) | |
56 | + target_link_libraries(f2c m) | |
57 | +endif() | |
58 | +install(TARGETS f2c | |
59 | + RUNTIME DESTINATION bin | |
60 | + LIBRARY DESTINATION lib | |
61 | + ARCHIVE DESTINATION lib) | |
62 | + | |
63 | diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt | |
64 | index ac4cce3..07dc8c7 100644 | |
65 | --- a/SRC/CMakeLists.txt | |
66 | +++ b/SRC/CMakeLists.txt | |
67 | @@ -376,5 +376,9 @@ if(BUILD_COMPLEX16) | |
68 | set(ALLOBJ ${ZLASRC} ${ALLAUX} ${DZLAUX}) | |
69 | endif() | |
70 | add_library(lapack ${ALLOBJ} ${ALLXOBJ}) | |
71 | -target_link_libraries(lapack blas) | |
72 | +target_link_libraries(lapack ${BLAS_LIBRARIES} f2c) | |
73 | +install(TARGETS lapack | |
74 | + RUNTIME DESTINATION bin | |
75 | + LIBRARY DESTINATION lib | |
76 | + ARCHIVE DESTINATION lib) | |
77 |