dirty hack for svg2qvg access to qskinny moc files

This commit is contained in:
Rick Vogel 2022-10-30 20:21:06 +01:00
parent 7449d5fd4b
commit 39c1298779
2 changed files with 23 additions and 5 deletions

View File

@ -431,7 +431,13 @@ endif()
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES
AUTOMOC ON AUTOMOC ON
AUTORCC ON) AUTORCC ON
FOLDER libs)
# TODO hack for standalone qvg2svg
set_target_properties(${TARGET_NAME}
PROPERTIES
AUTOGEN_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/qskinny_autogen/include)
install(TARGETS ${TARGET_NAME} DESTINATION ${QSK_INSTALL_LIBS}) install(TARGETS ${TARGET_NAME} DESTINATION ${QSK_INSTALL_LIBS})
install(FILES ${TARGET_HEADERS} DESTINATION ${QSK_INSTALL_HEADERS}) install(FILES ${TARGET_HEADERS} DESTINATION ${QSK_INSTALL_HEADERS})

View File

@ -13,17 +13,25 @@ if(BUILD_SVG2QVG_STANDALONE)
# E.g. main.cpp -> #include <QskGraphic.cpp> -> #include "moc_QskGraphic.cpp" # E.g. main.cpp -> #include <QskGraphic.cpp> -> #include "moc_QskGraphic.cpp"
add_dependencies(${TARGET_NAME} qskinny) add_dependencies(${TARGET_NAME} qskinny)
# TODO hack for standalone qvg2svg
get_target_property(qskinny_AUTOGEN_DIR qskinny AUTOGEN_BUILD_DIR) get_target_property(qskinny_AUTOGEN_DIR qskinny AUTOGEN_BUILD_DIR)
if (EXISTS ${qskinny_AUTOGEN_DIR}) if (${qskinny_AUTOGEN_DIR} STREQUAL "")
message(FATAL_ERROR "Directory '${qskinny_AUTOGEN_DIR}' doesn't exist")
endif()
# TODO fix multi configuration generators
if(CMAKE_GENERATOR MATCHES "Visual Studio.*")
add_definitions("/I${qskinny_AUTOGEN_DIR}/include_\$(Configuration)")
else() else()
set(qskinny_AUTOGEN_DIR ${CMAKE_BINARY_DIR}/src/qskinny_autogen/include_$<CONFIG>) # TODO target_include_directories(${TARGET_NAME}
PRIVATE
${qskinny_AUTOGEN_DIR})
endif() endif()
target_include_directories(${TARGET_NAME} target_include_directories(${TARGET_NAME}
PRIVATE PRIVATE
${CMAKE_SOURCE_DIR}/src/common ${CMAKE_SOURCE_DIR}/src/common
${CMAKE_SOURCE_DIR}/src/graphic ${CMAKE_SOURCE_DIR}/src/graphic)
${qskinny_AUTOGEN_DIR})
target_compile_definitions(${TARGET_NAME} target_compile_definitions(${TARGET_NAME}
PRIVATE PRIVATE
@ -41,4 +49,8 @@ else()
${Qt}::Svg) ${Qt}::Svg)
endif() endif()
set_target_properties(${TARGET_NAME}
PROPERTIES
FOLDER tools)
install(TARGETS ${TARGET_NAME} DESTINATION ${TARGET_INSTALL_SUFFIX}) install(TARGETS ${TARGET_NAME} DESTINATION ${TARGET_INSTALL_SUFFIX})