Skip to content

Commit b7c748c

Browse files
feihongmrbean-bremen
authored andcommitted
CMake CI Process Validation
1 parent e50505f commit b7c748c

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
1111
find_package(Python3 COMPONENTS Development)
1212

1313
set(PYTHONQT_SUFFIX Qt${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}-Python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR})
14-
get_filename_component(QTDIR "${Qt${QT_VERSION_MAJOR}_DIR}" PATH)
15-
get_filename_component(QTDIR "${QTDIR}" PATH)
16-
get_filename_component(QTDIR "${QTDIR}" PATH)
17-
set(ENV{QTDIR} "${QTDIR}")
1814

1915
add_subdirectory(generator)
2016
add_subdirectory(src)

generator/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,13 @@ foreach(wrapper IN LISTS wrapper_list)
5757
list(APPEND PYTHONQT_WRAPPER_SOURCES ${PYTHONQT_WRAPPER_${WRAPPER}_SOURCES})
5858
set(PYTHONQT_WRAPPER_${WRAPPER}_SOURCES ${PYTHONQT_WRAPPER_${WRAPPER}_SOURCES} PARENT_SCOPE)
5959
endforeach()
60+
61+
get_filename_component(_qt_install_prefix "${Qt${QT_VERSION_MAJOR}_DIR}" PATH)
62+
get_filename_component(_qt_install_prefix "${_qt_install_prefix}" PATH)
63+
get_filename_component(_qt_install_prefix "${_qt_install_prefix}" PATH)
64+
6065
add_custom_command(OUTPUT ${PYTHONQT_WRAPPER_SOURCES}
61-
COMMAND ${CMAKE_COMMAND} -E env --modify ${LIBRARY_SEARCH_PATH}=path_list_prepend:$<TARGET_FILE_DIR:Qt${QT_VERSION_MAJOR}::Widgets> $<TARGET_FILE:${PROJECT_NAME}>
66+
COMMAND ${CMAKE_COMMAND} -E env QTDIR=${_qt_install_prefix} --modify ${LIBRARY_SEARCH_PATH}=path_list_prepend:$<TARGET_FILE_DIR:Qt${QT_VERSION_MAJOR}::Widgets> $<TARGET_FILE:${PROJECT_NAME}>
6267
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} #[[$<TARGET_FILE_DIR:${PROJECT_NAME}>]]
6368
DEPENDS ${PROJECT_NAME}
6469
VERBATIM

0 commit comments

Comments
 (0)