|
@@ -1210,9 +1210,9 @@ module _BASE_PROGRAM: _LINK_UNIT {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-VCS_INFO_SEM=target_macroses-ITEM && target_macroses-macro vcs_info && target_macroses-args ${hide;input:"build/scripts/vcs_info.py"} ${hide;input:"build/scripts/c_templates/svn_interface.c"} ${hide;input:"build/scripts/c_templates/svnversion.h"}
|
|
|
+_VCS_INFO_SEM=target_macroses-ITEM && target_macroses-macro vcs_info && target_macroses-args ${hide;input:"build/scripts/vcs_info.py"} ${hide;input:"build/scripts/c_templates/svn_interface.c"} ${hide;input:"build/scripts/c_templates/svnversion.h"}
|
|
|
_CPP_PROGRAM_SEM=add_executable $MODDIR $CMAKE_TARGET_NAME ${hide:TARGET} ${hide:AUTO_INPUT} $CMAKE_TARGET_ARTEFACT_RENAME_RULES \
|
|
|
- && ${VCS_INFO_SEM} \
|
|
|
+ && ${_VCS_INFO_SEM} \
|
|
|
&& target_options-privates-ITEM && target_options-privates-option target_link_options && target_options-privates-args $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $OBJADDE \
|
|
|
&& target_options-privates-ITEM && target_options-privates-option target_include_directories && target_options-privates-args $_C__INCLUDE_OWNED \
|
|
|
&& target_options-privates-ITEM && target_options-privates-option target_compile_options && target_options-privates-args $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS \
|
|
@@ -1827,7 +1827,7 @@ _CPP_LIBRARY_SEM=add_library ${MODDIR} $CMAKE_TARGET_NAME ${hide:TARGET} ${hide:
|
|
|
&& target_options-interfaces-ITEM && target_options-interfaces-option target_link_options && target_options-interfaces-args $LDFLAGS_GLOBAL_RAW \
|
|
|
&& project_languages C && project_languages CXX \
|
|
|
&& target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${MODULE_EXPLICIT_HEADERS}
|
|
|
-CPP_OBJ_LIBRARY_SEM=add_global_library_for ${MODDIR} ${suf=.global:CMAKE_TARGET_NAME} $CMAKE_TARGET_NAME ${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_options-publics-ITEM && target_options-publics-option target_include_directories && target_options-publics-args $_C__INCLUDE_GLOBAL \
|
|
|
&& target_options-privates-ITEM && target_options-privates-option target_include_directories && target_options-privates-args $_C__INCLUDE_OWNED \
|
|
|
&& target_options-privates-ITEM && target_options-privates-option target_compile_options && target_options-privates-args $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS \
|
|
@@ -1853,7 +1853,7 @@ module LIBRARY: _LIBRARY {
|
|
|
.GLOBAL=_AARS _PROGUARD_RULES
|
|
|
.SEM=_CPP_LIBRARY_SEM
|
|
|
.ALIASES=EXTRALIBS=PY_EXTRALIBS
|
|
|
- .GLOBAL_SEM=CPP_OBJ_LIBRARY_SEM
|
|
|
+ .GLOBAL_SEM=_CPP_OBJ_LIBRARY_SEM
|
|
|
.DEFAULT_NAME_GENERATOR=ThreeDirNames
|
|
|
.ARGS_PARSER=Base
|
|
|
|
|
@@ -1861,7 +1861,7 @@ module LIBRARY: _LIBRARY {
|
|
|
_CPP_LIBRARY_SEM=$CMAKE_PACKAGE_SEM && ${CPP_LIBRARY_INDUCED_LINKS} $CMAKE_LINK_TARGET $CONAN_REQUIRES_SEM $CONAN_OPTIONS_SEM $CONAN_OS_REQUIRES_SEM $CONAN_OS_OPTIONS_SEM && IGNORED
|
|
|
}
|
|
|
when ($OPENSOURCE_EXPORT == "no") {
|
|
|
- _CPP_LIBRARY_SEM=IGNORED
|
|
|
+ _CPP_LIBRARY_SEM=$_SEM_IGNORED
|
|
|
}
|
|
|
|
|
|
when ($HAS_CPP_PROTOBUF_PEERS == "yes") {
|
|
@@ -2028,7 +2028,7 @@ _SONAME=
|
|
|
_EXPORT_SCRIPT_SEM=
|
|
|
_CLEAN_TEXTREL=
|
|
|
macro _ADD_DYNLYB_SEM(Libname) {
|
|
|
- .SEM=add_shared_library ${MODDIR} ${Libname} ${hide:TARGET} ${hide:AUTO_INPUT} && target_options-publics-ITEM && target_options-publics-option target_include_directories && target_options-publics-args $_C__INCLUDE_GLOBAL && target_options-privates-ITEM && target_options-privates-option target_include_directories && target_options-privates-args $_C__INCLUDE_OWNED && target_options-privates-ITEM && target_options-privates-option target_compile_options && target_options-privates-args $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS && target_options-publics-ITEM && target_options-publics-option target_compile_options && target_options-publics-args $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW && target_options-privates-ITEM && target_options-privates-option target_link_options && target_options-privates-args $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $OBJADDE && ${VCS_INFO_SEM} $_EXPORT_SCRIPT_SEM
|
|
|
+ .SEM=add_shared_library ${MODDIR} ${Libname} ${hide:TARGET} ${hide:AUTO_INPUT} && target_options-publics-ITEM && target_options-publics-option target_include_directories && target_options-publics-args $_C__INCLUDE_GLOBAL && target_options-privates-ITEM && target_options-privates-option target_include_directories && target_options-privates-args $_C__INCLUDE_OWNED && target_options-privates-ITEM && target_options-privates-option target_compile_options && target_options-privates-args $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS && target_options-publics-ITEM && target_options-publics-option target_compile_options && target_options-publics-args $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW && target_options-privates-ITEM && target_options-privates-option target_link_options && target_options-privates-args $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $OBJADDE && ${_VCS_INFO_SEM} $_EXPORT_SCRIPT_SEM
|
|
|
}
|
|
|
_CPP_DYN_LIBRARY_SEM=$_ADD_DYNLYB_SEM($CMAKE_TARGET_NAME) $CMAKE_TARGET_ARTEFACT_RENAME_RULES
|
|
|
|
|
@@ -3092,7 +3092,7 @@ macro _SRC("in", SRC, SRCFLAGS...) {
|
|
|
}
|
|
|
|
|
|
macro MANUAL_GENERATION(Outs...) {
|
|
|
- .SEM=IGNORED ${hide;noauto;output:Outs}
|
|
|
+ .SEM=$_SEM_IGNORED ${hide;noauto;output:Outs}
|
|
|
}
|
|
|
|
|
|
# tag:src-processing
|