Resolution for cmake target names conflicts

DEVTOOLS-9035

ref:2d37e3e9223ccf599361560aa5b1cfae6f0aa6c0

1 files changed, 5 insertions, 22 deletions

diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index ed28722c9d..a35ea5f154 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -1736,7 +1736,7 @@ module _BASE_PROGRAM: _LINK_UNIT {
     }
 }
 
-CPP_PROGRAM_SEM=add_executable $MODDIR $REALPRJNAME ${hide:TARGET} ${hide:AUTO_INPUT} \
+CPP_PROGRAM_SEM=add_executable $MODDIR $CMAKE_TARGET_NAME ${hide:TARGET} ${hide:AUTO_INPUT} $CMAKE_TARGET_ARTEFACT_RENAME_RULES \
                 && vcs_info \
                 && target_link_options PRIVATE $LDFLAGS $OBJADDE_LIB $OBJADDE \
                 && target_include_directories PRIVATE $_C__INCLUDE_OWNED \
@@ -2496,7 +2496,7 @@ module _LIBRARY: _BASE_UNIT {
     }
 }
 
-CPP_LIBRARY_SEM=add_library ${MODDIR} $REALPRJNAME ${hide:TARGET} ${hide:AUTO_INPUT} \
+CPP_LIBRARY_SEM=add_library ${MODDIR} $CMAKE_TARGET_NAME ${hide:TARGET} ${hide:AUTO_INPUT} $CMAKE_TARGET_ARTEFACT_RENAME_RULES \
                 && library_fake_marker FAKE_MODULE ${FAKE_MODULE} \
                 && consumer_link_library PUBLIC $CMAKE_LINK_TARGET \
                 && target_include_directories PUBLIC $_C__INCLUDE_GLOBAL \
@@ -2505,7 +2505,7 @@ CPP_LIBRARY_SEM=add_library ${MODDIR} $REALPRJNAME ${hide:TARGET} ${hide:AUTO_IN
                 && target_compile_options PUBLIC $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW \
                 && target_link_options INTERFACE $LDFLAGS_GLOBAL_RAW \
                 && add_language C && add_language CXX
-CPP_OBJ_LIBRARY_SEM=add_global_library_for ${MODDIR} ${suf=.global:REALPRJNAME} $REALPRJNAME ${hide:GLOBAL_TARGET} ${hide:AUTO_INPUT} \
+CPP_OBJ_LIBRARY_SEM=add_global_library_for ${MODDIR} ${suf=.global:CMAKE_TARGET_NAME} $CMAKE_TARGET_NAME ${hide:GLOBAL_TARGET} ${hide:AUTO_INPUT} \
                 && target_include_directories PUBLIC $_C__INCLUDE_GLOBAL \
                 && target_include_directories PRIVATE $_C__INCLUDE_OWNED \
                 && target_compile_options PRIVATE $USER_CFLAGS $USER_CXXFLAGS \
@@ -2637,7 +2637,7 @@ otherwise {
     LINK_FAT_OBJECT_CMD=$LINK_FAT_OBJECT_LIBRARY
 }
 
-FAT_OBJECT_SEM=add_fat_object ${MODDIR} ${REALPRJNAME} ${hide:TARGET} ${hide:AUTO_INPUT} \
+FAT_OBJECT_SEM=add_fat_object ${MODDIR} ${CMAKE_TARGET_NAME} ${hide:TARGET} ${hide:AUTO_INPUT} ${CMAKE_TARGET_ARTEFACT_RENAME_RULES} \
     && target_include_directories PRIVATE $_C__INCLUDE_OWNED \
     && target_compile_options PRIVATE $USER_CFLAGS $USER_CXXFLAGS \
     && set_global_flags FAT_OBJECT_PREFIX ${MODULE_PREFIX} \
@@ -2694,7 +2694,7 @@ _EXPORT_SCRIPT_SEM=
 macro _ADD_DYNLYB_SEM(Libname) {
     .SEM=add_library ${MODDIR} ${Libname} SHARED ${hide:TARGET} ${hide:AUTO_INPUT} && target_include_directories PUBLIC $_C__INCLUDE_GLOBAL && target_include_directories PRIVATE $_C__INCLUDE_OWNED && target_compile_options PRIVATE $USER_CFLAGS $USER_CXXFLAGS && target_compile_options PUBLIC $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW && vcs_info $_EXPORT_SCRIPT_SEM
 }
-CPP_DYN_LIBRARY_SEM=$_ADD_DYNLYB_SEM($REALPRJNAME)
+CPP_DYN_LIBRARY_SEM=$_ADD_DYNLYB_SEM($CMAKE_TARGET_NAME) $CMAKE_TARGET_ARTEFACT_RENAME_RULES
 
 ### @usage: DLL_UNIT # internal
 ###
@@ -9250,23 +9250,6 @@ macro ORIGINAL_SOURCE(Source) {
     ENABLE(UNUSED_MACRO)
 }
 
-CMAKE_PACKAGE=
-CMAKE_PACKAGE_COMPONENT=
-CMAKE_PACKAGE_TARGET=
-CONAN_REFERENCE=
-CONAN_PKG_OPTS=
-### @usage: OPENSOURCE_EXPORT_REPLACEMENT(CMAKE PkgName CMAKE_TARGET PkgName::PkgTarget CONAN ConanRef CMAKE_COMPONENT OptCmakePkgComponent)
-###
-### Use specified conan/system pacakcge when exporting cmake build scripts for arcadia C++ project
-### for opensource publication.
-macro OPENSOURCE_EXPORT_REPLACEMENT(CMAKE[], CMAKE_TARGET[], CMAKE_COMPONENET[], CONAN[], CONAN_OPTIONS[]) {
-    SET(CMAKE_PACKAGE $CMAKE)
-    SET(CMAKE_PACKAGE_COMPONENT $CMAKE_COMPONENET)
-    SET(CMAKE_LINK_TARGET $CMAKE_TARGET)
-    SET(CONAN_REFERENCE $CONAN)
-    SET(CONAN_PKG_OPTS $CONAN_OPTIONS)
-}
-
 # tag:licence
 CREDITS_FILE_EXTRA_EXT=
 CREDITS_FLAGS=