at 18.03-beta 32 lines 1.9 kB view raw
1diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt 2index 2df9ffa5..66bafaba 100644 3--- a/qrenderdoc/CMakeLists.txt 4+++ b/qrenderdoc/CMakeLists.txt 5@@ -65,16 +65,6 @@ include(ExternalProject) 6 # Need bison for swig 7 find_package(BISON) 8 9-# Compile our custom SWIG that will do scoped/strong enum classes 10-ExternalProject_Add(custom_swig 11- # using an URL to a zip directly so we don't clone the history etc 12- URL ${RENDERDOC_SWIG_PACKAGE} 13- BUILD_IN_SOURCE 1 14- CONFIGURE_COMMAND ./autogen.sh > /dev/null 2>&1 15- COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./configure --with-pcre=yes --prefix=${CMAKE_BINARY_DIR} > /dev/null 16- BUILD_COMMAND $(MAKE) > /dev/null 2>&1 17- INSTALL_COMMAND $(MAKE) install > /dev/null 2>&1) 18- 19 # Lastly find PySide 2, optionally, for Qt5 Python bindings 20 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") 21 22@@ -186,9 +176,8 @@ foreach(in ${swig_interfaces}) 23 get_filename_component(swig_file ${in} NAME_WE) 24 25 add_custom_command(OUTPUT ${swig_file}_python.cxx ${swig_file}.py 26- COMMAND ${CMAKE_BINARY_DIR}/bin/swig -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} 27+ COMMAND $ENV{NIXOS_CUSTOM_SWIG} -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} 28 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${in} 29- DEPENDS custom_swig 30 DEPENDS ${RDOC_REPLAY_FILES} 31 DEPENDS ${QRD_INTERFACE_FILES}) 32