From d2f7837ecf6340fe67a302f326f656adb566c08b Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Sun, 15 Mar 2020 02:23:36 -0700 Subject: [PATCH] qrenderdoc: Drop building swig .py.c files This is an alternative to https://github.com/baldurk/renderdoc/pull/1768 suggested by baldurk. I found that for some reason when cross compiling, the qrenderdoc CMakeLists.txt was failing to see the include-bin executable that renderdoc should have built. Apparently the .py.c files were no longer required for qrenderdoc, so removing it also fixed the issue I was seeing. Signed-off-by: Jordan Justen --- qrenderdoc/CMakeLists.txt | 7 ------- qrenderdoc/qrenderdoc.pro | 2 -- 2 files changed, 9 deletions(-) diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt index bad6e88ef..c833d6640 100644 --- a/qrenderdoc/CMakeLists.txt +++ b/qrenderdoc/CMakeLists.txt @@ -258,14 +258,7 @@ foreach(in ${swig_interfaces}) DEPENDS ${RDOC_REPLAY_FILES} DEPENDS ${QRD_INTERFACE_FILES}) - add_custom_command(OUTPUT ${swig_file}.py.c - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin ${swig_file}.py ${swig_file}.py.c - DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin - DEPENDS ${swig_file}_python.cxx) - list(APPEND swig_output ${swig_file}_python.cxx) - list(APPEND swig_output ${swig_file}.py.c) endforeach() add_custom_target(swig-bindings ALL DEPENDS ${swig_output}) diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro index 9d494fce2..fddd335ad 100644 --- a/qrenderdoc/qrenderdoc.pro +++ b/qrenderdoc/qrenderdoc.pro @@ -128,9 +128,7 @@ win32 { # Add the SWIG files that were generated in cmake SOURCES += $$CMAKE_DIR/qrenderdoc/renderdoc_python.cxx - SOURCES += $$CMAKE_DIR/qrenderdoc/renderdoc.py.c SOURCES += $$CMAKE_DIR/qrenderdoc/qrenderdoc_python.cxx - SOURCES += $$CMAKE_DIR/qrenderdoc/qrenderdoc.py.c CONFIG += warn_off CONFIG += c++14