diff --git a/CMakeLists.txt b/CMakeLists.txt index 08126f09..d51adffa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,10 @@ cmake_minimum_required(VERSION 3.16) -project(colobot C CXX) +project(colobot + VERSION 0.2.1.0 + LANGUAGES C CXX +) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED YES) @@ -15,9 +18,6 @@ set(CMAKE_CXX_EXTENSIONS NO) # Project version ## set(COLOBOT_VERSION_CODENAME "Gold") -set(COLOBOT_VERSION_MAJOR 0) -set(COLOBOT_VERSION_MINOR 2) -set(COLOBOT_VERSION_REVISION 1) # Used on official releases #set(COLOBOT_VERSION_RELEASE_CODENAME "-alpha") @@ -42,10 +42,10 @@ if(DEFINED COLOBOT_VERSION_UNRELEASED) set(COLOBOT_VERSION_DISPLAY "${COLOBOT_VERSION_CODENAME}-${COLOBOT_VERSION_UNRELEASED}") endif() else() - set(COLOBOT_VERSION_DISPLAY "${COLOBOT_VERSION_MAJOR}.${COLOBOT_VERSION_MINOR}.${COLOBOT_VERSION_REVISION}${COLOBOT_VERSION_RELEASE_CODENAME}") + set(COLOBOT_VERSION_DISPLAY "${CMAKE_PROJECT_VERSION}${COLOBOT_VERSION_RELEASE_CODENAME}") endif() -set(COLOBOT_VERSION_FULL "${COLOBOT_VERSION_MAJOR}.${COLOBOT_VERSION_MINOR}.${COLOBOT_VERSION_REVISION}${COLOBOT_VERSION_UNRELEASED}${COLOBOT_VERSION_RELEASE_CODENAME}") +set(COLOBOT_VERSION_FULL "${CMAKE_PROJECT_VERSION}${COLOBOT_VERSION_UNRELEASED}${COLOBOT_VERSION_RELEASE_CODENAME}") message(STATUS "Building Colobot \"${COLOBOT_VERSION_CODENAME}\" (${COLOBOT_VERSION_FULL})") set(BUILD_NUMBER 0) diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt index 5723e9b8..00c4e56f 100644 --- a/desktop/CMakeLists.txt +++ b/desktop/CMakeLists.txt @@ -156,12 +156,7 @@ if(PLATFORM_MACOSX) endif(PLATFORM_MACOSX) if(PLATFORM_WINDOWS) - if(COLOBOT_VERSION_REVISION MATCHES "([0-9]+)\\.([0-9]+)") - string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1,\\2" COLOBOT_VERSION_REVISION_COMMA "${COLOBOT_VERSION_REVISION}") - set(COLOBOT_VERSION_4COMMAS "${COLOBOT_VERSION_MAJOR},${COLOBOT_VERSION_MINOR},${COLOBOT_VERSION_REVISION_COMMA}") - else() - set(COLOBOT_VERSION_4COMMAS "${COLOBOT_VERSION_MAJOR},${COLOBOT_VERSION_MINOR},${COLOBOT_VERSION_REVISION},0") - endif() + set(COLOBOT_VERSION_4COMMAS "${CMAKE_PROJECT_VERSION_MAJOR},${CMAKE_PROJECT_VERSION_MINOR},${CMAKE_PROJECT_VERSION_PATCH},${CMAKE_PROJECT_VERSION_TWEAK}") configure_file(colobot.rc.cmake ${CMAKE_CURRENT_BINARY_DIR}/colobot.rc) endif(PLATFORM_WINDOWS) @@ -175,9 +170,9 @@ set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../README.md") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Colobot: Gold Edition") set(CPACK_PACKAGE_VENDOR "TerranovaTeam") -set(CPACK_PACKAGE_VERSION_MAJOR ${COLOBOT_VERSION_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${COLOBOT_VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${COLOBOT_VERSION_REVISION}) +set(CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_PROJECT_VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${CMAKE_PROJECT_VERSION_MINOR}) +set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_PROJECT_VERSION_PATCH}) if(PLATFORM_WINDOWS) set(CPACK_STRIP_FILES TRUE)