From d56bf1f3de60c2c6913ca8851e1315936676de7e Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Tue, 3 May 2022 17:18:08 +0200 Subject: [PATCH 1/2] cmake better management of version name when double precision version --- src/common/CMakeLists.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index ad1c62a0b..8bd58ad3e 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -11,20 +11,24 @@ if (MESHLAB_IS_NIGHTLY_VERSION) WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" OUTPUT_VARIABLE GIT_SHA1 ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) - if (BUILD_WITH_DOUBLE_SCALAR) - set(MESHLAB_VERSION "${MESHLAB_VERSION}d") - endif() set(MESHLAB_VERSION "${MESHLAB_VERSION}_nightly_${GIT_SHA1}") else() if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../ML_VERSION") # YYYY and mm are read from file file(READ "${CMAKE_CURRENT_SOURCE_DIR}/../../ML_VERSION" MESHLAB_VERSION) endif() - # if double precision version, "d" is appended - if (BUILD_WITH_DOUBLE_SCALAR) - set(MESHLAB_VERSION "${MESHLAB_VERSION}d") - endif() endif() + +# if double precision version, "d" is inserted after 7 chars (YYYY.mmd*) +if (BUILD_WITH_DOUBLE_SCALAR) + string(LENGTH MESHLAB_VERSION MLV_LEN) + MATH(EXPR MLV_POSTFIX_LEN "${MLV_LEN}-7") # how many chars there are adter YYYY.mm + string(SUBSTRING ${MESHLAB_VERSION} 0 7 MLV_PREFIX) + string(SUBSTRING ${MESHLAB_VERSION} 7 ${MLV_POSTFIX_LEN} MLV_POSTFIX) + set(MESHLAB_VERSION "${MLV_PREFIX}d${MLV_POSTFIX}") +endif() + + set(MESHLAB_VERSION ${MESHLAB_VERSION} PARENT_SCOPE) message(STATUS "MeshLab version: ${MESHLAB_VERSION}") From 929512f256ab054441f09fe30c84523b93eaaa58 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 4 May 2022 09:48:58 +0200 Subject: [PATCH 2/2] fix meshlab version for double precision --- src/common/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 8bd58ad3e..bbe7f2930 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -21,7 +21,7 @@ endif() # if double precision version, "d" is inserted after 7 chars (YYYY.mmd*) if (BUILD_WITH_DOUBLE_SCALAR) - string(LENGTH MESHLAB_VERSION MLV_LEN) + string(LENGTH ${MESHLAB_VERSION} MLV_LEN) MATH(EXPR MLV_POSTFIX_LEN "${MLV_LEN}-7") # how many chars there are adter YYYY.mm string(SUBSTRING ${MESHLAB_VERSION} 0 7 MLV_PREFIX) string(SUBSTRING ${MESHLAB_VERSION} 7 ${MLV_POSTFIX_LEN} MLV_POSTFIX)