Compare commits
340 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
5db8037248 | ||
|
1ab5d69fab | ||
|
946181a294 | ||
|
4ad1e486f5 | ||
|
372a70dc79 | ||
|
bdf3093d62 | ||
|
c9bb4a4953 | ||
|
6d388a4073 | ||
|
7ec8c694fa | ||
|
8674426d57 | ||
|
43677c13f5 | ||
|
5bf1d33bf1 | ||
|
5d587929de | ||
|
4b115b40c7 | ||
|
672b300dfb | ||
|
85ead68072 | ||
|
91d8dab882 | ||
|
8135e77c5b | ||
|
fbadbabca6 | ||
|
419924585f | ||
|
f626219c98 | ||
|
8158da8089 | ||
|
169c293f4c | ||
|
2af1671e51 | ||
|
134e994816 | ||
|
a63a3e2b71 | ||
|
a86fd237d4 | ||
|
4e79ea6773 | ||
|
50646f0efa | ||
|
77c5d42f75 | ||
|
8b4138a684 | ||
|
aa9db08f96 | ||
|
645a99bedd | ||
|
cfff94149b | ||
|
01c03f182c | ||
|
d0248a96bf | ||
|
f076d38e5e | ||
|
7aedef19dd | ||
|
d9eb0a48bf | ||
|
302877f5c5 | ||
|
5cea73e323 | ||
|
fb41c005d8 | ||
|
f8c1c1d47b | ||
|
422d920ec7 | ||
|
e5db548e34 | ||
|
1bb4a5c968 | ||
|
0d9eb67fed | ||
|
1f31468bbd | ||
|
278c697be5 | ||
|
3e504e7796 | ||
|
95a62478f6 | ||
|
48dc69cf14 | ||
|
544f6b7bd0 | ||
|
b9f551dc1f | ||
|
202d11b3d1 | ||
|
062da0a4bf | ||
|
f48eae3697 | ||
|
c563351e5c | ||
|
d22a0444ec | ||
|
8d55c35ecb | ||
|
25f9bed0bb | ||
|
6158d7b92a | ||
|
3060a641bf | ||
|
3546dfaf75 | ||
|
3648c4d8a2 | ||
|
36cafa45d7 | ||
|
d673630857 | ||
|
cbd95056bc | ||
|
3c38508291 | ||
|
453d15e9a8 | ||
|
95616513c5 | ||
|
61a4234484 | ||
|
f36d7d2cd1 | ||
|
7e7cc590d0 | ||
|
7fbdb8f125 | ||
|
214ee01016 | ||
|
f46ed72703 | ||
|
6bbe38cafa | ||
|
af45ad89da | ||
|
e2928d0221 | ||
|
4b5b373342 | ||
|
fe93f70436 | ||
|
5d34009bff | ||
|
257d63bdb5 | ||
|
c1e32402ca | ||
|
db6908d732 | ||
|
ef8ba40653 | ||
|
7d590fe7b7 | ||
|
2e36fff9d3 | ||
|
59c1321d9d | ||
|
f73c5d508b | ||
|
6f2725ff7d | ||
|
0f4ea95b94 | ||
|
ace5c671f7 | ||
|
2c777f0b44 | ||
|
6c45a46353 | ||
|
61dcfd1293 | ||
|
97ec277724 | ||
|
cb4461c86c | ||
|
d9aab735e2 | ||
|
5e5002b437 | ||
|
d6f349f50a | ||
|
923181cba4 | ||
|
dada3cb546 | ||
|
2aa00279a6 | ||
|
dbbf2b62d9 | ||
|
de2a36b648 | ||
|
8ed1da6e7f | ||
|
1769f1e84e | ||
|
b6221b537f | ||
|
8f07396a82 | ||
|
18f7a632ed | ||
|
807c1a2de6 | ||
|
e0b59b2512 | ||
|
deed0a56c7 | ||
|
fe6880366b | ||
|
5a3317177d | ||
|
4b3510c3d9 | ||
|
ad455e5e72 | ||
|
45a4213d84 | ||
|
eaad71490d | ||
|
e56b7c3eaf | ||
|
01dbb03e4b | ||
|
f62ee9a360 | ||
|
ad0e43afe6 | ||
|
0953dfa2a7 | ||
|
0f3e93bcc7 | ||
|
e1bc4a625e | ||
|
68ba4859ac | ||
|
b3b1c52494 | ||
|
b77aeb5b46 | ||
|
9f464cfeb1 | ||
|
51cbbee01a | ||
|
df5452a402 | ||
|
e368746a2b | ||
|
58fa2e5bc4 | ||
|
57338c141a | ||
|
ba9c9d5ef5 | ||
|
3c11a43a0c | ||
|
8983c63ac8 | ||
|
e0724780f7 | ||
|
a61d5cd9ee | ||
|
7ad9a9f7bc | ||
|
7b73d7e32a | ||
|
45340ec01a | ||
|
15cab722e0 | ||
|
70f3c6ff8e | ||
|
4ff8fb2424 | ||
|
f0f9298328 | ||
|
bb8fb23fed | ||
|
6209eeaac2 | ||
|
7cb318c85b | ||
|
4dec04629a | ||
|
aeac6869c0 | ||
|
907e555cfa | ||
|
1e56cb0b9c | ||
|
fde64f334b | ||
|
b4054d50df | ||
|
c42191b46a | ||
|
cd2a406fbd | ||
|
434fe8b1c8 | ||
|
10f83bc2fc | ||
|
7d43ac2123 | ||
|
ad9039f02b | ||
|
b0e468af57 | ||
|
d1e8a9ef63 | ||
|
ef2992de5f | ||
|
892d022be2 | ||
|
389edecb94 | ||
|
72fa0d4948 | ||
|
60fdc9ca73 | ||
|
3e5e7a4aee | ||
|
9338710aca | ||
|
10e7a4e0f4 | ||
|
8f3879e81d | ||
|
72646fef46 | ||
|
ad2cd5b89b | ||
|
aebd6dde35 | ||
|
2ab55113c8 | ||
|
3f7549751e | ||
|
3e0543c73f | ||
|
e6cfdefbc5 | ||
|
8e2a2daaf8 | ||
|
72da9d7a8d | ||
|
265612192c | ||
|
4bc00a18ff | ||
|
c50f25796e | ||
|
62d0f3cc32 | ||
|
23958a5bb4 | ||
|
01775a1307 | ||
|
61e3e8f15d | ||
|
82b4873ab4 | ||
|
a297e21a36 | ||
|
3c531e141a | ||
|
4f3147d1f4 | ||
|
305eda7637 | ||
|
5e0ae9df7c | ||
|
bf26fed88d | ||
|
3476b700ee | ||
|
3bac96b089 | ||
|
f6068065ea | ||
|
482644acff | ||
|
08e14f95d5 | ||
|
215439aebc | ||
|
5450a4f066 | ||
|
7d0c60e2ef | ||
|
9f00df0cc2 | ||
|
c23a7d46d0 | ||
|
ad7513ae29 | ||
|
63f81dc8f7 | ||
|
0461421929 | ||
|
d1d955e2de | ||
|
c05e6542dc | ||
|
3e7824e73e | ||
|
fde2ae1586 | ||
|
358d5037ae | ||
|
53adb49344 | ||
|
de26f88046 | ||
|
e1335d4bc5 | ||
|
026befaf78 | ||
|
a095a5694a | ||
|
d9dd44f586 | ||
|
c17782d9ef | ||
|
eff08abe86 | ||
|
55a452d7d9 | ||
|
256d595c98 | ||
|
586c872b46 | ||
|
0209ed3149 | ||
|
5c90ef161a | ||
|
4ec33b2182 | ||
|
190a49cf8c | ||
|
d2d60ad748 | ||
|
8095fd3aac | ||
|
d6aa4da9f8 | ||
|
a002bb282c | ||
|
4798c1522a | ||
|
67b46d8a5a | ||
|
f800a4a1a1 | ||
|
51dfc3fa04 | ||
|
0375260458 | ||
|
4ccb585d3f | ||
|
75771edc02 | ||
|
396dee4de0 | ||
|
4e6b717c50 | ||
|
c61fc84029 | ||
|
f091375c19 | ||
|
038fdb47c3 | ||
|
3c97440511 | ||
|
c9a8b5fe82 | ||
|
8a4fed743d | ||
|
65f7569734 | ||
|
8e153c4a5c | ||
|
bdee19cd9f | ||
|
7c34aa420c | ||
|
8856b5c221 | ||
|
b3ac9802d4 | ||
|
9a29aa1646 | ||
|
35c8f502e7 | ||
|
de493a3f77 | ||
|
ca739f559d | ||
|
1261626b3a | ||
|
cfe5d737b4 | ||
|
a10ffafd5c | ||
|
cfb60aeafe | ||
|
ad69af3eb0 | ||
|
2f03d1934f | ||
|
bc96ee0a7c | ||
|
5bff65f222 | ||
|
f4c732aafc | ||
|
a4a401c76b | ||
|
7c502cd9c9 | ||
|
1a3b67e2a7 | ||
|
976c67ca52 | ||
|
8a4e1b06b8 | ||
|
6500e56855 | ||
|
eafd6cd491 | ||
|
ea483bb34c | ||
|
9f76ff0a0e | ||
|
57c38184f6 | ||
|
e411e9f683 | ||
|
f54d18f1c1 | ||
|
b007620a21 | ||
|
300b41d728 | ||
|
8c3218e759 | ||
|
f50dce5521 | ||
|
838b94ac4a | ||
|
727224fd82 | ||
|
24519e8481 | ||
|
976bc84c13 | ||
|
32baf2a5bb | ||
|
25463ee3bb | ||
|
491914b7e0 | ||
|
74892e312d | ||
|
882bf0a996 | ||
|
cdf5b80727 | ||
|
1f8a36aeea | ||
|
e7d7e1f36e | ||
|
99566ad31d | ||
|
8aa5a69612 | ||
|
862a9416ba | ||
|
496495b0bd | ||
|
65dd936a49 | ||
|
960dc151d9 | ||
|
8b47c8b2d8 | ||
|
d1560ef06c | ||
|
1b2f353be6 | ||
|
c5a90aac0c | ||
|
0059c15daa | ||
|
05e896fc7b | ||
|
f068c62b0c | ||
|
830d0b05e0 | ||
|
8e7e28a622 | ||
|
0ad564af9c | ||
|
f5ec53abcc | ||
|
314d5f5b5d | ||
|
8059b972fd | ||
|
a96004dd80 | ||
|
d48ae7c8e0 | ||
|
2da4c96178 | ||
|
6a3c645d91 | ||
|
271af7e940 | ||
|
f97a06b336 | ||
|
345aeea69e | ||
|
2e76927bf7 | ||
|
5fd05e2453 | ||
|
f9924193e8 | ||
|
44545375b1 | ||
|
edc556d31e | ||
|
2b84e70617 | ||
|
b28dbeddc3 | ||
|
9216640ab5 | ||
|
b6d7b89251 | ||
|
5deb9f6656 | ||
|
52ebbb1916 | ||
|
301a3e914a | ||
|
c3e8dd85cf | ||
|
556b25d625 | ||
|
6971045d5f | ||
|
b185be1d55 | ||
|
21d7794e65 |
30
.gitignore
vendored
30
.gitignore
vendored
@ -1,29 +1 @@
|
||||
cmake-2.8.2.tar.gz
|
||||
/cmake-2.8.3-rc1.tar.gz
|
||||
/cmake-2.8.3-rc3.tar.gz
|
||||
/cmake-2.8.3-rc4.tar.gz
|
||||
/cmake-2.8.3.tar.gz
|
||||
/cmake-2.8.4-rc1.tar.gz
|
||||
/cmake-2.8.4-rc2.tar.gz
|
||||
/cmake-2.8.4.tar.gz
|
||||
/cmake-2.8.5-rc1.tar.gz
|
||||
/cmake-2.8.5-rc2.tar.gz
|
||||
/cmake-2.8.5-rc3.tar.gz
|
||||
/cmake-2.8.5.tar.gz
|
||||
/cmake-2.8.6-rc1.tar.gz
|
||||
/cmake-2.8.6-rc2.tar.gz
|
||||
/cmake-2.8.6-rc3.tar.gz
|
||||
/cmake-2.8.6-rc4.tar.gz
|
||||
/cmake-2.8.6.tar.gz
|
||||
/cmake-2.8.7-rc1.tar.gz
|
||||
/cmake-2.8.7-rc2.tar.gz
|
||||
/cmake-2.8.7.tar.gz
|
||||
/cmake-2.8.8-rc1.tar.gz
|
||||
/cmake-2.8.8-rc2.tar.gz
|
||||
/cmake-2.8.8.tar.gz
|
||||
/cmake-2.8.9-rc1.tar.gz
|
||||
/cmake-2.8.9-rc2.tar.gz
|
||||
/cmake-2.8.9-rc3.tar.gz
|
||||
/cmake-2.8.9.tar.gz
|
||||
/cmake-2.8.10-rc3.tar.gz
|
||||
/cmake-2.8.10.tar.gz
|
||||
/cmake-*.tar.gz
|
||||
|
25
5383.patch
Normal file
25
5383.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 23cd98a66a3eca1cc8e89a77f4fdf406c4f4c113 Mon Sep 17 00:00:00 2001
|
||||
From: Marc Chevrier <marc.chevrier@gmail.com>
|
||||
Date: Fri, 16 Oct 2020 11:36:53 +0200
|
||||
Subject: [PATCH] FindPython: Add support of version 3.10
|
||||
|
||||
---
|
||||
Modules/FindPython/Support.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
|
||||
index 7de2d29946..2b911ae7e3 100644
|
||||
--- a/Modules/FindPython/Support.cmake
|
||||
+++ b/Modules/FindPython/Support.cmake
|
||||
@@ -22,7 +22,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
|
||||
message (FATAL_ERROR "FindPython: INTERNAL ERROR")
|
||||
endif()
|
||||
if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")
|
||||
- set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
+ set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2")
|
||||
set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
||||
else()
|
||||
--
|
||||
GitLab
|
||||
|
42
5482.patch
Normal file
42
5482.patch
Normal file
@ -0,0 +1,42 @@
|
||||
From bb2ebbf2412ef9343f50a45868459ffb95fa9081 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
||||
Date: Mon, 9 Nov 2020 17:35:13 +0100
|
||||
Subject: [PATCH] FindPython{Interp,Libs}: Add support for version 3.10
|
||||
|
||||
Extend the change from commit 23cd98a66a (FindPython: Add support of
|
||||
version 3.10, 2020-10-16, v3.19.0-rc2~25^2) to cover the legacy
|
||||
`FindPython{Interp,Libs}` modules too.
|
||||
---
|
||||
Modules/FindPythonInterp.cmake | 2 +-
|
||||
Modules/FindPythonLibs.cmake | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
|
||||
index 1e01a99cbe..efe0f11901 100644
|
||||
--- a/Modules/FindPythonInterp.cmake
|
||||
+++ b/Modules/FindPythonInterp.cmake
|
||||
@@ -54,7 +54,7 @@ unset(_Python_NAMES)
|
||||
|
||||
set(_PYTHON1_VERSIONS 1.6 1.5)
|
||||
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
||||
-set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
+set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
|
||||
if(PythonInterp_FIND_VERSION)
|
||||
if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
|
||||
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
|
||||
index d3ec7beec6..396f0d2ed4 100644
|
||||
--- a/Modules/FindPythonLibs.cmake
|
||||
+++ b/Modules/FindPythonLibs.cmake
|
||||
@@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
|
||||
|
||||
set(_PYTHON1_VERSIONS 1.6 1.5)
|
||||
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
||||
-set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
+set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||
|
||||
if(PythonLibs_FIND_VERSION)
|
||||
if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
|
||||
--
|
||||
GitLab
|
||||
|
69
cmake-3.18.3-findblas.patch
Normal file
69
cmake-3.18.3-findblas.patch
Normal file
@ -0,0 +1,69 @@
|
||||
diff -ur cmake-3.18.2.orig/Modules/FindBLAS.cmake cmake-3.18.2/Modules/FindBLAS.cmake
|
||||
--- cmake-3.18.2.orig/Modules/FindBLAS.cmake 2020-08-20 14:20:32.000000000 +0200
|
||||
+++ cmake-3.18.2/Modules/FindBLAS.cmake 2020-09-14 19:36:13.952349073 +0200
|
||||
@@ -27,6 +27,7 @@
|
||||
possibilities. List of vendors valid in this module:
|
||||
|
||||
* ``Goto``
|
||||
+ * ``FlexiBLAS``
|
||||
* ``OpenBLAS``
|
||||
* ``FLAME``
|
||||
* ``ATLAS PhiPACK``
|
||||
@@ -538,6 +539,22 @@
|
||||
""
|
||||
""
|
||||
""
|
||||
+ )
|
||||
+ endif()
|
||||
+endif()
|
||||
+
|
||||
+# FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/)
|
||||
+if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All")
|
||||
+ if(NOT BLAS_LIBRARIES)
|
||||
+ check_blas_libraries(
|
||||
+ BLAS_LIBRARIES
|
||||
+ BLAS
|
||||
+ sgemm
|
||||
+ ""
|
||||
+ "flexiblas"
|
||||
+ ""
|
||||
+ ""
|
||||
+ ""
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
diff -ur cmake-3.18.2.orig/Modules/FindLAPACK.cmake cmake-3.18.2/Modules/FindLAPACK.cmake
|
||||
--- cmake-3.18.2.orig/Modules/FindLAPACK.cmake 2020-08-20 14:20:32.000000000 +0200
|
||||
+++ cmake-3.18.2/Modules/FindLAPACK.cmake 2020-09-14 19:38:43.204639078 +0200
|
||||
@@ -26,6 +26,7 @@
|
||||
If set, checks only the specified vendor, if not set checks all the
|
||||
possibilities. List of vendors valid in this module:
|
||||
|
||||
+ * ``FlexiBLAS``
|
||||
* ``OpenBLAS``
|
||||
* ``FLAME``
|
||||
* ``Intel10_32`` (intel mkl v10 32 bit)
|
||||
@@ -349,6 +350,23 @@
|
||||
""
|
||||
""
|
||||
""
|
||||
+ "${BLAS_LIBRARIES}"
|
||||
+ )
|
||||
+ endif()
|
||||
+ endif()
|
||||
+
|
||||
+ # FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/)
|
||||
+ if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All")
|
||||
+ if(NOT LAPACK_LIBRARIES)
|
||||
+ check_lapack_libraries(
|
||||
+ LAPACK_LIBRARIES
|
||||
+ LAPACK
|
||||
+ cheev
|
||||
+ ""
|
||||
+ "flexiblas"
|
||||
+ ""
|
||||
+ ""
|
||||
+ ""
|
||||
"${BLAS_LIBRARIES}"
|
||||
)
|
||||
endif()
|
@ -1,163 +0,0 @@
|
||||
diff -up cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake
|
||||
--- cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql 2012-10-24 11:12:01.000000000 -0600
|
||||
+++ cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake 2012-10-24 19:49:54.189433358 -0600
|
||||
@@ -92,77 +92,99 @@ set( PostgreSQL_ROOT_DIRECTORIES
|
||||
#
|
||||
# Look for an installation.
|
||||
#
|
||||
-find_path(PostgreSQL_INCLUDE_DIR
|
||||
- NAMES libpq-fe.h
|
||||
+find_path(PostgreSQL_CONFIG_DIR
|
||||
+ NAMES pg_config
|
||||
PATHS
|
||||
# Look in other places.
|
||||
${PostgreSQL_ROOT_DIRECTORIES}
|
||||
PATH_SUFFIXES
|
||||
- pgsql
|
||||
- postgresql
|
||||
- include
|
||||
+ ""
|
||||
+ bin
|
||||
# Help the user find it if we cannot.
|
||||
- DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
|
||||
+ DOC "The ${PostgreSQL_ROOT_DIR_MESSAGE}"
|
||||
)
|
||||
|
||||
-find_path(PostgreSQL_TYPE_INCLUDE_DIR
|
||||
- NAMES catalog/pg_type.h
|
||||
- PATHS
|
||||
- # Look in other places.
|
||||
- ${PostgreSQL_ROOT_DIRECTORIES}
|
||||
- PATH_SUFFIXES
|
||||
- postgresql
|
||||
- pgsql/server
|
||||
- postgresql/server
|
||||
- include/server
|
||||
- # Help the user find it if we cannot.
|
||||
- DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
|
||||
-)
|
||||
-
|
||||
-# The PostgreSQL library.
|
||||
-set (PostgreSQL_LIBRARY_TO_FIND pq)
|
||||
-# Setting some more prefixes for the library
|
||||
-set (PostgreSQL_LIB_PREFIX "")
|
||||
-if ( WIN32 )
|
||||
- set (PostgreSQL_LIB_PREFIX ${PostgreSQL_LIB_PREFIX} "lib")
|
||||
- set ( PostgreSQL_LIBRARY_TO_FIND ${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND})
|
||||
-endif()
|
||||
+macro (fail_if)
|
||||
+ if (${ARGV})
|
||||
+ message (WARNING "Couldn't determine PostgreSQL configuration.")
|
||||
+ unset (PostgreSQL_CONFIG_DIR)
|
||||
+ break ()
|
||||
+ endif ()
|
||||
+endmacro ()
|
||||
+
|
||||
+macro (run_pg_config arg var)
|
||||
+ execute_process(COMMAND ${PostgreSQL_CONFIG_DIR}/pg_config ${arg}
|
||||
+ RESULT_VARIABLE pgsql_config_result
|
||||
+ OUTPUT_VARIABLE ${var}
|
||||
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
+
|
||||
+ fail_if (NOT ${pgsql_config_result} EQUAL 0 OR NOT ${var})
|
||||
+endmacro ()
|
||||
+
|
||||
+foreach (once only)
|
||||
+ fail_if (NOT PostgreSQL_CONFIG_DIR)
|
||||
+
|
||||
+ run_pg_config (--version PostgreSQL_VERSION_STRING)
|
||||
+ string (REGEX REPLACE "^PostgreSQL (.*)$" "\\1"
|
||||
+ PostgreSQL_VERSION_STRING "${PostgreSQL_VERSION_STRING}")
|
||||
+ fail_if (NOT PostgreSQL_VERSION_STRING)
|
||||
+
|
||||
+ run_pg_config (--includedir PostgreSQL_INCLUDE_DIR)
|
||||
+ fail_if (NOT EXISTS "${PostgreSQL_INCLUDE_DIR}/libpq-fe.h")
|
||||
+
|
||||
+ find_path(PostgreSQL_TYPE_INCLUDE_DIR
|
||||
+ NAMES catalog/pg_type.h
|
||||
+ PATHS ${PostgreSQL_INCLUDE_DIR}
|
||||
+ PATH_SUFFIXES
|
||||
+ pgsql/server
|
||||
+ postgresql/server
|
||||
+ include/server
|
||||
+ # Help the user find it if we cannot.
|
||||
+ DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
|
||||
+ )
|
||||
+ fail_if (NOT PostgreSQL_TYPE_INCLUDE_DIR)
|
||||
+
|
||||
+ set (PostgreSQL_INCLUDE_DIRS
|
||||
+ ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR})
|
||||
+
|
||||
+ run_pg_config (--libdir PostgreSQL_LIBRARY_DIRS)
|
||||
+
|
||||
+ # The PostgreSQL library.
|
||||
+ set (PostgreSQL_LIBRARY_TO_FIND pq)
|
||||
+ # Setting some more prefixes for the library
|
||||
+ set (PostgreSQL_LIB_PREFIX "")
|
||||
+ if (WIN32)
|
||||
+ set (PostgreSQL_LIB_PREFIX ${PostgreSQL_LIB_PREFIX} "lib")
|
||||
+ set (PostgreSQL_LIBRARY_TO_FIND ${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND})
|
||||
+ endif()
|
||||
+
|
||||
+ find_library (PostgreSQL_LIBRARY_FOUND
|
||||
+ NAMES ${PostgreSQL_LIBRARY_TO_FIND}
|
||||
+ PATHS ${PostgreSQL_LIBRARY_DIRS}
|
||||
+ PATH_SUFFIXES lib
|
||||
+ )
|
||||
+ fail_if (NOT PostgreSQL_LIBRARY_FOUND)
|
||||
+ set (PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND})
|
||||
|
||||
-find_library( PostgreSQL_LIBRARY
|
||||
- NAMES ${PostgreSQL_LIBRARY_TO_FIND}
|
||||
- PATHS
|
||||
- ${PostgreSQL_ROOT_DIRECTORIES}
|
||||
- PATH_SUFFIXES
|
||||
- lib
|
||||
-)
|
||||
-get_filename_component(PostgreSQL_LIBRARY_DIR ${PostgreSQL_LIBRARY} PATH)
|
||||
-
|
||||
-if (PostgreSQL_INCLUDE_DIR AND EXISTS "${PostgreSQL_INCLUDE_DIR}/pg_config.h")
|
||||
- file(STRINGS "${PostgreSQL_INCLUDE_DIR}/pg_config.h" pgsql_version_str
|
||||
- REGEX "^#define[\t ]+PG_VERSION[\t ]+\".*\"")
|
||||
-
|
||||
- string(REGEX REPLACE "^#define[\t ]+PG_VERSION[\t ]+\"([^\"]*)\".*" "\\1"
|
||||
- PostgreSQL_VERSION_STRING "${pgsql_version_str}")
|
||||
- unset(pgsql_version_str)
|
||||
-endif()
|
||||
+endforeach()
|
||||
|
||||
# Did we find anything?
|
||||
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
||||
-find_package_handle_standard_args(PostgreSQL
|
||||
- REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR
|
||||
- VERSION_VAR PostgreSQL_VERSION_STRING)
|
||||
-set( PostgreSQL_FOUND ${POSTGRESQL_FOUND})
|
||||
+include (FindPackageHandleStandardArgs)
|
||||
+find_package_handle_standard_args (PostgreSQL
|
||||
+ REQUIRED_VARS
|
||||
+ PostgreSQL_LIBRARY_DIRS
|
||||
+ PostgreSQL_CONFIG_DIR
|
||||
+ PostgreSQL_INCLUDE_DIRS
|
||||
+ PostgreSQL_LIBRARIES
|
||||
+ VERSION_VAR
|
||||
+ PostgreSQL_VERSION_STRING
|
||||
+)
|
||||
+set (PostgreSQL_FOUND ${POSTGRESQL_FOUND})
|
||||
|
||||
# Now try to get the include and library path.
|
||||
-if(PostgreSQL_FOUND)
|
||||
-
|
||||
- set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR} )
|
||||
- set(PostgreSQL_LIBRARY_DIRS ${PostgreSQL_LIBRARY_DIR} )
|
||||
- set(PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND})
|
||||
-
|
||||
- #message("Final PostgreSQL include dir: ${PostgreSQL_INCLUDE_DIRS}")
|
||||
- #message("Final PostgreSQL library dir: ${PostgreSQL_LIBRARY_DIRS}")
|
||||
- #message("Final PostgreSQL libraries: ${PostgreSQL_LIBRARIES}")
|
||||
+if (PostgreSQL_FOUND)
|
||||
+ message (STATUS "PostgreSQL include dirs: ${PostgreSQL_INCLUDE_DIRS}")
|
||||
+ message (STATUS "PostgreSQL library dirs: ${PostgreSQL_LIBRARY_DIRS}")
|
||||
+ message (STATUS "PostgreSQL libraries: ${PostgreSQL_LIBRARIES}")
|
||||
endif()
|
||||
|
||||
-mark_as_advanced(PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR PostgreSQL_LIBRARY )
|
@ -1,14 +0,0 @@
|
||||
diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx
|
||||
index 5c7414f..bd1ff71 100644
|
||||
--- a/Source/CursesDialog/cmCursesStringWidget.cxx
|
||||
+++ b/Source/CursesDialog/cmCursesStringWidget.cxx
|
||||
@@ -175,7 +175,7 @@ bool cmCursesStringWidget::HandleInput(int& key, cmCursesMainForm* fm,
|
||||
}
|
||||
else if ( key == ctrl('d') ||key == KEY_DC )
|
||||
{
|
||||
- if ( form->curcol > 0 )
|
||||
+ if ( form->curcol >= 0 )
|
||||
{
|
||||
form_driver(form, REQ_DEL_CHAR);
|
||||
}
|
||||
|
@ -1,90 +0,0 @@
|
||||
diff -up cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk cmake-2.8.6-rc1/Modules/FindDCMTK.cmake
|
||||
--- cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk 2011-08-26 10:51:46.000000000 -0600
|
||||
+++ cmake-2.8.6-rc1/Modules/FindDCMTK.cmake 2011-08-29 16:58:07.299550799 -0600
|
||||
@@ -30,6 +30,10 @@
|
||||
# Written for VXL by Amitha Perera.
|
||||
# Upgraded for GDCM by Mathieu Malaterre.
|
||||
# Modified for EasyViz by Thomas Sondergaard.
|
||||
+#
|
||||
+# Wed Jul 27 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org>
|
||||
+# - Add all dcmtk libs
|
||||
+# - Add usr/lib to paths
|
||||
#
|
||||
|
||||
if(NOT DCMTK_FOUND AND NOT DCMTK_DIR)
|
||||
@@ -44,20 +48,26 @@ endif()
|
||||
|
||||
foreach(lib
|
||||
dcmdata
|
||||
+ dcmdsig
|
||||
dcmimage
|
||||
dcmimgle
|
||||
dcmjpeg
|
||||
+ dcmjpls
|
||||
dcmnet
|
||||
dcmpstat
|
||||
dcmqrdb
|
||||
- dcmsign
|
||||
dcmsr
|
||||
dcmtls
|
||||
+ dcmwlm
|
||||
ijg12
|
||||
ijg16
|
||||
ijg8
|
||||
+ libi2d
|
||||
+ oflog
|
||||
ofstd)
|
||||
|
||||
+
|
||||
+
|
||||
find_library(DCMTK_${lib}_LIBRARY
|
||||
${lib}
|
||||
PATHS
|
||||
@@ -66,7 +76,8 @@ foreach(lib
|
||||
${DCMTK_DIR}/${lib}/libsrc/Debug
|
||||
${DCMTK_DIR}/${lib}/Release
|
||||
${DCMTK_DIR}/${lib}/Debug
|
||||
- ${DCMTK_DIR}/lib)
|
||||
+ ${DCMTK_DIR}/lib
|
||||
+ /usr/lib/dcmtk)
|
||||
|
||||
mark_as_advanced(DCMTK_${lib}_LIBRARY)
|
||||
|
||||
@@ -82,13 +93,16 @@ set(DCMTK_dcmdata_TEST_HEADER dctypes.h)
|
||||
set(DCMTK_dcmimage_TEST_HEADER dicoimg.h)
|
||||
set(DCMTK_dcmimgle_TEST_HEADER dcmimage.h)
|
||||
set(DCMTK_dcmjpeg_TEST_HEADER djdecode.h)
|
||||
+set(DCMTK_dcmjpls_TEST_HEADER djcodecd.h)
|
||||
set(DCMTK_dcmnet_TEST_HEADER assoc.h)
|
||||
set(DCMTK_dcmpstat_TEST_HEADER dcmpstat.h)
|
||||
set(DCMTK_dcmqrdb_TEST_HEADER dcmqrdba.h)
|
||||
set(DCMTK_dcmsign_TEST_HEADER sicert.h)
|
||||
set(DCMTK_dcmsr_TEST_HEADER dsrtree.h)
|
||||
set(DCMTK_dcmtls_TEST_HEADER tlslayer.h)
|
||||
+set(DCMTK_dcmwlm_TEST_HEADER wldsfs.h)
|
||||
set(DCMTK_ofstd_TEST_HEADER ofstdinc.h)
|
||||
+set(DCMTK_oflog_TEST_HEADER oflog.h)
|
||||
|
||||
foreach(dir
|
||||
config
|
||||
@@ -96,16 +110,20 @@ foreach(dir
|
||||
dcmimage
|
||||
dcmimgle
|
||||
dcmjpeg
|
||||
+ dcmjpls
|
||||
dcmnet
|
||||
dcmpstat
|
||||
dcmqrdb
|
||||
dcmsign
|
||||
dcmsr
|
||||
dcmtls
|
||||
+ dcmwlen
|
||||
+ oflog
|
||||
ofstd)
|
||||
find_path(DCMTK_${dir}_INCLUDE_DIR
|
||||
${DCMTK_${dir}_TEST_HEADER}
|
||||
PATHS
|
||||
+ /usr/include/dcmtk
|
||||
${DCMTK_DIR}/${dir}/include
|
||||
${DCMTK_DIR}/${dir}
|
||||
${DCMTK_DIR}/include/${dir}
|
168
cmake-fedora-flag_release.patch
Normal file
168
cmake-fedora-flag_release.patch
Normal file
@ -0,0 +1,168 @@
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/Absoft-Fortran.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake
|
||||
@@ -1,7 +1,7 @@
|
||||
string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " ")
|
||||
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3")
|
||||
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
|
||||
set(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=")
|
||||
set(CMAKE_Fortran_MODPATH_FLAG "-p")
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/G95-Fortran.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake
|
||||
@@ -1,7 +1,7 @@
|
||||
string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os")
|
||||
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3")
|
||||
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
|
||||
set(CMAKE_Fortran_MODDIR_FLAG "-fmod=")
|
||||
set(CMAKE_Fortran_VERBOSE_FLAG "-v")
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake
|
||||
@@ -55,7 +55,7 @@ macro(__compiler_gnu lang)
|
||||
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
|
||||
- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
|
||||
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
|
||||
set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
|
||||
set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU-Fortran.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake
|
||||
@@ -14,7 +14,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpr
|
||||
|
||||
# No -DNDEBUG for Fortran.
|
||||
string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os")
|
||||
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3")
|
||||
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2")
|
||||
|
||||
# No -isystem for Fortran because it will not find .mod files.
|
||||
unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran)
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/Intel.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake
|
||||
@@ -22,7 +22,7 @@ else()
|
||||
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os")
|
||||
- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3")
|
||||
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
|
||||
|
||||
set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}")
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/NVIDIA-CUDA.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
|
||||
@@ -36,7 +36,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE
|
||||
set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC)
|
||||
string(APPEND CMAKE_CUDA_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g")
|
||||
- string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
|
||||
+ string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O2 -DNDEBUG")
|
||||
string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG")
|
||||
string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
|
||||
endif()
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/PathScale.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake
|
||||
@@ -16,6 +16,6 @@ macro(__compiler_pathscale lang)
|
||||
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os")
|
||||
- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3")
|
||||
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2")
|
||||
endmacro()
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/PGI.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake
|
||||
@@ -18,7 +18,7 @@ macro(__compiler_pgi lang)
|
||||
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -O2 -s")
|
||||
- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O3")
|
||||
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O2")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt")
|
||||
|
||||
if(CMAKE_HOST_WIN32)
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-ASM.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake
|
||||
@@ -11,7 +11,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_ASM_FLAG
|
||||
string(APPEND CMAKE_ASM_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_ASM_FLAGS_DEBUG_INIT " -g")
|
||||
string(APPEND CMAKE_ASM_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
|
||||
-string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
|
||||
+string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
|
||||
string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
|
||||
|
||||
# Initialize ASM link type selection flags. These flags are used when
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-C.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-C.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-C.cmake
|
||||
@@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "
|
||||
string(APPEND CMAKE_C_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -g")
|
||||
string(APPEND CMAKE_C_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
|
||||
-string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
|
||||
+string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
|
||||
string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
|
||||
|
||||
set(CMAKE_DEPFILE_FLAGS_C "-xMD -xMF <DEPFILE>")
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-CXX.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-CXX.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-CXX.cmake
|
||||
@@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG
|
||||
string(APPEND CMAKE_CXX_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -g")
|
||||
string(APPEND CMAKE_CXX_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
|
||||
-string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
|
||||
+string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
|
||||
string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
|
||||
|
||||
set(CMAKE_DEPFILE_FLAGS_CXX "-xMD -xMF <DEPFILE>")
|
||||
Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-Fortran.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-Fortran.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-Fortran.cmake
|
||||
@@ -17,7 +17,7 @@ set(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLA
|
||||
string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
|
||||
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
|
||||
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
|
||||
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
|
||||
set(CMAKE_Fortran_MODDIR_FLAG "-moddir=")
|
||||
set(CMAKE_Fortran_MODPATH_FLAG "-M")
|
||||
Index: cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-Clang.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake
|
||||
@@ -79,7 +79,7 @@ macro(__windows_compiler_clang_gnu lang)
|
||||
|
||||
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -Xclang -gcodeview -O0 ${__ADDED_FLAGS_DEBUG}")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG ${__ADDED_FLAGS}")
|
||||
- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG ${__ADDED_FLAGS}")
|
||||
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG ${__ADDED_FLAGS}")
|
||||
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG -Xclang -gcodeview ${__ADDED_FLAGS}")
|
||||
endif()
|
||||
set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
|
@ -1,20 +1,22 @@
|
||||
diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modules/FindRuby.cmake
|
||||
--- cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby 2012-10-02 10:12:18.000000000 -0600
|
||||
+++ cmake-2.8.10-rc1/Modules/FindRuby.cmake 2012-10-02 15:50:30.463292214 -0600
|
||||
@@ -92,14 +92,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
|
||||
_RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
|
||||
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
|
||||
Index: cmake-3.18.0-rc1/Modules/FindRuby.cmake
|
||||
===================================================================
|
||||
--- cmake-3.18.0-rc1.orig/Modules/FindRuby.cmake
|
||||
+++ cmake-3.18.0-rc1/Modules/FindRuby.cmake
|
||||
@@ -289,14 +289,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_
|
||||
_RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
|
||||
_RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
|
||||
|
||||
- # vendor_ruby available ?
|
||||
- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
|
||||
- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
|
||||
- # vendor_ruby available ?
|
||||
- execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'"
|
||||
- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET)
|
||||
-
|
||||
- if(RUBY_HAS_VENDOR_RUBY)
|
||||
- _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
|
||||
- _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
|
||||
- endif()
|
||||
+ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
|
||||
+ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
|
||||
- if(Ruby_HAS_VENDOR_RUBY)
|
||||
- _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
|
||||
- _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
|
||||
- endif()
|
||||
+ # vendor_ruby
|
||||
+ _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
|
||||
+ _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
|
||||
|
||||
# save the results in the cache so we don't have to run ruby the next time again
|
||||
set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)
|
||||
# save the results in the cache so we don't have to run ruby the next time again
|
||||
set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)
|
||||
|
9
cmake-init.el
Normal file
9
cmake-init.el
Normal file
@ -0,0 +1,9 @@
|
||||
;;
|
||||
;; Setup cmake-mode for autoloading
|
||||
;;
|
||||
(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake listfiles." t)
|
||||
(setq auto-mode-alist
|
||||
(append
|
||||
'(("CMakeLists\\.txt\\'" . cmake-mode))
|
||||
'(("\\.cmake\\'" . cmake-mode))
|
||||
auto-mode-alist))
|
21
cmake-mingw-dl.patch
Normal file
21
cmake-mingw-dl.patch
Normal file
@ -0,0 +1,21 @@
|
||||
Index: cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-GNU.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
|
||||
@@ -25,12 +25,14 @@ endif()
|
||||
|
||||
if(MINGW)
|
||||
set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
|
||||
- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib")
|
||||
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib")
|
||||
set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32")
|
||||
set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
|
||||
+ set(CMAKE_DL_LIBS "dl")
|
||||
+else()
|
||||
+ set(CMAKE_DL_LIBS "")
|
||||
endif()
|
||||
|
||||
-set(CMAKE_DL_LIBS "")
|
||||
set(CMAKE_LIBRARY_PATH_FLAG "-L")
|
||||
set(CMAKE_LINK_LIBRARY_FLAG "-l")
|
||||
set(CMAKE_LINK_DEF_FILE_FLAG "") # Empty string: passing the file is enough
|
3
cmake.attr
Normal file
3
cmake.attr
Normal file
@ -0,0 +1,3 @@
|
||||
%__cmake_provides %{_rpmconfigdir}/cmake.prov
|
||||
%__cmake_requires %{_rpmconfigdir}/cmake.req
|
||||
%__cmake_path ^(%{_libdir}|%{_datadir})/cmake/.*/.*(Config\.cmake|-config\.cmake)$
|
82
cmake.prov
Normal file
82
cmake.prov
Normal file
@ -0,0 +1,82 @@
|
||||
#!/usr/bin/python3
|
||||
# -*- coding:utf-8 -*-
|
||||
#
|
||||
# Copyright (C) 2015 Daniel Vrátil <dvratil@redhat.com>
|
||||
# Copyright (C) 2017 Daniel Vrátil <dvratil@fedoraproject.org>
|
||||
#
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Library General Public License as
|
||||
# published by the Free Software Foundation; either version 2 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Library General Public
|
||||
# License along with this program; if not, write to the
|
||||
# Free Software Foundation, Inc.,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
import sys
|
||||
import re
|
||||
import glob
|
||||
|
||||
class CMakeParser:
|
||||
def __init__(self, filelist = None):
|
||||
if filelist == None:
|
||||
filelist = sys.stdin
|
||||
|
||||
paths = map(lambda x: x.rstrip(), filelist.readlines())
|
||||
for path in paths:
|
||||
modulePath, cmakeModule, lowercase = self.parseCmakeModuleConfig(path)
|
||||
if modulePath and cmakeModule:
|
||||
version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase)
|
||||
|
||||
if version:
|
||||
string = "cmake(" + cmakeModule + ") = " + version
|
||||
else:
|
||||
string = "cmake(" + cmakeModule + ")"
|
||||
if string == string.lower():
|
||||
print(string)
|
||||
else:
|
||||
# Temporarily print both variants to satisfy requires
|
||||
# by the old version of this generator which made mistakes
|
||||
print(string)
|
||||
print(string.lower())
|
||||
|
||||
|
||||
def parseCmakeModuleConfig(self, configFile):
|
||||
paths = configFile.rsplit("/", 3)
|
||||
|
||||
modulePath = "%s/cmake/%s" % (paths[0], paths[2])
|
||||
cfgFile = paths[3]
|
||||
if cfgFile.endswith("Config.cmake"):
|
||||
return (modulePath, cfgFile[0:-len("Config.cmake")], False)
|
||||
elif cfgFile.endswith("-config.cmake"):
|
||||
return (modulePath, cfgFile[0:-len("-config.cmake")], True)
|
||||
else:
|
||||
return (None, None, False)
|
||||
|
||||
def resolveCMakeModuleVersion(self, modulePath, cmakeModule, lowercase):
|
||||
versionFile = ("%s/%s-config-version.cmake" if lowercase else "%s/%sConfigVersion.cmake") % (modulePath, cmakeModule)
|
||||
try:
|
||||
f = open(versionFile, 'r')
|
||||
except:
|
||||
return None
|
||||
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
|
||||
# set(PACKAGE_VERSION <version>)
|
||||
version = re.match(r"^set[\ ]*\([\ ]*PACKAGE_VERSION[\ ]+[\"]*([0-9\.]+)[\"]*[\ ]*[.]*\)", line)
|
||||
if version:
|
||||
return version.groups(1)[0]
|
||||
|
||||
return None
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = CMakeParser()
|
70
cmake.req
Normal file
70
cmake.req
Normal file
@ -0,0 +1,70 @@
|
||||
#!/usr/bin/python3
|
||||
# -*- coding:utf-8 -*-
|
||||
#
|
||||
# Copyright (C) 2017 Björn Esser <besser82@fedoraproject.org>
|
||||
#
|
||||
# based on cmake.prov, which is
|
||||
# Copyright (C) 2015 Daniel Vrátil <dvratil@redhat.com>
|
||||
# Copyright (C) 2017 Daniel Vrátil <dvratil@fedoraproject.org>
|
||||
#
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Library General Public License as
|
||||
# published by the Free Software Foundation; either version 2 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Library General Public
|
||||
# License along with this program; if not, write to the
|
||||
# Free Software Foundation, Inc.,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
|
||||
import sys
|
||||
import re
|
||||
import subprocess
|
||||
|
||||
class CMakeParser:
|
||||
def __init__(self, filelist = None):
|
||||
if filelist == None:
|
||||
filelist = sys.stdin
|
||||
|
||||
has_module = False
|
||||
is_arched = False
|
||||
|
||||
isa_suf = subprocess.check_output(["/usr/bin/rpm", "-E %{?_isa}"]).decode().strip()
|
||||
|
||||
paths = map(lambda x: x.rstrip(), filelist.readlines())
|
||||
for path in paths:
|
||||
modulePath, cmakeModule, lowercase = self.parseCmakeModuleConfig(path)
|
||||
if modulePath and cmakeModule:
|
||||
has_module = True
|
||||
if re.match(".*/usr/lib(64)?/cmake/.*", modulePath):
|
||||
is_arched = True
|
||||
|
||||
if has_module:
|
||||
if is_arched:
|
||||
print("cmake-filesystem%s" % isa_suf)
|
||||
else:
|
||||
print("cmake-filesystem")
|
||||
|
||||
|
||||
def parseCmakeModuleConfig(self, configFile):
|
||||
paths = configFile.rsplit("/", 3)
|
||||
|
||||
modulePath = "%s/cmake/%s" % (paths[0], paths[2])
|
||||
cfgFile = paths[3]
|
||||
if cfgFile.endswith("Config.cmake"):
|
||||
return (modulePath, cfgFile[0:-len("Config.cmake")], False)
|
||||
elif cfgFile.endswith("-config.cmake"):
|
||||
return (modulePath, cfgFile[0:-len("-config.cmake")], True)
|
||||
else:
|
||||
return (None, None, False)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = CMakeParser()
|
1302
cmake.spec
1302
cmake.spec
File diff suppressed because it is too large
Load Diff
42
macros.cmake
42
macros.cmake
@ -2,17 +2,38 @@
|
||||
# Macros for cmake
|
||||
#
|
||||
%_cmake_lib_suffix64 -DLIB_SUFFIX=64
|
||||
%_cmake_shared_libs -DBUILD_SHARED_LIBS:BOOL=ON
|
||||
%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
|
||||
%_cmake_version @@CMAKE_VERSION@@
|
||||
%__cmake /usr/bin/cmake
|
||||
%__ctest /usr/bin/ctest
|
||||
%__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.}
|
||||
|
||||
# - Set default compile flags
|
||||
# - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables
|
||||
# and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS
|
||||
# - Turn on verbose makefiles so we can see and verify compile flags
|
||||
# - Turn off stripping by default so RPM can do it separately
|
||||
# - Set default install prefixes and library install directories
|
||||
# - Turn on shared libraries by default
|
||||
%cmake \
|
||||
%if 0%{?set_build_flags:1} \
|
||||
%set_build_flags \
|
||||
%else \
|
||||
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
|
||||
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
|
||||
FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
|
||||
FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
|
||||
%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
|
||||
%endif \
|
||||
%__cmake \\\
|
||||
-DCMAKE_VERBOSE_MAKEFILE=ON \\\
|
||||
%{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\
|
||||
%{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\
|
||||
-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
|
||||
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
|
||||
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
|
||||
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
|
||||
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
|
||||
-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
|
||||
-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
|
||||
@ -21,4 +42,21 @@
|
||||
%if "%{?_lib}" == "lib64" \
|
||||
%{?_cmake_lib_suffix64} \\\
|
||||
%endif \
|
||||
-DBUILD_SHARED_LIBS:BOOL=ON
|
||||
%{?_cmake_shared_libs}
|
||||
|
||||
%cmake_build \
|
||||
%__cmake --build "%{__cmake_builddir}" %{?_smp_mflags} --verbose
|
||||
|
||||
%cmake_install \
|
||||
DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
|
||||
|
||||
%ctest(:-:) \
|
||||
cd "%{__cmake_builddir}" \
|
||||
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \
|
||||
cd -
|
||||
|
||||
|
||||
%cmake@@CMAKE_MAJOR_VERSION@@ %cmake
|
||||
%cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build
|
||||
%cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install
|
||||
%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**}
|
||||
|
Loading…
Reference in New Issue
Block a user