From 1bbc5fec8bdec46233c3d9d090dc207bd84d4e31 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Fri, 28 Feb 2020 17:47:28 -0600 Subject: [PATCH] Updating HEX version for 0.2.0: 0x200 --- CMakeLists.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e30009c..a005baf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules") ################ PROJECT VERSION #################### set(PROJECT_VERSION_FULL "0.2.0-dev1") set(PROJECT_SO_VERSION 7) -set(HEX_VERSION_OVERRIDE "0x109") # For CMake < 3.13 +set(HEX_VERSION_OVERRIDE "0x200") # For CMake < 3.13 # Remove the dash and anything following, to get the #.#.# version for project() STRING(REGEX REPLACE "\-.*$" "" VERSION_NUM "${PROJECT_VERSION_FULL}") @@ -56,15 +56,10 @@ STRING(REGEX REPLACE "\-.*$" "" VERSION_NUM "${PROJECT_VERSION_FULL}") # PROJECT_VERSION_PATCH, libopenshot-audio_VERSION_PATCH PROJECT(libopenshot-audio LANGUAGES C CXX VERSION ${VERSION_NUM}) -# JuceHeader.h needs a hexadecimal version number for the project -if(CMAKE_VERSION VERSION_LESS 3.13) - set(PROJECT_VERSION_HEX ${HEX_VERSION_OVERRIDE}) # Ugly hardcoding -else() - math(EXPR PROJECT_VERSION_HEX - "(${PROJECT_VERSION_MAJOR} << 16) + \ +math(EXPR PROJECT_VERSION_HEX +"(${PROJECT_VERSION_MAJOR} << 16) + \ (${PROJECT_VERSION_MINOR} << 8) + \ (${PROJECT_VERSION_PATCH})" OUTPUT_FORMAT HEXADECIMAL ) -endif() message("\ Generating build files for ${PROJECT_NAME} \