Skip to content

Commit

Permalink
fix: export inexistent classes in config
Browse files Browse the repository at this point in the history
Some classes is totally dropped in dtk6. These should not be exported
in config file.

Log: fix exporting inexistent classes in config
  • Loading branch information
asterwyx committed Oct 27, 2023
1 parent fcd33ac commit 371cc12
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions dtkwidget.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,17 @@ if("${QT_VERSION_MAJOR}" STREQUAL "5")
endif()

file(GLOB D_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/*")
if("${DTK_VERSION_MAJOR}" STREQUAL "6")
list(REMOVE_ITEM D_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DApplicationHelper")
list(REMOVE_ITEM D_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DApplicationSettings")
list(REMOVE_ITEM D_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DArrowLineExpand")
list(REMOVE_ITEM D_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DExpandGroup")
list(REMOVE_ITEM D_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DImageButton")
list(REMOVE_ITEM D_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DSegmentedControl")
list(REMOVE_ITEM D_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DSegmentedHighlight")
list(REMOVE_ITEM D_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DThemeManager")
list(REMOVE_ITEM D_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DToast")
endif()

set(AUTOCONFIG ${CMAKE_CURRENT_BINARY_DIR}/dtkwidget_config.h)
get_filename_component(CONFIG_INCLUDE ${AUTOCONFIG} DIRECTORY)
Expand All @@ -70,17 +81,6 @@ file(GLOB_RECURSE PUBLIC_HEADERS "${PROJECT_SOURCE_DIR}/include/*.h")
list(APPEND PUBLIC_HEADERS ${D_HEADERS})
list(APPEND PUBLIC_HEADERS ${AUTOCONFIG})

if("${DTK_VERSION_MAJOR}" STREQUAL "6")
list(REMOVE_ITEM PUBLIC_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DApplicationHelper")
list(REMOVE_ITEM PUBLIC_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DApplicationSettings")
list(REMOVE_ITEM PUBLIC_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DArrowLineExpand")
list(REMOVE_ITEM PUBLIC_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DExpandGroup")
list(REMOVE_ITEM PUBLIC_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DImageButton")
list(REMOVE_ITEM PUBLIC_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DSegmentedControl")
list(REMOVE_ITEM PUBLIC_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DSegmentedHighlight")
list(REMOVE_ITEM PUBLIC_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DThemeManager")
list(REMOVE_ITEM PUBLIC_HEADERS "${PROJECT_SOURCE_DIR}/include/DWidget/DToast")
endif()

set (BUILD_DOCS ON CACHE BOOL "Generate doxygen-based documentation")

Expand Down

0 comments on commit 371cc12

Please sign in to comment.