Skip to content

Commit 5b55c72

Browse files
committed
Set VERSION in 'project'
1 parent 1f8938e commit 5b55c72

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

CMakeLists.txt

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8)
2-
project(Foo)
3-
4-
add_library(foo foo.cpp)
5-
add_executable(boo foo.cpp)
6-
7-
install(TARGETS foo DESTINATION lib)
8-
install(TARGETS boo DESTINATION bin)
1+
cmake_minimum_required(VERSION 3.0)
92

103
string(COMPARE NOTEQUAL "$ENV{TRAVIS_TAG}" "" travis_deploy)
114
string(COMPARE EQUAL "$ENV{APPVEYOR_REPO_TAG}" "true" appveyor_deploy)
@@ -18,13 +11,17 @@ else()
1811
set(version "v0.0.0")
1912
endif()
2013

21-
string(REGEX REPLACE "^v([0-9]+)\\.[0-9]+\\.[0-9]+$" "\\1" x "${version}")
22-
string(REGEX REPLACE "^v[0-9]+\\.([0-9]+)\\.[0-9]+$" "\\1" y "${version}")
23-
string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+)$" "\\1" z "${version}")
14+
string(REGEX REPLACE "^v" "" version "${version}")
15+
16+
project(Foo VERSION ${version})
17+
18+
add_library(foo foo.cpp)
19+
add_executable(boo foo.cpp)
20+
21+
install(TARGETS foo DESTINATION lib)
22+
install(TARGETS boo DESTINATION bin)
2423

25-
set(CPACK_PACKAGE_VERSION_MAJOR ${x})
26-
set(CPACK_PACKAGE_VERSION_MINOR ${y})
27-
set(CPACK_PACKAGE_VERSION_PATCH ${z})
24+
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
2825

2926
if(travis_deploy OR appveyor_deploy)
3027
string(COMPARE EQUAL "$ENV{CONFIG}" "Debug" debug_build)

0 commit comments

Comments
 (0)