Commit 039336c9 authored by Victor Yacovlev's avatar Victor Yacovlev

Third-party actors have prefix AddonActor, but not Actor

parent e5f5e19b
...@@ -256,8 +256,10 @@ function(kumir2_add_actor) ...@@ -256,8 +256,10 @@ function(kumir2_add_actor)
set(PLUGIN_NAME "Actor${PARSED_ARGS_NAME}") set(PLUGIN_NAME "Actor${PARSED_ARGS_NAME}")
if(EXISTS "${CMAKE_SOURCE_DIR}/scripts/gen_actor_source.py") if(EXISTS "${CMAKE_SOURCE_DIR}/scripts/gen_actor_source.py")
set(GEN_ACTOR_SOURCE_SCRIPT "${CMAKE_SOURCE_DIR}/scripts/gen_actor_source.py") set(GEN_ACTOR_SOURCE_SCRIPT "${CMAKE_SOURCE_DIR}/scripts/gen_actor_source.py")
set(PLUGIN_NAME_PREFIX "Actor")
else() else()
set(GEN_ACTOR_SOURCE_SCRIPT "${KUMIR2_SDK_SCRIPTS_DIR}/gen_actor_source.py") set(GEN_ACTOR_SOURCE_SCRIPT "${KUMIR2_SDK_SCRIPTS_DIR}/gen_actor_source.py")
set(PLUGIN_NAME_PREFIX "AddonActor")
endif() endif()
set(MOC_PARAMS) set(MOC_PARAMS)
if(${USE_QT} GREATER 4) if(${USE_QT} GREATER 4)
...@@ -286,7 +288,7 @@ function(kumir2_add_actor) ...@@ -286,7 +288,7 @@ function(kumir2_add_actor)
list(APPEND MOC_SOURCES_GENERATED ${QT_MOC_OUT_FILE_NAME}) list(APPEND MOC_SOURCES_GENERATED ${QT_MOC_OUT_FILE_NAME})
kumir2_add_plugin( kumir2_add_plugin(
NAME "Actor${PARSED_ARGS_NAME}" NAME "${PLUGIN_NAME_PREFIX}${PARSED_ARGS_NAME}"
SOURCES ${PARSED_ARGS_SOURCES} SOURCES ${PARSED_ARGS_SOURCES}
${SOURCES_GENERATED} ${SOURCES_GENERATED}
${MOC_SOURCES_GENERATED} ${MOC_SOURCES_GENERATED}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment