Next

CMakeLists.txt

@@ -13,18 +13,24 @@ include(${CMAKE_SOURCE_DIR}/cmake/maintainer_mode.cmake)
 project(NTIRPC C)
 
 # version numbers
-set(NTIRPC_MAJOR_VERSION 1)
-set(NTIRPC_MINOR_VERSION 7)
-set(NTIRPC_PATCH_LEVEL 1)
+set(NTIRPC_MAJOR_VERSION 3)
+# This is .0 for a release, .N for a stable branch, blank for development
+set(NTIRPC_MINOR_VERSION .2)
+# -something for dev releases
+set(NTIRPC_VERSION_EXTRA )
 set(VERSION_COMMENT
   "Full-duplex and bi-directional ONC RPC on TCP."
 )
 # version string used for packaging
 set(NTIRPC_VERSION
-  "${NTIRPC_MAJOR_VERSION}.${NTIRPC_MINOR_VERSION}.${NTIRPC_PATCH_LEVEL}")
+  "${NTIRPC_MAJOR_VERSION}${NTIRPC_MINOR_VERSION}${NTIRPC_VERSION_EXTRA}")
+set(NTIRPC_VERSION_BASE
+  "${NTIRPC_MAJOR_VERSION}${NTIRPC_MINOR_VERSION}")
 # Up scope for embedding in ganesha
 set(NTIRPC_VERSION_EMBED "${NTIRPC_VERSION}" PARENT_SCOPE)
-set(NTIRPC_ABI_EMBED "${NTIRPC_MAJOR_VERSION}.${NTIRPC_MINOR_VERSION}" PARENT_SCOPE)
+set(NTIRPC_VERSION_BASE_EMBED "${NTIRPC_VERSION_BASE}" PARENT_SCOPE)
+set(NTIRPC_VERSION_EXTRA_EMBED "${NTIRPC_VERSION_EXTRA}" PARENT_SCOPE)
+set(NTIRPC_ABI_EMBED "${NTIRPC_MAJOR_VERSION}${NTIRPC_MINOR_VERSION}" PARENT_SCOPE)
 
 set( PACKNAME "${NTIRPC_VERSION}" )
 
@@ -180,6 +186,8 @@ include_directories(BEFORE
   "${EXTRA_INCLUDE_DIR}"
 )
 
+find_library(LIBURCU urcu-bp)
+
 # Find misc system libs
 find_library(LIBRT rt)   # extended Pthreads functions
 
@@ -188,6 +196,7 @@ set(SYSTEM_LIBRARIES
   ${KRB5_LIBRARIES}
   ${SYSTEM_LIBRARIES}
   ${LIBRT}
+  ${LIBURCU}
 )
 
 if (NOT FREEBSD)
@@ -252,8 +261,6 @@ configure_file(
 )
 
 if (NOT TARGET dist)
-# Define CPACK component (to deal with sub packages)
-set(CPACK_COMPONENTS_ALL daemon fsal headers )
 set(CPACK_COMPONENT_DAEMON_DISPLAY_NAME "libntirpc")
 
 # Include custom config and cpack module
@@ -264,6 +271,20 @@ set( PKG_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.tar.gz")
 	add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 endif (NOT TARGET dist)
 
+if (NOT TARGET rpm)
+add_custom_target( rpm DEPENDS dist)
+add_custom_command(TARGET rpm
+                  COMMAND sh -c "rpmbuild -ta ${PKG_NAME}"
+		  VERBATIM
+		  DEPENDS dist)
+
+set(RPMDEST "--define '_srcrpmdir ${CMAKE_CURRENT_BINARY_DIR}'")
+add_custom_target( srpm DEPENDS dist)
+add_custom_command(TARGET srpm
+                  COMMAND sh -c "rpmbuild ${RPMDEST} -ts ${PKG_NAME}"
+		  VERBATIM
+		  DEPENDS dist)
+endif (NOT TARGET rpm)
 ########### install files ###############
 
 install(FILES  ${PROJECT_BINARY_DIR}/libntirpc.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)

cmake/modules/FindLTTng.cmake

@@ -40,10 +40,9 @@ find_path(LTTNG_LIBRARY_DIR
           DOC "The LTTng libraries")
 
 find_library(LTTNG_UST_LIBRARY lttng-ust PATHS ${LTTNG_LIBRARY_DIR})
-find_library(URCU_LIBRARY urcu-bp PATHS ${LTTNG_LIBRARY_DIR})
 find_library(UUID_LIBRARY uuid)
 
-set(LTTNG_LIBRARIES ${LTTNG_UST_LIBRARY} ${URCU_LIBRARY} ${UUID_LIBRARY})
+set(LTTNG_LIBRARIES ${LTTNG_UST_LIBRARY} ${UUID_LIBRARY})
 
 find_path(LTTNG_CTL_INCLUDE_DIR
           NAMES lttng/lttng.h

config-h.in.cmake

@@ -25,9 +25,9 @@
 #define PACKAGE "libntirpc"
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_NAME "libntirpc"
-#define PACKAGE_STRING "libntirpc ${NTIRPC_VERSION_MAJOR}.${NTIRPC_VERSION_MINOR}.${NTIRPC_PATCH_LEVEL}"
+#define PACKAGE_STRING "libntirpc ${NTIRPC_VERSION_MAJOR}${NTIRPC_VERSION_MINOR}"
 #define PACKAGE_TARNAME "libntirpc"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "${NTIRPC_VERSION_MAJOR}.${NTIRPC_VERSION_MINOR}.${NTIRPC_PATCH_LEVEL}"
+#define PACKAGE_VERSION "${NTIRPC_VERSION_MAJOR}${NTIRPC_VERSION_MINOR}"
 
 #endif /* CONFIG_H */

libntirpc.spec-in.cmake

@@ -53,8 +53,8 @@ install -p -m 0755 src/%{name}.so.%{version} %{buildroot}%{_libdir}/
 ln -s %{name}.so.%{version} %{buildroot}%{_libdir}/%{name}.so.1
 ln -s %{name}.so.%{version} %{buildroot}%{_libdir}/%{name}.so
 mkdir -p %{buildroot}%{_includedir}/ntirpc
-cp -a ntirpc %{buildroot}%{_includedir}/
-install -p -m 644 libntirpc.pc %{buildroot}%{_libdir}/pkgconfig/
+
+make DESTDIR=%{buildroot} install
 
 %post -p /sbin/ldconfig