diff options
author | Kefu Chai <kchai@redhat.com> | 2019-07-24 18:57:27 +0200 |
---|---|---|
committer | Kefu Chai <kchai@redhat.com> | 2019-08-02 16:09:12 +0200 |
commit | bbb69fe793948d0791e29f547e18f8fa996c32ea (patch) | |
tree | 622e1fa7b99251567a3513daff25c00fbe0c052f /make-dist | |
parent | install-deps.sh: install cmake 3.10.2 and up on xenial (diff) | |
download | ceph-bbb69fe793948d0791e29f547e18f8fa996c32ea.tar.xz ceph-bbb69fe793948d0791e29f547e18f8fa996c32ea.zip |
cmake: require CMake v3.10.2
since we dropped the support of xenial, we now have the luxury of using
newer CMake! and by using CMake 3.10.2, we can prevent libfmt from
assuming that we are using C++11, and hence set `CMAKE_CXX_STANDARD` to
11, which will literally append `-std=gnu++11` to `CMAKE_CXX_FLAGS`.
the last `-std` option passed to `g++` takes precendence.
since we've switched over to C++17, and we are using C++17 features.
so, using cmake older than 3.8 breaks the build. because it is CMake 3.8
which stared support `CMAKE_CXX_STANDARD` 17.
- for bionic: https://packages.ubuntu.com/bionic/cmake : 3.10.2
- for CentOS7:
https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ : 3.13.5
so in this change,
* bump up the required version to v3.10.2
* cleanups to wipe out the workaround for lower CMake versions
* use `PROJECT_VERSION` defined by `project()` command instead of
`VERSION` explicitly defined.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'make-dist')
-rwxr-xr-x | make-dist | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make-dist b/make-dist index abbda64cef4..733d4cbb676 100755 --- a/make-dist +++ b/make-dist @@ -116,7 +116,7 @@ echo "including src/.git_version, ceph.spec" for spec in ceph.spec.in alpine/APKBUILD.in; do cat $spec | - sed "s/@VERSION@/$rpm_version/g" | + sed "s/@PROJECT_VERSION@/$rpm_version/g" | sed "s/@RPM_RELEASE@/$rpm_release/g" | sed "s/@TARBALL_BASENAME@/ceph-$version/g" > `echo $spec | sed 's/.in$//'` done |