From cffd5c74c1326991c6883e348963b70a8ec6f736 Mon Sep 17 00:00:00 2001 From: "Vysochyn, Illia" Date: Wed, 5 Feb 2025 17:39:46 +0000 Subject: [PATCH] feature: Add cmake flag NEO_BUILD_UNVERSIONED_OCLOC Introduces the NEO_BUILD_UNVERSIONED_OCLOC flag (defaults to FALSE) that builds ocloc without a version suffix if set to TRUE. The default behavior is to build a versioned one. Applies only to UNIX-family systems. Related-To: NEO-13060 Signed-off-by: Vysochyn, Illia Source: f96fc552b2ef64e32c22385f3af3d194a281f628 --- CMakeLists.txt | 3 +++ shared/offline_compiler/source/CMakeLists.txt | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48f387d9bf..6816f7d54d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -530,6 +530,9 @@ endif() if(NOT DEFINED NEO_OCLOC_VERSION_MODE) set(NEO_OCLOC_VERSION_MODE "1") endif() +if(NOT DEFINED NEO_BUILD_UNVERSIONED_OCLOC) + set(NEO_BUILD_UNVERSIONED_OCLOC FALSE) +endif() include(platforms.cmake) list(LENGTH ALL_PRODUCT_FAMILY_LIST ALL_PRODUCT_FAMILY_LIST_COUNT) if(1 EQUAL ${ALL_PRODUCT_FAMILY_LIST_COUNT}) diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt index f2bb5b9439..300c6fae81 100644 --- a/shared/offline_compiler/source/CMakeLists.txt +++ b/shared/offline_compiler/source/CMakeLists.txt @@ -469,7 +469,9 @@ elseif(UNIX) set(NEO_OCLOC_FORMER_LIB_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${OCLOC_NAME}${NEO__LEGACY_NAME_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() - set(OCLOC_OUTPUT_NAME_SUFFIX "-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE}") + if(NOT NEO_BUILD_UNVERSIONED_OCLOC) + set(OCLOC_OUTPUT_NAME_SUFFIX "-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE}") + endif() endif() set_target_properties(${OCLOC_NAME} PROPERTIES OUTPUT_NAME ${OCLOC_NAME}${OCLOC_OUTPUT_NAME_SUFFIX}) set_target_properties(${OCLOC_NAME}_lib PROPERTIES OUTPUT_NAME ${OCLOC_NAME}${LIBOCLOC_OUTPUT_NAME_SUFFIX})