Merge pull request #667 from igchor/fix_obj_version

Szymon Romik · web-flow · commit 39842b7f7740 · 2020-02-26T12:11:35.000+01:00
Only parse libpmemobj version if it matches a pattern (major[.]minor.*)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2018-2019, Intel Corporation
+# Copyright 2018-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -128,7 +128,7 @@ if(BUILD_TESTS OR BUILD_EXAMPLES)
 		find_package(LIBPMEMOBJ REQUIRED 1.4)
 	endif()
 
-	if (LIBPMEMOBJ_VERSION)
+	if (LIBPMEMOBJ_VERSION AND LIBPMEMOBJ_VERSION MATCHES "[0-9]+[.][0-9]+.*")
 		string(REGEX REPLACE "\\+git.*" "" LIBPMEMOBJ_VERSION_SHORT ${LIBPMEMOBJ_VERSION})
 		string(REGEX REPLACE "-rc.*" "" LIBPMEMOBJ_VERSION_SHORT ${LIBPMEMOBJ_VERSION_SHORT})
 		string(REPLACE "." ";" VERSION_LIST ${LIBPMEMOBJ_VERSION_SHORT})

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright 2018-2019, Intel Corporation`
	`2`	`+# Copyright 2018-2020, Intel Corporation`
`3`	`3`	`#`
`4`	`4`	`# Redistribution and use in source and binary forms, with or without`
`5`	`5`	`# modification, are permitted provided that the following conditions`
`@@ -128,7 +128,7 @@ if(BUILD_TESTS OR BUILD_EXAMPLES)`
`128`	`128`	`find_package(LIBPMEMOBJ REQUIRED 1.4)`
`129`	`129`	`endif()`
`130`	`130`
`131`		`- if (LIBPMEMOBJ_VERSION)`
	`131`	`+ if (LIBPMEMOBJ_VERSION AND LIBPMEMOBJ_VERSION MATCHES "[0-9]+[.][0-9]+.*")`
`132`	`132`	`string(REGEX REPLACE "\\+git.*" "" LIBPMEMOBJ_VERSION_SHORT ${LIBPMEMOBJ_VERSION})`
`133`	`133`	`string(REGEX REPLACE "-rc.*" "" LIBPMEMOBJ_VERSION_SHORT ${LIBPMEMOBJ_VERSION_SHORT})`
`134`	`134`	`string(REPLACE "." ";" VERSION_LIST ${LIBPMEMOBJ_VERSION_SHORT})`