Skip to content

Commit ad190de

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

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

generator/CMakeLists.txt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,17 @@ foreach(wrapper IN LISTS wrapper_list)
5858
set(PYTHONQT_WRAPPER_${WRAPPER}_SOURCES ${PYTHONQT_WRAPPER_${WRAPPER}_SOURCES} PARENT_SCOPE)
5959
endforeach()
6060

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)
61+
get_target_property(_qt_include_dirs Qt${QT_VERSION_MAJOR}::Core INTERFACE_INCLUDE_DIRECTORIES)
62+
foreach(_qt_include_dir IN LISTS _qt_include_dirs)
63+
get_filename_component(_qt_install_prefix "${_qt_include_dir}" PATH)
64+
if (EXISTS "${_qt_install_prefix}/include/QtCore")
65+
set(_qt_dir "${_qt_install_prefix}")
66+
break()
67+
endif()
68+
endforeach()
6469

6570
add_custom_command(OUTPUT ${PYTHONQT_WRAPPER_SOURCES}
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}>
71+
COMMAND ${CMAKE_COMMAND} -E env QTDIR=${_qt_dir} --modify ${LIBRARY_SEARCH_PATH}=path_list_prepend:$<TARGET_FILE_DIR:Qt${QT_VERSION_MAJOR}::Widgets> $<TARGET_FILE:${PROJECT_NAME}>
6772
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} #[[$<TARGET_FILE_DIR:${PROJECT_NAME}>]]
6873
DEPENDS ${PROJECT_NAME}
6974
VERBATIM
@@ -77,3 +82,5 @@ set_source_files_properties(${PYTHONQT_WRAPPER_SOURCES} PROPERTIES
7782
add_custom_target(PythonQtWrapper
7883
DEPENDS ${PROJECT_NAME} ${PYTHONQT_WRAPPER_SOURCES}
7984
)
85+
86+
message("_qt5Core_install_prefix " ${_qt5Core_install_prefix})

0 commit comments

Comments
 (0)