From 35d1ba003d8104a523ebdc38296046d7ef300a34 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 17 Feb 2021 12:00:51 +0800 Subject: [PATCH] ceph.spec.in: specify cmake variable type for better readablity Signed-off-by: Kefu Chai --- ceph.spec.in | 66 ++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 8d4825311b9..1dbef9fc280 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -1215,72 +1215,72 @@ env | sort mkdir build cd build %cmake .. \ - -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ - -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \ - -DCMAKE_INSTALL_LOCALSTATEDIR=%{_localstatedir} \ - -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ - -DCMAKE_INSTALL_MANDIR=%{_mandir} \ - -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \ - -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ - -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=%{_unitdir} \ - -DWITH_MANPAGE=ON \ - -DWITH_PYTHON3=%{python3_version} \ - -DWITH_MGR_DASHBOARD_FRONTEND=OFF \ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ + -DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \ + -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=%{_localstatedir} \ + -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \ + -DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \ + -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/ceph \ + -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{_unitdir} \ + -DWITH_MANPAGE:BOOL=ON \ + -DWITH_PYTHON3:STRING=%{python3_version} \ + -DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF \ %if 0%{without ceph_test_package} - -DWITH_TESTS=OFF \ + -DWITH_TESTS:BOOL=OFF \ %endif %if 0%{with cephfs_java} - -DWITH_CEPHFS_JAVA=ON \ + -DWITH_CEPHFS_JAVA:BOOL=ON \ %endif %if 0%{with selinux} - -DWITH_SELINUX=ON \ + -DWITH_SELINUX:BOOL=ON \ %endif %if %{with lttng} - -DWITH_LTTNG=ON \ - -DWITH_BABELTRACE=ON \ + -DWITH_LTTNG:BOOL=ON \ + -DWITH_BABELTRACE:BOOL=ON \ %else - -DWITH_LTTNG=OFF \ - -DWITH_BABELTRACE=OFF \ + -DWITH_LTTNG:BOOL=OFF \ + -DWITH_BABELTRACE:BOOL=OFF \ %endif $CEPH_EXTRA_CMAKE_ARGS \ %if 0%{with ocf} - -DWITH_OCF=ON \ + -DWITH_OCF:BOOL=ON \ %endif %if 0%{with cephfs_shell} - -DWITH_CEPHFS_SHELL=ON \ + -DWITH_CEPHFS_SHELL:BOOL=ON \ %endif %if 0%{with libradosstriper} - -DWITH_LIBRADOSSTRIPER=ON \ + -DWITH_LIBRADOSSTRIPER:BOOL=ON \ %else - -DWITH_LIBRADOSSTRIPER=OFF \ + -DWITH_LIBRADOSSTRIPER:BOOL=OFF \ %endif %if 0%{with amqp_endpoint} - -DWITH_RADOSGW_AMQP_ENDPOINT=ON \ + -DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=ON \ %else - -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \ + -DWITH_RADOSGW_AMQP_ENDPOINT:BOOL=OFF \ %endif %if 0%{with kafka_endpoint} - -DWITH_RADOSGW_KAFKA_ENDPOINT=ON \ + -DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=ON \ %else - -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \ + -DWITH_RADOSGW_KAFKA_ENDPOINT:BOOL=OFF \ %endif %if 0%{without lua_packages} - -DWITH_RADOSGW_LUA_PACKAGES=OFF \ + -DWITH_RADOSGW_LUA_PACKAGES:BOOL=OFF \ %endif %if 0%{with zbd} - -DWITH_ZBD=ON \ + -DWITH_ZBD:BOOL=ON \ %endif %if 0%{with cmake_verbose_logging} - -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ %endif %if 0%{with rbd_rwl_cache} - -DWITH_RBD_RWL=ON \ + -DWITH_RBD_RWL:BOOL=ON \ %endif %if 0%{with rbd_ssd_cache} - -DWITH_RBD_SSD_CACHE=ON \ + -DWITH_RBD_SSD_CACHE:BOOL=ON \ %endif - -DBOOST_J=$CEPH_SMP_NCPUS \ - -DWITH_GRAFANA=ON + -DBOOST_J:STRING=$CEPH_SMP_NCPUS \ + -DWITH_GRAFANA:BOOL=ON %if %{with cmake_verbose_logging} cat ./CMakeFiles/CMakeOutput.log