Skip to content

Commit 0f1618c

Browse files
committed
BUG: Fix generated path handling in CMake to remove incorrect version-specific suffix
Remove the addition of the Qt version-specific suffix to `PYTHONQT_GENERATED_PATH` as it caused conflicts due to the hardcoded logic in `setupgenerator.cpp`. Add a note for clarification.
1 parent a5b65ea commit 0f1618c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

generator/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
3131
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/simplecpp)
3232

3333
get_filename_component(PYTHONQT_GENERATED_PATH "${CMAKE_CURRENT_BINARY_DIR}" PATH)
34-
set(PYTHONQT_GENERATED_PATH "${PYTHONQT_GENERATED_PATH}/generated_cpp_${QT_VERSION_MAJOR}${QT_VERSION_MINOR}")
34+
# NOTE: 'generated_cpp' is hardcoded in setupgenerator.cpp, so do not add version suffix here.
35+
set(PYTHONQT_GENERATED_PATH "${PYTHONQT_GENERATED_PATH}/generated_cpp")
36+
#set(PYTHONQT_GENERATED_PATH "${PYTHONQT_GENERATED_PATH}/generated_cpp_${QT_VERSION_MAJOR}${QT_VERSION_MINOR}")
3537

3638
if(WIN32)
3739
set(LIBRARY_SEARCH_PATH PATH)

0 commit comments

Comments
 (0)