1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
| | diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4071fd..53d8df5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1338,42 +1338,43 @@ if (LINALG STREQUAL "OpenBLAS")
endif ()
# search for the OpenBLAS library
- find_library (LIBOPENBLAS
- NAMES openblas
- PATHS ${OPENBLASROOT}
- PATH_SUFFIXES lib
- NO_DEFAULT_PATH)
-
- if (NOT LIBOPENBLAS)
- message (FATAL_ERROR
- "OpenBLAS library not found, please check that "
- "the OPENBLASROOT variable is set and points to "
- "a valid OpenBLAS installation directory."
- )
- endif ()
-
- # here we check if LIBOPENBLAS has changed after it was processed
- # succesfully, if not we do not need to rerun anything here.
- if (NOT LIBOPENBLAS STREQUAL LIBOPENBLAS_LAST)
- # check if the OpenBLAS library contains LAPACK functionality
- message ("-- Checking OpenBLAS for LAPACK functionality...")
- include(CheckFortranFunctionExists)
- set (CMAKE_REQUIRED_LIBRARIES ${LIBOPENBLAS})
- unset (OPENBLAS_WITH_LAPACK CACHE)
- check_fortran_function_exists("dsyev" OPENBLAS_WITH_LAPACK)
- if (NOT OPENBLAS_WITH_LAPACK)
- unset (LIBOPENBLAS CACHE)
- message (FATAL_ERROR
- "LAPACK functionality missing from OpenBLAS library, "
- "please build OpenBLAS with NO_LAPACK=0 defined."
- )
- endif ()
- # save the last location to check if it changed between configurations
- set (LIBOPENBLAS_LAST ${LIBOPENBLAS} CACHE INTERNAL "last value." FORCE)
- endif ()
-
- add_definitions (-D_OPENBLAS_)
- set (LINALG_LIBRARIES ${LIBOPENBLAS})
+# find_library (LIBOPENBLAS
+# NAMES openblas
+# PATHS ${OPENBLASROOT}
+# PATH_SUFFIXES lib
+# NO_DEFAULT_PATH)
+#
+# if (NOT LIBOPENBLAS)
+# message (FATAL_ERROR
+# "OpenBLAS library not found, please check that "
+# "the OPENBLASROOT variable is set and points to "
+# "a valid OpenBLAS installation directory."
+# )
+# endif ()
+#
+# # here we check if LIBOPENBLAS has changed after it was processed
+# # succesfully, if not we do not need to rerun anything here.
+# if (NOT LIBOPENBLAS STREQUAL LIBOPENBLAS_LAST)
+# # check if the OpenBLAS library contains LAPACK functionality
+# message ("-- Checking OpenBLAS for LAPACK functionality...")
+# include(CheckFortranFunctionExists)
+# set (CMAKE_REQUIRED_LIBRARIES ${LIBOPENBLAS})
+# unset (OPENBLAS_WITH_LAPACK CACHE)
+# check_fortran_function_exists("dsyev" OPENBLAS_WITH_LAPACK)
+# if (NOT OPENBLAS_WITH_LAPACK)
+# unset (LIBOPENBLAS CACHE)
+# message (FATAL_ERROR
+# "LAPACK functionality missing from OpenBLAS library, "
+# "please build OpenBLAS with NO_LAPACK=0 defined."
+# )
+# endif ()
+# # save the last location to check if it changed between configurations
+# set (LIBOPENBLAS_LAST ${LIBOPENBLAS} CACHE INTERNAL "last value." FORCE)
+# endif ()
+#
+ add_definitions (-D_OPENBLAS_)
+# set (LINALG_LIBRARIES ${LIBOPENBLAS})
+ set (LINALG_LIBRARIES ${LINALG_LIBRARIES})
else ()
mark_as_advanced(FORCE OPENBLASROOT)
endif ()
@@ -3167,11 +3168,11 @@ install (PROGRAMS
if (DEFINED PYMOLCAS_TARGET)
install (PROGRAMS
${PYMOLCAS_TARGET}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/sbin
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
RENAME pymolcas
)
- install (CODE "execute_process(COMMAND ${OPENMOLCAS_DIR}/sbin/install_pymolcas.sh ${PYMOLCAS_TARGET})")
+# install (CODE "execute_process(COMMAND ${OPENMOLCAS_DIR}/sbin/install_pymolcas.sh ${PYMOLCAS_TARGET})")
endif ()
if (DEFINED EXTRA_DIR)
@@ -3188,9 +3189,9 @@ if (DEFINED EXTRA_DIR)
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
)
- install (CODE "execute_process(COMMAND ${OPENMOLCAS_DIR}/sbin/install_driver.sh ${MOLCAS_DRIVER})")
+# install (CODE "execute_process(COMMAND ${OPENMOLCAS_DIR}/sbin/install_driver.sh ${MOLCAS_DRIVER})")
endif ()
-if (IS_DIRECTORY "$ENV{HOME}/.Molcas")
- install (CODE "execute_process(COMMAND sh \"-c\" \"cd ${CMAKE_INSTALL_PREFIX}; echo `pwd` > $HOME/.Molcas/molcas 2> /dev/null\")")
-endif ()
+#if (IS_DIRECTORY "$ENV{HOME}/.Molcas")
+# install (CODE "execute_process(COMMAND sh \"-c\" \"cd ${CMAKE_INSTALL_PREFIX}; echo `pwd` > $HOME/.Molcas/molcas 2> /dev/null\")")
+#endif ()
diff --git a/Tools/pymolcas/CMakeLists.txt b/Tools/pymolcas/CMakeLists.txt
index 0d576fa..f9ba6d7 100644
--- a/Tools/pymolcas/CMakeLists.txt
+++ b/Tools/pymolcas/CMakeLists.txt
@@ -52,9 +52,9 @@ if (PYTHONINTERP_FOUND)
DEPENDS ${PYMOLCAS_TARGET}
)
- add_custom_command (TARGET pymolcas
- POST_BUILD
- COMMAND ${OPENMOLCAS_DIR}/sbin/install_pymolcas.sh ${PYMOLCAS_TARGET}
- )
+# add_custom_command (TARGET pymolcas
+# POST_BUILD
+# COMMAND ${OPENMOLCAS_DIR}/sbin/install_pymolcas.sh ${PYMOLCAS_TARGET}
+# )
endif ()
|