Skip to content

sync: from linuxdeepin/dtkcore #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
18202781743 merged 1 commit into from
Mar 6, 2025
Merged

sync: from linuxdeepin/dtkcore #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions cmake/DtkTools/DtkDConfigMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function(dtk_add_config_to_cpp OUTPUT_VAR JSON_FILE)
cmake_parse_arguments(
"arg"
""
"OUTPUT_FILE_NAME;CLASS_NAME;USE_QPROPERTY"
"OUTPUT_FILE_NAME;CLASS_NAME"
""
${ARGN}
)
Expand All @@ -33,22 +33,10 @@ function(dtk_add_config_to_cpp OUTPUT_VAR JSON_FILE)
set(CLASS_NAME_ARG "")
endif()

if(NOT DEFINED arg_USE_QPROPERTY)
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
set(arg_USE_QPROPERTY ON)
endif()
endif()

if (arg_USE_QPROPERTY)
set(USE_QPROPERTY_ARG "--use-qproperty")
else()
set(USE_QPROPERTY_ARG "")
endif()

# Add a custom command to run dconfig2cpp
add_custom_command(
OUTPUT ${OUTPUT_HEADER}
COMMAND ${DTK_DCONFIG2CPP} -o ${OUTPUT_HEADER} ${CLASS_NAME_ARG} ${USE_QPROPERTY_ARG} ${JSON_FILE}
COMMAND ${DTK_DCONFIG2CPP} -o ${OUTPUT_HEADER} ${CLASS_NAME_ARG} ${JSON_FILE}
DEPENDS ${JSON_FILE} ${DTK_XML2CPP}
COMMENT "Generating ${OUTPUT_HEADER} from ${JSON_FILE}"
VERBATIM
Expand Down
Loading