diff --git a/chameleon/CMakeLists.txt b/chameleon/CMakeLists.txt index f7d995ca..e7b6ca9f 100644 --- a/chameleon/CMakeLists.txt +++ b/chameleon/CMakeLists.txt @@ -1,6 +1,6 @@ set(PLUGIN_NAME ${STYLE_PLUGIN_NAME}) -find_package(DtkGui REQUIRED) +find_package(Dtk${DTK_VERSION_MAJOR}Gui REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Qml Quick diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 74f9e0cd..4bac5ed7 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -14,7 +14,16 @@ set (DOXYGEN_PROJECT_NUMBER ${CMAKE_PROJECT_VERSION} CACHE STRING "") # Should b set (DOXYGEN_EXTRACT_STATIC YES) set (DOXYGEN_OUTPUT_LANGUAGE "Chinese" CACHE STRING "Doxygen Output Language") set (DOXYGEN_IMAGE_PATH ${CMAKE_CURRENT_LIST_DIR}/images/) -set (DOXYGEN_QHG_LOCATION "qhelpgenerator" CACHE STRING "Doxygen QHG path") +if (EnableQt5) + find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Help) +else() + find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ToolsTools) +endif() +get_target_property(_qhelpgenerator_location Qt${QT_VERSION_MAJOR}::qhelpgenerator IMPORTED_LOCATION) +if("${_qhelpgenerator_location}" STREQUAL "") + set(_qhelpgenerator_location "qhelpgenerator") +endif() +set (DOXYGEN_QHG_LOCATION ${_qhelpgenerator_location} CACHE STRING "Doxygen QHG path") set (DOXYGEN_QHP_NAMESPACE "org.deepin.dtk.declarative") set (DOXYGEN_QCH_FILE "dtkdeclarative.qch") set (DOXYGEN_QHP_VIRTUAL_FOLDER "dtkdeclarative")