Skip to content

Commit ea32174

Browse files
Oleksandr KunichikOleksandr Kunichik
authored andcommitted
Fix no_moc.cmake file usage with Monolitic build
1 parent 861de10 commit ea32174

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

cmake/faceliftMacros.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -398,14 +398,15 @@ endmacro()
398398

399399
macro(_facelift_add_target_start IMPLEMENTATION_TARGET_NAME)
400400

401-
if(ORIGINAL_TARGET_NAME)
402-
set(OUTPUT_PATH ${CMAKE_BINARY_DIR}/facelift_generated/${ORIGINAL_TARGET_NAME})
401+
if(ALIAS_NAME)
402+
set(NO_MOC_PATH ${CMAKE_BINARY_DIR}/facelift_generated/${ALIAS_NAME})
403403
else()
404-
set(OUTPUT_PATH ${CMAKE_BINARY_DIR}/facelift_generated/${TARGET_NAME})
404+
set(NO_MOC_PATH ${CMAKE_BINARY_DIR}/facelift_generated/${TARGET_NAME})
405405
endif()
406406

407407
# set HEADERS_NO_MOC_GENERATED in this include
408-
include("${OUTPUT_PATH}/no_moc.cmake" OPTIONAL)
408+
include("${NO_MOC_PATH}/no_moc.cmake" OPTIONAL)
409+
409410
# set HEADERS_NO_MOC_FROM_FILE in this include (the file is the input parameter)
410411
if(HEADERS_NO_MOC_FILE)
411412
include("${HEADERS_NO_MOC_FILE}" OPTIONAL)
@@ -581,7 +582,6 @@ function(facelift_add_library TARGET_NAME)
581582

582583
else()
583584

584-
set(ORIGINAL_TARGET_NAME ${TARGET_NAME})
585585
set(TARGET_NAME ${TARGET_NAME}_OBJECTS)
586586
add_library(${ALIAS_NAME} INTERFACE)
587587
target_link_libraries(${ALIAS_NAME} INTERFACE ${TARGET_NAME})

0 commit comments

Comments
 (0)