Skip to content

Commit 5b1bf63

Browse files
committed
ENH: Update CMake to exclude qtscript_masterinclude.h and improve Qt5/6 compatibility
Explicitly exclude `qtscript_masterinclude.h` from sources. Add compatibility for Qt5 and Qt6 with conditional linking of `Core5Compat` library.
1 parent aadc998 commit 5b1bf63

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

generator/CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,27 @@ else()
1313
endif()
1414

1515
file(GLOB SOURCES *.h *.cpp *.qrc simplecpp/*.h simplecpp/*.cpp )
16+
# Explicitly exclude qtscript_masterinclude.h
1617
list(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_LIST_DIR}/qtscript_masterinclude.h")
1718

1819
add_executable(${PROJECT_NAME})
19-
2020
target_sources(${PROJECT_NAME} PRIVATE
2121
${SOURCES}
2222
)
2323

24+
set(QT5_COMPATIBILITY_LIBS "")
25+
if (${QT_VERSION_MAJOR} VERSION_GREATER_EQUAL 6)
26+
set(QT5_COMPATIBILITY_LIBS Qt${QT_VERSION_MAJOR}::Core5Compat)
27+
endif()
28+
2429
target_link_libraries(${PROJECT_NAME} PUBLIC
2530
Qt${QT_VERSION_MAJOR}::Core
2631
Qt${QT_VERSION_MAJOR}::Widgets
2732
Qt${QT_VERSION_MAJOR}::Xml
33+
${QT5_COMPATIBILITY_LIBS}
2834
rxx
2935
)
3036

31-
if (${QT_VERSION_MAJOR} VERSION_GREATER 5)
32-
target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Core5Compat)
33-
endif()
34-
3537
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
3638
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/simplecpp)
3739

0 commit comments

Comments
 (0)