Compare commits

..

340 Commits
f17 ... master

Author SHA1 Message Date
Neal Gompa
5db8037248 Ensure CMake does not strip binaries with package builds 2020-11-20 08:33:31 -05:00
Miro Hrončok
1ab5d69fab Add Python 3.10 to the hadcoded lists of Python versions 2020-11-09 17:49:03 +01:00
Björn Esser
946181a294
Update to 3.18.4 2020-10-13 10:04:14 +02:00
Björn Esser
4ad1e486f5
Add patch to support FlexiBLAS 2020-09-30 13:00:27 +02:00
Björn Esser
372a70dc79
Explicitly require make 2020-09-30 12:56:24 +02:00
Björn Esser
bdf3093d62
Update to 3.18.3 2020-09-30 12:55:31 +02:00
Christoph Junghans
c9bb4a4953 Make %ctest non-verbose by default 2020-09-29 10:32:06 -06:00
Björn Esser
6d388a4073 Update to 3.18.2 2020-08-20 22:01:22 +02:00
Björn Esser
7ec8c694fa Update to 3.18.1 2020-08-01 12:29:55 +02:00
Orion Poplawski
8674426d57 Handle arguments for ctest3 macro 2020-07-29 22:03:29 -06:00
Fedora Release Engineering
43677c13f5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 14:10:50 +00:00
Björn Esser
5bf1d33bf1 Default to --verbose for ctest as well 2020-07-22 22:24:22 +02:00
Orion Poplawski
5d587929de Default to --verbose for ctest as well 2020-07-21 20:36:38 -06:00
Neal Gompa
4b115b40c7 Bump release 2020-07-19 08:59:00 -04:00
Neal Gompa
672b300dfb Make in-source builds behave like before 2020-07-19 08:45:08 -04:00
Igor Raits
85ead68072
Enable out-of-source builds by default
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-07-18 09:02:15 +02:00
Björn Esser
91d8dab882 Update to 3.18.0 2020-07-16 12:05:38 +02:00
Björn Esser
8135e77c5b Update to 3.18.0-rc3 2020-07-04 13:05:57 +02:00
Igor Raits
fbadbabca6
Revert "Enable out-of-source builds"
This reverts commit 419924585f.

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-07-03 22:36:43 +02:00
Igor Raits
419924585f
Enable out-of-source builds
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-07-03 22:35:31 +02:00
Neal Gompa
f626219c98 Fix __cmake_builddir macro definition 2020-07-03 12:11:19 -04:00
Neal Gompa
8158da8089 Temporarily switch back to in-source builds 2020-07-03 11:51:15 -04:00
Neal Gompa
169c293f4c Switch to implementation that is backwards compatible to older RPM
- Change control macro for in-source/out-of-source to %__cmake_in_source_build
2020-07-03 11:43:04 -04:00
Igor Raits
2af1671e51
Add out-of-source builds controlled by a macro
This will allow us to port packages to the %cmake_build/%cmake_install
even on older Fedora with possibility to easily opt-in for out-of-source
builds by `%global __cmake_out_of_source_build 1`. In future we will
make it opt-out (`%global __cmake_out_of_source_build 0` will do
in-source builds again).

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-07-03 17:12:56 +02:00
Igor Raits
134e994816
Revert "Setup CMake to do out-of-tree builds by default"
This reverts commit 50646f0efa.

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-07-01 08:27:40 +02:00
Tom Callaway
a63a3e2b71 fix FindLua to support lua 5.4 2020-06-30 15:37:16 -04:00
Björn Esser
a86fd237d4 Apply change: CMake to do out-of-source builds (#1852036) 2020-06-29 19:42:03 +02:00
Neal Gompa
4e79ea6773 Add build, install, and test macros for CMake
CMake supports multiple generator types for builds, such as GNU Make
and Ninja. As of CMake 3.15, there are now analogs for build and install
steps typically managed directly by build tools, where CMake controls
the logic to correctly call out.

Consequently, it is now rather easy to support any given type of
build tool (as long as it's available in the build environment) and
have a CMake build "work" as expected.

This also brings CMake in line with the same build/install process
that is used for packaging Meson-based projects.
2020-06-23 09:41:38 +00:00
Neal Gompa
50646f0efa Setup CMake to do out-of-tree builds by default
This brings CMake in line with upstream best practices for building
with CMake and lines up with how most people expect CMake to behave.
2020-06-23 09:41:38 +00:00
Björn Esser
77c5d42f75 Update to 3.18.0-rc2 2020-06-20 11:37:49 +02:00
Björn Esser
8b4138a684 Update to 3.18.0-rc1 2020-06-17 11:54:13 +02:00
Björn Esser
aa9db08f96 Refresh FindRuby patch 2020-06-12 18:14:41 +02:00
Björn Esser
645a99bedd Disable curl test during bootstrap only 2020-05-30 14:19:55 +02:00
Björn Esser
cfff94149b Disable bootstrap for Rebuild (jsoncpp) 2020-05-30 13:52:15 +02:00
Björn Esser
01c03f182c Disable curl test 2020-05-30 13:49:02 +02:00
Björn Esser
d0248a96bf Revert "Disable bootstrap for Rebuild (jsoncpp)"
This reverts commit f076d38e5e.
2020-05-30 13:47:58 +02:00
Björn Esser
f076d38e5e Disable bootstrap for Rebuild (jsoncpp) 2020-05-30 12:00:55 +02:00
Björn Esser
7aedef19dd Bootstrap for Rebuild (jsoncpp) 2020-05-30 11:45:29 +02:00
Björn Esser
d9eb0a48bf Update to cmake-3.17.3 2020-05-29 09:51:17 +02:00
Björn Esser
302877f5c5 Update to cmake-3.17.2 2020-04-29 01:07:29 +02:00
Björn Esser
5cea73e323
Update to cmake-3.17.1 2020-04-09 20:23:57 +02:00
Rex Dieter
fb41c005d8 Update to cmake-3.17.0 2020-03-24 12:21:04 -05:00
Björn Esser
f8c1c1d47b
Update to 3.17.0-rc3 2020-03-13 11:28:59 +01:00
Björn Esser
422d920ec7
kwsys.testProcess-{4,5} are flaky on s390x 2020-03-03 12:14:25 +01:00
Björn Esser
e5db548e34
Update to 3.17.0-rc2 2020-03-03 10:58:17 +01:00
Orion Poplawski
1bb4a5c968 Use python3 for rpm generators
Use lowercase names for cmake provides in generator (in addition to old names)
2020-02-26 20:59:26 -07:00
Björn Esser
0d9eb67fed
Fix release tag 2020-02-18 00:02:09 +01:00
Björn Esser
1f31468bbd
Update to 3.17.0-rc1 2020-02-17 23:43:47 +01:00
Björn Esser
278c697be5
Refresh patches 2020-02-17 23:43:47 +01:00
Björn Esser
3e504e7796
Update to 3.16.4 2020-02-05 19:47:26 +01:00
Fedora Release Engineering
95a62478f6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 14:18:23 +00:00
Björn Esser
48dc69cf14
Update to 3.16.3 2020-01-22 16:24:13 +01:00
Björn Esser
544f6b7bd0
Drop patches that are applied in upstream tarball 2020-01-22 16:23:18 +01:00
Björn Esser
b9f551dc1f
Do not indent rpm conditionals in macros.cmake 2020-01-15 11:53:26 +01:00
Björn Esser
202d11b3d1
Use %%set_build_flags inside macros.cmake if available 2020-01-15 11:43:18 +01:00
Björn Esser
062da0a4bf
Use %%set_build_flags to export build flags if available 2020-01-15 11:28:42 +01:00
Björn Esser
f48eae3697
Use %%_vpath_builddir for out-of-tree build 2020-01-15 11:21:10 +01:00
Björn Esser
c563351e5c
Update to 3.16.2 2020-01-15 11:21:10 +01:00
Björn Esser
d22a0444ec
Small style fixup 2020-01-15 11:21:10 +01:00
Miro Hrončok
8d55c35ecb FindPython: Add support for version 3.9 2020-01-14 19:46:18 +01:00
Björn Esser
25f9bed0bb
Re-enable test "kwsys.testProcess-5" on S390X 2019-12-15 19:40:14 +01:00
Björn Esser
6158d7b92a
Update to 3.16.1 2019-12-14 20:50:37 +01:00
Björn Esser
3060a641bf
Exclude test "kwsys.testProcess-5" on S390X 2019-11-27 17:08:59 +01:00
Björn Esser
3546dfaf75
Update to 3.16.0 2019-11-26 19:38:55 +01:00
Orion Poplawski
3648c4d8a2 Update to 3.6.0-rc4 2019-11-18 21:05:37 -07:00
Björn Esser
36cafa45d7
Update %changelog 2019-11-15 19:39:56 +01:00
Björn Esser
d673630857
Disable bootstrap for jsoncpp again 2019-11-15 19:39:56 +01:00
Björn Esser
cbd95056bc
Exclude more failing tests on s390x 2019-11-15 19:17:56 +01:00
Björn Esser
3c38508291
Exclude another failing test on s390x 2019-11-15 09:01:38 +01:00
Björn Esser
453d15e9a8
Exclude more tests failing on s390x 2019-11-15 08:12:28 +01:00
Björn Esser
95616513c5
Enable bootstrap for jsoncpp again 2019-11-15 08:09:54 +01:00
Björn Esser
61a4234484
Disable bootstrap for jsoncpp 2019-11-14 20:35:35 +01:00
Björn Esser
f36d7d2cd1
Rebuild (jsoncpp) 2019-11-14 20:33:56 +01:00
Orion Poplawski
7e7cc590d0 Update to 3.15.5 2019-10-30 20:30:02 -06:00
Orion Poplawski
7fbdb8f125 Update to 3.15.4 2019-10-16 22:03:02 -06:00
Orion Poplawski
214ee01016 Update to 3.15.3 2019-10-01 20:27:06 -06:00
Fedora Release Engineering
f46ed72703 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-24 20:29:45 +00:00
Björn Esser
6bbe38cafa
Fix a typo 2019-07-03 20:11:56 +02:00
Björn Esser
af45ad89da
Enable qt5 after bootstrap
This reverts commit 4b5b373342.
2019-07-03 17:39:08 +02:00
Björn Esser
e2928d0221
Ignore a test failing with rpm-4.15 2019-07-03 16:44:01 +02:00
Björn Esser
4b5b373342
Revert "Enable qt5 after bootstrap"
This reverts commit fe93f70436.
2019-07-03 16:41:06 +02:00
Björn Esser
fe93f70436
Enable qt5 after bootstrap 2019-07-03 14:05:36 +02:00
Björn Esser
5d34009bff
Bootstrap without qt5 2019-07-03 13:59:48 +02:00
Björn Esser
257d63bdb5
Rebuild (jsoncpp) 2019-07-03 13:29:29 +02:00
Björn Esser
c1e32402ca
3.14.5 2019-05-31 23:51:41 +02:00
Björn Esser
db6908d732
3.14.4 2019-05-14 23:13:38 +02:00
Björn Esser
ef8ba40653
3.14.3 2019-04-22 22:29:34 +02:00
Björn Esser
7d590fe7b7
3.14.2 2019-04-12 21:21:20 +02:00
Björn Esser
2e36fff9d3
Remove upstream patch 2019-03-29 18:22:40 +01:00
Björn Esser
59c1321d9d
3.14.1 2019-03-29 18:19:12 +01:00
Rex Dieter
f73c5d508b pull in upstream fix for conflict with ECM/FindFontConfig 2019-03-28 08:36:42 -05:00
Björn Esser
6f2725ff7d
3.14.0 2019-03-15 14:26:04 +01:00
Orion Poplawski
0f4ea95b94 3.13.4 2019-02-02 21:11:07 -07:00
Fedora Release Engineering
ace5c671f7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 15:49:39 +00:00
Igor Gnatenko
2c777f0b44
Remove obsolete scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-27 12:46:11 +01:00
Rex Dieter
6c45a46353 3.13.3 2019-01-16 09:37:38 -06:00
Rex Dieter
61dcfd1293 3.13.2 2018-12-15 06:33:07 -06:00
Rex Dieter
97ec277724 macros.cmake: introduce %_cmake_shared_libs macro
... makes it easier to override or disable.
2018-12-08 16:16:41 -06:00
Rex Dieter
cb4461c86c 3.13.1 2018-11-28 17:57:52 -06:00
Rex Dieter
d9aab735e2 Update to 3.12.2 2018-09-08 23:21:27 -05:00
Rex Dieter
5e5002b437 fix changelog typo 2018-08-28 10:31:07 -05:00
Rex Dieter
d6f349f50a Update to 3.12.1 (# 1614572) 2018-08-17 11:10:34 -05:00
Rex Dieter
923181cba4 Update to 3.12.0 (#1584925)
fixes libuv-related FTBFS (#1603661)
use %_metainfodir
2018-07-27 09:30:12 -05:00
Fedora Release Engineering
dada3cb546 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-12 21:56:28 +00:00
Miro Hrončok
2aa00279a6 Rebuilt for Python 3.7 2018-06-19 10:41:10 +02:00
Björn Esser
dbbf2b62d9
Update to 3.11.2 (#1568630) 2018-05-18 12:55:20 +02:00
Björn Esser
de2a36b648
Update to 3.11.0 (#1536233) 2018-03-29 09:18:59 +02:00
Adam Williamson
8ed1da6e7f Actually bump release and build with autogen patch 2018-03-08 21:51:11 -08:00
Orion Poplawski
1769f1e84e Add patch to fix autogen with empty files (bug #1551147) 2018-03-08 22:11:16 -07:00
Rex Dieter
b6221b537f better Qt dependencies 2018-03-08 10:45:37 -06:00
Kalev Lember
8f07396a82 Fix appdata file to match with desktop file name
This should fix cmake-gui to show up in appstream metadata.
2018-03-02 12:08:33 +01:00
Orion Poplawski
18f7a632ed Update to 3.10.2
Add patch to fix test failure with gcc 8
2018-02-22 08:20:33 -07:00
Fedora Release Engineering
807c1a2de6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 05:13:13 +00:00
Igor Gnatenko
e0b59b2512 remove useless foreign_filesystem bcond
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-16 01:29:03 +01:00
Igor Gnatenko
deed0a56c7 remove cmake_enables_ prefix from options
All options are local and no need to do this monkey job.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-16 01:21:21 +01:00
Igor Gnatenko
fe6880366b move sphinx-build condition out of nesting
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-16 01:18:08 +01:00
Igor Gnatenko
5a3317177d invert logic to be forward-looking
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-16 01:17:44 +01:00
Igor Gnatenko
4b3510c3d9 add missing slash in --sphinx-build
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-16 01:01:21 +01:00
Igor Gnatenko
ad455e5e72 guard BR: cmake-rpm-macros by %without bootstrap
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-16 00:41:55 +01:00
Igor Gnatenko
45a4213d84 Conflicts was the right choice
rpm-macros doesn't require any of cmake or cmake-data. Also it makes
everything over-complicated. Conflicts is the right choice here.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-16 00:27:02 +01:00
Björn Esser
eaad71490d
rpm-macros: Keep cmake{,-data} in evr-lock, if they are installed 2018-01-14 17:56:22 +01:00
Björn Esser
e56b7c3eaf
rpm-macros: Use rich boolean Requires instead of Conflicts (#1532293) 2018-01-14 16:29:46 +01:00
Rex Dieter
01dbb03e4b make that cmake-data (where -rpm-macros was split from) 2018-01-13 09:25:00 -06:00
Rex Dieter
f62ee9a360 -rpm-macros: Conflicts: cmake < 3.10.1-2 (#1532293)
when new -rpm-macros subpkg was introduced, helps
avoid conflicts.
2018-01-13 09:20:49 -06:00
Sandro Mani
ad0e43afe6 Add dl to CMAKE_DL_LIBS on MINGW 2018-01-02 12:27:40 +01:00
Richard W.M. Jones
0953dfa2a7 Add small fix for RISC-V support. 2017-12-30 07:19:00 +00:00
Björn Esser
0f3e93bcc7
Rebuilt for jsoncpp.so.20 2017-12-26 09:24:09 +01:00
Björn Esser
e1bc4a625e
Bootstrapping for jsoncpp-1.8.4 2017-12-26 09:09:23 +01:00
Björn Esser
68ba4859ac
Re-add arched requires on filesystem sub-package 2017-12-21 20:02:56 +01:00
Björn Esser
b3b1c52494
Ensure we have our own rpm-macros in place during build 2017-12-21 13:54:21 +01:00
Björn Esser
b77aeb5b46
Move rpm macros to own subpackage (#1498894) 2017-12-21 13:44:45 +01:00
Björn Esser
9f464cfeb1
Update to 3.10.1 (#1526648) 2017-12-16 14:44:50 +01:00
Björn Esser
51cbbee01a
Update to 3.10.0 (#1515793) 2017-11-23 12:43:07 +01:00
Rex Dieter
df5452a402 Update to 3.9.6 2017-11-10 14:14:38 -06:00
Rex Dieter
e368746a2b silent rpm warning
if BR's aren't present, say, when generating src.rpm
2017-11-09 13:29:51 -06:00
Rex Dieter
58fa2e5bc4 Update to 3.9.5 (#1498688) 2017-11-08 14:47:42 -06:00
Petr Písař
57338c141a Disable RunCMake.CPack_RPM test
It fails if disttag contains "+" character as it happens in modular
builds.
2017-10-09 11:33:24 +02:00
Petr Písař
ba9c9d5ef5 Disable curl test because it needs the Internet
curl connects to <http://open.cdash.org/user.php>. Live network tests
are not reliable. This patch disable it.
2017-10-09 11:33:24 +02:00
Petr Písař
3c11a43a0c Allow disabling building filesystem subpackage
cmake-filesystem will be provided by Platform module, other cmake
subpackages by a separate module. Therefore the separate module cannot
provide cmake-filesystem and its packages cannot depend on exact
cmake-filesystem version-release (because release string contains
a "random" hash).

This patch adds a build-condition that allows to build cmake without
cmake-filesystem.
2017-10-09 11:33:24 +02:00
Petr Písař
8983c63ac8 Non-bootstraped build must employ cmake() generators
When building non-boostrapped cmake but with disabled some features,
cmake-data won't get into build root and cmake(FindPkg) and
cmake(UsePkg) Provides will be missing from just-built cmake-data
package. (This bug is not visible with full-fledged build because
cmake-data with the RPM dependency generator is installed
transitively).

This patch ensures that cmake-data is in the build root when not
bootstrapping.
2017-10-09 11:33:16 +02:00
Petr Písař
e0724780f7 Build-require git for optional tests
Tests, e.g. ExternalProject, either need no git command or "git
submodule" command to pass.  This is not true if git-core package is
installed without git package.
2017-09-29 14:12:16 +02:00
Pete Walter
a61d5cd9ee Update to 3.9.3 2017-09-21 08:45:59 +01:00
Petr Písař
7ad9a9f7bc Replace _module_build condition with specific macros
The _module_build condition disables all the features when building
any Modularity module. This is wrong because there are modules that want to
enable some features. Like using system libraries or enabling Qt GUI
or Spinx-generated documentation or RPM dependency generators for
cmake files.

This patch breaks the _module_build condition into various specific
bcond_with conditions defined and documented at the beginning of the
spec file.
2017-09-06 10:34:11 +02:00
Petr Písař
7b73d7e32a Specify all dependencies 2017-09-05 11:26:01 +02:00
Petr Písař
45340ec01a Escape macros in comments 2017-09-05 10:28:17 +02:00
Björn Esser
15cab722e0 Rebuilt for jsoncpp-1.8.3 2017-09-01 22:29:35 +02:00
Björn Esser
70f3c6ff8e Bootstrapping for jsoncpp-1.8.3 2017-09-01 22:21:07 +02:00
Björn Esser
4ff8fb2424 Add patch to restore old style debuginfo creation for rpm >= 4.14 in CPackRPM 2017-08-13 12:08:31 +02:00
Pete Walter
f0f9298328 Update to 3.9.1 2017-08-12 03:12:26 +01:00
Björn Esser
bb8fb23fed RunCMake.File_Generate fails on S390X, skip it temporarily 2017-08-03 12:39:42 +02:00
Björn Esser
6209eeaac2 Fix cmake.attr and cmake.req to work properly 2017-08-02 23:13:46 +02:00
Björn Esser
7cb318c85b Add cmake.req to autogenerate proper depency on cmake-filesystem 2017-08-02 18:53:08 +02:00
Björn Esser
4dec04629a Fix cmake-gui being picked up by main package 2017-08-02 14:39:20 +02:00
Björn Esser
aeac6869c0 Optimizations for filesystem-package 2017-07-30 20:27:37 +02:00
Björn Esser
907e555cfa Temporarily disable RunCMake.CPack_RPM, because it fails for the new way RPM handles debug-stuff 2017-07-28 13:03:43 +02:00
Fedora Release Engineering
1e56cb0b9c - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 05:03:47 +00:00
Björn Esser
fde64f334b Add patch to fix warnings from Sphinx 2017-07-24 02:03:42 +02:00
Björn Esser
b4054d50df Update patch for Fedora RELASE-builds 2017-07-24 01:54:21 +02:00
Björn Esser
c42191b46a Some more changes to keep spec similar to EPEL CMake3 2017-07-21 13:43:06 +02:00
Björn Esser
cd2a406fbd Small changes to keep spec similar to EPEL CMake3 2017-07-20 11:48:55 +02:00
Björn Esser
434fe8b1c8 Merge branch 'master' into f26 2017-07-19 11:41:00 +02:00
Björn Esser
10f83bc2fc Update to 3.9.0 final (rhbz#1472503)
Add filesystem package (rhbz#1471153)
2017-07-19 11:38:56 +02:00
Björn Esser
7d43ac2123 Update to 3.9.0 final (rhbz#1472503)
Add filesystem package (rhbz#1471153)
2017-07-19 11:36:46 +02:00
Björn Esser
ad9039f02b Merge branch 'master' into f26 2017-06-01 12:13:01 +02:00
Björn Esser
b0e468af57 Update to 3.8.2 final (rhbz#1447473) 2017-06-01 11:30:22 +02:00
Fedora Release Engineering
d1e8a9ef63 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild 2017-05-15 20:36:25 +00:00
Fedora Release Engineering
ef2992de5f - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild 2017-05-15 20:36:20 +00:00
Orion Poplawski
892d022be2 Update to 3.8.1 final 2017-05-02 16:53:49 -06:00
Orion Poplawski
389edecb94 Add upstream patch to fix FindGLUT library dependencies (bug #1444563) 2017-04-28 13:51:44 -06:00
Karsten Hopp
72fa0d4948 use new _module_build macro to limit dependencies for Modularity 2017-04-21 12:17:17 +02:00
Orion Poplawski
60fdc9ca73 Update to 3.8.0 final 2017-04-10 12:58:37 -06:00
Orion Poplawski
3e5e7a4aee Update to 3.8.0-rc3
Add upstream patch to support rpm build-id dirs
2017-03-27 09:05:49 -06:00
Orion Poplawski
9338710aca Update to 3.8.0-rc2 2017-03-20 21:40:49 -06:00
Orion Poplawski
10e7a4e0f4 Add patch to handle gcc format option changes 2017-02-27 11:30:06 -07:00
Rex Dieter
8f3879e81d Fix ambiguous file lookup in cmake.prov
Don't use glob to lookup cmake config file, because there can
be multiple matches and we might accidentally pick the wrong one.
Instead just work with the filepath passed to us via stdin.
2017-02-20 10:17:02 -06:00
Orion Poplawski
72646fef46 Fix cmake.prov error 2017-02-09 11:24:13 -07:00
Orion Poplawski
ad2cd5b89b Update to 3.7.2 2017-01-13 20:21:52 -07:00
Charalampos Stratakis
aebd6dde35 Rebuild for Python 3.6 2016-12-13 15:26:38 +01:00
Orion Poplawski
2ab55113c8 Update to 3.7.1 2016-11-30 21:13:46 -07:00
Orion Poplawski
3f7549751e Update to 3.7.0 final 2016-11-12 07:38:22 -07:00
Orion Poplawski
3e0543c73f Update to 3.7.0-rc3 2016-11-04 18:01:25 -06:00
Orion Poplawski
e6cfdefbc5 Update to 3.7.0-rc2 2016-10-19 21:14:07 -06:00
Orion Poplawski
8e2a2daaf8 Update to 3.7.0-rc1
- Drop gui, findjni, and riscv patches applied upstream
2016-10-06 15:50:18 -06:00
Björn Esser
72da9d7a8d Merge branch 'master' into f25 2016-10-03 07:37:15 +02:00
Björn Esser
265612192c remove double Patch5 2016-10-03 07:36:29 +02:00
Björn Esser
4bc00a18ff Merge branch 'master' into f25 2016-10-03 07:22:10 +02:00
Björn Esser
c50f25796e Rebuilt with gui enabled 2016-10-03 07:08:37 +02:00
Björn Esser
62d0f3cc32 Bootstrap without gui, due inter-circular dependency in qt5-rpm-macros 2016-10-03 06:49:49 +02:00
Björn Esser
23958a5bb4 Rebuilt for libjsoncpp.so.11 2016-10-03 05:47:26 +02:00
Björn Esser
01775a1307 add compatibility for el6 2016-10-03 05:40:03 +02:00
Richard W.M. Jones
61e3e8f15d Backport upstream RISC-V support.
This is a trivial backport of an upstream patch:

12f000d5b7
2016-09-27 15:55:41 +01:00
Richard W.M. Jones
82b4873ab4 Backport upstream RISC-V support.
This is a trivial backport of an upstream patch:

12f000d5b7
2016-09-27 15:53:40 +01:00
Orion Poplawski
a297e21a36 Bump release 2016-09-26 21:49:38 -06:00
Orion Poplawski
3c531e141a Add upstream patch for Qt5 QFileDialog usage 2016-09-26 21:48:50 -06:00
Than Ngo
4f3147d1f4 apply the patch 2016-09-26 16:15:51 +02:00
Than Ngo
305eda7637 Add aarch32 to libarch for arm platform 2016-09-26 16:15:14 +02:00
Orion Poplawski
5e0ae9df7c Provide the major version cmakeX name 2016-09-12 16:07:06 -06:00
Orion Poplawski
bf26fed88d Update to 3.6.2 2016-09-08 09:45:26 -06:00
Orion Poplawski
3476b700ee Do not provide cmake in cmakeX 2016-09-08 09:05:03 -06:00
Orion Poplawski
3bac96b089 Ship symlinks to binaries with major version in name
- Provide %cmakeX macro, where X is cmake major version
2016-08-17 11:07:59 -06:00
Orion Poplawski
f6068065ea Update to 3.6.1 2016-07-25 16:32:04 -06:00
Orion Poplawski
482644acff Update to 3.6.0 2016-07-08 07:39:41 -06:00
Orion Poplawski
08e14f95d5 Update to 3.6.0-rc4 2016-06-29 14:50:20 -06:00
Orion Poplawski
215439aebc Add libarchive patch 2016-06-03 10:21:52 -06:00
Orion Poplawski
5450a4f066 Add patch to support libarchive 3.2 2016-06-03 10:19:26 -06:00
Than Ngo
7d0c60e2ef drop -O3 and add -O2 for default release 2016-06-02 14:05:49 +02:00
Björn Esser
9f00df0cc2 use macro instead of hardcoded name 2016-04-22 10:08:26 +02:00
Orion Poplawski
c23a7d46d0 Cleanup .gitignore, clean unpacked dirs 2016-04-21 14:42:39 -06:00
Orion Poplawski
ad7513ae29 Do not own /usr/lib/rpm/fileattrs 2016-04-21 10:40:18 -06:00
Björn Esser
63f81dc8f7 fix %%changelog 2016-04-16 07:39:32 +02:00
Orion Poplawski
0461421929 Update to 3.5.2 final 2016-04-15 18:57:07 -06:00
Björn Esser
d1d955e2de Rebuilt for libjsoncpp.so.1 2016-03-25 13:57:29 +01:00
Björn Esser
c05e6542dc Update to 3.5.1 (#1321198) 2016-03-25 09:32:55 +01:00
Björn Esser
3e7824e73e fix emacs-filesystem requires for epel6 2016-03-11 13:59:54 +01:00
Björn Esser
fde2ae1586 add conditional for epel6 2016-03-11 11:35:21 +01:00
Björn Esser
358d5037ae keep Help-directory and its contents in %%_datadir/%%name (#1316306) 2016-03-10 08:14:14 +01:00
Björn Esser
53adb49344 do not provide cmake = %%{version} on EPEL 2016-03-09 15:10:30 +01:00
Orion Poplawski
de26f88046 Update to 3.5.0 final 2016-03-08 19:19:57 -07:00
Björn Esser
e1335d4bc5 cleanup trailing whitespaces
remove el5 stuff
doc-subpkg should be noarch'ed
doc-subpkg should not require main-pkg
add %%{?_isa} to the applicable Requires
replaced %%define with %%global
handle macrosdir for rpm-macros properly
fix ownership of directories, add needed Requires
conditionalize appdata
handle docdir properly
generalize glob for man-pages independent of used compression
generalize for use as EPEL-package, too
use %%license instead of %%doc for license-files
split the common data-files into a noarch'ed subpackage
build html-docs and put them into the doc-subpkg
2016-03-07 22:50:37 +01:00
Orion Poplawski
026befaf78 3.5.0-rc2 no longer installs cmake-gui.1 if not building gui 2016-03-03 17:21:15 -07:00
Orion Poplawski
a095a5694a Update to 3.5.0-rc3 2016-02-20 19:27:11 -07:00
Orion Poplawski
d9dd44f586 Update to 3.5.0-rc2
- Drop dcmtk patch
2016-02-17 09:59:14 -07:00
Orion Poplawski
c17782d9ef Fix build without gui (bug #1305310) 2016-02-07 16:26:49 -07:00
Dennis Gilmore
eff08abe86 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 17:49:26 +00:00
Orion Poplawski
55a452d7d9 Update to 3.4.3 2016-01-25 18:36:08 -07:00
Orion Poplawski
256d595c98 Update to 3.4.2 2016-01-19 18:41:13 -07:00
Ville Skyttä
586c872b46 Use Python 3 on F-23+ 2015-12-12 19:17:40 +02:00
Orion Poplawski
0209ed3149 Use Qt5 for gui 2015-12-08 09:50:14 -07:00
Orion Poplawski
5c90ef161a Fixup some conditionals for RHEL7 2015-12-07 15:58:24 -07:00
Orion Poplawski
4ec33b2182 Update to 3.4.1 2015-12-02 17:13:33 -07:00
Orion Poplawski
190a49cf8c BR /usr/bin/sphinx-build instead of python-sphinx 2015-11-25 13:54:47 -07:00
Orion Poplawski
d2d60ad748 Update to 3.4.0 final 2015-11-16 22:15:19 -07:00
Orion Poplawski
8095fd3aac Update to 3.4.0-rc3 2015-11-05 19:42:36 -07:00
Orion Poplawski
d6aa4da9f8 Update to 3.4.0-rc2 2015-10-21 20:45:38 -06:00
Orion Poplawski
a002bb282c Update to 3.4.0-rc1 2015-10-06 17:16:55 -06:00
Orion Poplawski
4798c1522a Rebase python3.5 patch 2015-10-06 08:30:43 -06:00
Orion Poplawski
67b46d8a5a Add upstream patch to find python 3.5 (bug #1269095) 2015-10-06 08:16:17 -06:00
Orion Poplawski
f800a4a1a1 Fix test exclusion 2015-09-18 10:15:40 -06:00
Orion Poplawski
51dfc3fa04 Use %{__global_ldflags} 2015-09-17 22:29:49 -06:00
Orion Poplawski
0375260458 Update to 3.3.2 2015-09-17 21:15:06 -06:00
Orion Poplawski
4ccb585d3f Apply upstream patch to fix Fortran linker detection with redhat-hardened-ld
(bug #1260490)
2015-09-11 13:00:04 -06:00
Susi Lehtola
75771edc02 Whoops, forgot apostrophes. 2015-09-11 05:12:32 +02:00
Susi Lehtola
396dee4de0 Add missing patch. 2015-09-11 05:05:50 +02:00
Orion Poplawski
4e6b717c50 Apply upstream patch to fix trycompile output (bug #1260490) 2015-09-09 22:22:00 -06:00
Rex Dieter
c61fc84029 pull in some upstream fixes (FindPkgConfig,boost-1.59) 2015-08-25 11:28:59 -05:00
Rex Dieter
f091375c19 Provides: bundled(kwsys)
See https://fedorahosted.org/fpc/ticket/555
2015-08-21 07:17:15 -05:00
Orion Poplawski
038fdb47c3 Update to 3.3.1 2015-08-13 20:47:10 -06:00
Orion Poplawski
3c97440511 Exclude CMake.FileDownload test 2015-07-24 07:15:41 -06:00
Orion Poplawski
c9a8b5fe82 Update to 3.3.0 2015-07-23 22:24:08 -06:00
Orion Poplawski
8a4fed743d Update to 3.3.0-rc3
- Fix cmake.attr to handle 32-bit libraries
2015-07-09 12:31:26 -06:00
Orion Poplawski
65f7569734 Update to 3.3.0-rc2 2015-06-23 21:45:46 -06:00
Dennis Gilmore
8e153c4a5c - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 02:52:15 +00:00
Orion Poplawski
bdee19cd9f Update to 3.3.0-rc1 2015-06-08 14:20:31 -06:00
Orion Poplawski
7c34aa420c Update to 3.2.3 2015-06-08 10:46:58 -06:00
Orion Poplawski
8856b5c221 Update to 3.2.2 2015-04-15 09:46:31 -06:00
Richard Hughes
b3ac9802d4 Add an AppData file for the software center 2015-03-26 16:07:07 +00:00
Jan Grulich
9a29aa1646 cmake.prov: handle exceptions 2015-03-23 10:18:31 +01:00
Rex Dieter
35c8f502e7 cmake.prov: use /usr/bin/python (instead of /bin/python) 2015-03-18 05:06:38 -05:00
Rex Dieter
de493a3f77 RFE: CMake automatic RPM provides (#1202899) 2015-03-17 17:41:11 -05:00
Orion Poplawski
ca739f559d Update to 3.2.1 2015-03-11 10:26:18 -06:00
Orion Poplawski
1261626b3a Drop various patches/workarounds
- Drop C++11 ABI workaround, fixed in gcc
- Drop strict_aliasing patch fixed upstream long ago
- Drop FindLua52, FindLua should work now for 5.1-5.3
2015-02-26 17:28:03 -07:00
Orion Poplawski
cfe5d737b4 Update to 3.2.0-rc2 2015-02-26 17:12:36 -07:00
Orion Poplawski
a10ffafd5c Use C90/C++98 until C++11 issues are sorted 2015-02-16 15:02:44 -07:00
Orion Poplawski
cfb60aeafe Add BR jsoncpp-devel 2015-02-15 22:29:41 -07:00
Orion Poplawski
ad69af3eb0 Update to 3.2.0-rc1
- Drop ninja patch fixed upstream
- Upstream now ships icons, add icon-cache scriptlets
2015-02-15 22:20:08 -07:00
Orion Poplawski
2f03d1934f Update to 3.1.3 2015-02-13 16:16:47 -07:00
Orion Poplawski
bc96ee0a7c Update to 3.1.2 2015-02-07 16:47:37 -07:00
Orion Poplawski
5bff65f222 Update to 3.1.1
- Drop ruby patch applied upstream
2015-01-23 15:06:54 -07:00
Mamoru TASAKA
f4c732aafc Fix ruby 2.2.0 teeny (0) detection 2015-01-17 16:15:45 +09:00
Orion Poplawski
a4a401c76b Update to 3.1.0 final 2014-12-17 18:45:45 -07:00
Orion Poplawski
7c502cd9c9 Update to 3.1.0-rc2 2014-11-15 13:08:48 -07:00
Orion Poplawski
1a3b67e2a7 Fix findruby patch 2014-10-29 20:49:50 -06:00
Orion Poplawski
976c67ca52 Rebase findruby patch 2014-10-29 20:47:42 -06:00
Orion Poplawski
8a4e1b06b8 Use BR xz-devel 2014-10-29 20:37:54 -06:00
Orion Poplawski
6500e56855 Add BR lzma-devel 2014-10-29 20:16:55 -06:00
Orion Poplawski
eafd6cd491 Update to 3.1.0-rc1 2014-10-29 19:56:30 -06:00
Orion Poplawski
ea483bb34c fix FindJNI for ppc64le (#1141782) 2014-10-29 19:53:11 -06:00
Dan Horák
9f76ff0a0e - fix FindJNI for ppc64le (#1141782) 2014-09-15 17:32:54 +02:00
Orion Poplawski
57c38184f6 Update to 3.0.2 2014-09-14 20:22:21 -06:00
Orion Poplawski
e411e9f683 Update wxWidgets patches 2014-08-25 09:38:00 -06:00
Peter Robinson
f54d18f1c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-16 00:36:32 +00:00
Orion Poplawski
b007620a21 Update to 3.0.1 2014-08-06 15:33:26 -06:00
Rex Dieter
300b41d728 optimize mimeinfo scriptlet 2014-07-03 14:35:00 -05:00
Orion Poplawski
8c3218e759 Update to 3.0.0 final 2014-06-14 20:59:44 -06:00
Dennis Gilmore
f50dce5521 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 00:10:56 -05:00
Orion Poplawski
838b94ac4a Update to 3.0.0-rc6 2014-05-27 16:55:42 -06:00
Orion Poplawski
727224fd82 Update to 3.0.0-rc5
- Drop icon patch applied upstream
2014-05-14 21:33:02 -06:00
Orion Poplawski
24519e8481 Update to 3.0.0-rc4 2014-04-22 20:01:19 -06:00
Orion Poplawski
976bc84c13 Bump release and add changelog entry 2014-04-10 15:37:52 -06:00
Orion Poplawski
32baf2a5bb Fix doc duplication 2014-04-10 15:36:45 -06:00
Orion Poplawski
25463ee3bb rebase patches 2014-04-04 09:44:30 -06:00
Orion Poplawski
491914b7e0 Rebase patches to prevent .orig files in Modules
Add install check for .orig files
2014-04-04 09:34:30 -06:00
Orion Poplawski
74892e312d Add patch to fix FindwxWidgets when cross-compiling for Windows (bug #1081207) 2014-03-26 20:01:17 -06:00
Orion Poplawski
882bf0a996 Update to 3.0.0-rc3 2014-03-26 19:57:15 -06:00
Orion Poplawski
cdf5b80727 Add additional FindPythonLibs patch from upstream (bug #1072964) 2014-03-05 10:10:19 -07:00
Orion Poplawski
1f8a36aeea Revert to Fedora version of FindPythonLibs patch (bug #1072964) 2014-03-05 10:01:05 -07:00
Orion Poplawski
e7d7e1f36e Update to upstreams version of FindPythonLibs patch 2014-03-03 09:20:13 -07:00
Orion Poplawski
99566ad31d Use symlinks for bash completions 2014-03-03 08:51:19 -07:00
Orion Poplawski
8aa5a69612 Add BR python-sphinx 2014-02-28 14:58:35 -07:00
Orion Poplawski
862a9416ba Update to 3.0.0-rc1
- Update qtdeps patch to upstreamed version
- Install bash completions
2014-02-28 14:48:52 -07:00
Orion Poplawski
496495b0bd Add upstream patch to find Boost MPI library (bug #756141) 2014-02-11 08:42:10 -07:00
Orion Poplawski
65dd936a49 Update to 2.8.12.2 2014-01-28 13:54:41 -07:00
Orion Poplawski
960dc151d9 Fix FindFreetype for 2.5.1+ 2014-01-22 20:37:31 -07:00
Orion Poplawski
8b47c8b2d8 Update to 2.8.12.1 2013-11-06 13:16:49 -07:00
Orion Poplawski
d1560ef06c Remove UseQt4 automatic dependency adding 2013-10-23 11:09:46 -06:00
Orion Poplawski
1b2f353be6 Add the cmake-init.el file 2013-10-10 16:37:30 -06:00
Orion Poplawski
c5a90aac0c Autoload cmake-mode in emacs (bug #1017779) 2013-10-10 16:32:26 -06:00
Orion Poplawski
0059c15daa Update to 2.8.12 final 2013-10-08 20:12:14 -06:00
Orion Poplawski
05e896fc7b Update to 2.8.12-rc4
- Drop upstreamed FindHD5 patch
2013-10-01 20:24:33 -06:00
Orion Poplawski
f068c62b0c Add patch to fix FindHDF5 2013-09-19 15:07:34 -06:00
Orion Poplawski
830d0b05e0 Update to 2.8.12-rc3 2013-09-17 16:04:51 -06:00
Orion Poplawski
8e7e28a622 Update to 2.8.12-rc2 2013-09-04 09:49:20 -06:00
Orion Poplawski
0ad564af9c Split docs into separate -doc sub-package 2013-08-28 11:22:12 -06:00
Orion Poplawski
f5ec53abcc Add patch to fix FindPythonLibs issues (bug #876118) 2013-08-28 11:00:53 -06:00
Orion Poplawski
314d5f5b5d Use unversioned doc dir fix 2013-08-26 21:25:52 -06:00
Orion Poplawski
8059b972fd - Update to 2.8.12-rc1
- Drop ImageMagick patch - not needed
2013-08-26 21:04:25 -06:00
Orion Poplawski
a96004dd80 Use version-less docdir 2013-07-26 17:14:37 -06:00
Petr Machata
d48ae7c8e0 Icon name in desktop file should be sans .png extension. 2013-07-25 18:52:52 +02:00
Petr Machata
2da4c96178 Pass -fno-strict-aliasing to cm_sha2.c 2013-07-25 17:59:28 +02:00
Orion Poplawski
6a3c645d91 Update to 2.8.11.2 release 2013-07-09 15:46:56 -06:00
Orion Poplawski
271af7e940 Update to 2.8.11.1 release 2013-06-10 10:06:25 -06:00
Orion Poplawski
f97a06b336 Update to 2.8.11 release 2013-05-18 20:17:13 -06:00
Tom Callaway
345aeea69e add FindLua52.cmake 2013-05-13 10:02:05 -04:00
Orion Poplawski
2e76927bf7 Update to 2.8.11-rc4 2013-05-09 09:06:54 -06:00
Orion Poplawski
5fd05e2453 Update to 2.8.11-rc3 2013-04-19 21:15:58 -06:00
Orion Poplawski
f9924193e8 Drop -O3 from default release build type flags in cmake rpm macro (bug 875954) 2013-04-18 09:59:15 -06:00
Orion Poplawski
44545375b1 - Update to 2.8.11-rc2
- Rebase ImageMagick patch
2013-04-17 19:30:21 -06:00
Rex Dieter
edc556d31e drop/omit backup files when applying patches 2013-03-18 10:49:34 -05:00
Rex Dieter
2b84e70617 respin cmake-2.8.11-rc1-IM_pkgconfig_hints.patch 2013-03-18 09:19:56 -05:00
Rex Dieter
b28dbeddc3 Patch FindImageMagick.cmake for newer ImageMagick versions 2013-03-16 20:33:28 -05:00
Rex Dieter
9216640ab5 use %{_rpmconfigdir}/macros.d on f19+ 2013-03-16 15:26:13 -05:00
Orion Poplawski
b6d7b89251 - Update to 2.8.11-rc1
- Drop upstream ccmake and usrmove patches
2013-03-15 20:42:58 -06:00
Orion Poplawski
5deb9f6656 - Add patch from upstream to fix UsrMove handling (bug #917407)
- Drop %config from rpm macros
- Define FCFLAGS in cmake macro
2013-03-13 14:20:58 -06:00
Orion Poplawski
52ebbb1916 Drop %%config from rpm macros 2013-03-08 11:46:26 -07:00
Orion Poplawski
301a3e914a Define FCFLAGS in cmake macro 2013-02-22 15:27:16 -07:00
Orion Poplawski
c3e8dd85cf Add patch to use ninja-build (bug #886184) 2013-02-08 09:35:42 -07:00
Orion Poplawski
556b25d625 Update FindPostgreSQL patch to use PostgreSQL_LIBRARY (bug #903757) 2013-01-24 21:35:32 -07:00
Tomas Bzatek
6971045d5f Rebuilt for new libarchive 2013-01-17 14:06:22 +01:00
Rex Dieter
b185be1d55 2.8.10.2 2012-11-27 16:47:03 -06:00
Orion Poplawski
21d7794e65 Update to 2.8.10.1 2012-11-08 21:28:20 -07:00
17 changed files with 1748 additions and 432 deletions

30
.gitignore vendored
View File

@ -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
View 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
View 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

View 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()

View File

@ -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 )

View File

@ -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);
}

View File

@ -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}

View 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 ")

View File

@ -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
View 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
View 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
View 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
View 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
View 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()

1314
cmake.spec

File diff suppressed because it is too large Load Diff

View File

@ -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 %{**}

View File

@ -1 +1 @@
d4aef1eab859df61d2664721a72732c0 cmake-2.8.10.tar.gz
SHA512 (cmake-3.18.4.tar.gz) = 2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9