Merge pull request #7577 from tautschnig/cleanup/cmake-CBMC_VERSION

tautschnig · web-flow · commit de5f29c29bdb · 2023-03-06T18:40:43.000+01:00
CMake: clean up setting CMAKE_VERSION
diff --git a/jbmc/src/CMakeLists.txt b/jbmc/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(JBMC)
+project(JBMC VERSION ${CBMC_VERSION})
 
 #   Set the public include locations for a target.
 macro(generic_includes name)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,11 +1,3 @@
-file(STRINGS
-        "${CMAKE_CURRENT_SOURCE_DIR}/config.inc"
-        cbmc_version_string
-        REGEX "CBMC_VERSION.*")
-
-string(REGEX REPLACE "CBMC_VERSION = (.*)" "\\1" CBMC_VERSION "${cbmc_version_string}")
-unset(cbmc_version_string)
-
 project(CBMC VERSION ${CBMC_VERSION})
 
 find_package(BISON REQUIRED)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-project(JBMC)`
	`1`	`+project(JBMC VERSION ${CBMC_VERSION})`
`2`	`2`
`3`	`3`	`# Set the public include locations for a target.`
`4`	`4`	`macro(generic_includes name)`