Commit Graph

543 Commits

Author SHA1 Message Date
Igor Raits
419924585f
Enable out-of-source builds
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-07-03 22:35:31 +02:00
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
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
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
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
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
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
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