From fcba572fb2c7ba391c9acdae924a0d265cd52bf6 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 14 Dec 2017 10:26:25 +0000 Subject: [PATCH] Don't set -DSWIGWORDSIZE64 on apple, where uint64_t typedef is different --- qrenderdoc/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt index 5e49203c4..63535ff97 100644 --- a/qrenderdoc/CMakeLists.txt +++ b/qrenderdoc/CMakeLists.txt @@ -7,6 +7,7 @@ set(RENDERDOC_SWIG_PACKAGE https://github.com/baldurk/swig/archive/renderdoc-mod set(QMAKE_CONFIG "debug") set(QMAKE_LDFLAGS "") set(QMAKE_CXXFLAGS "") +set(SWIG_FLAGS "") if(STATIC_QRENDERDOC) set(QMAKE_CXXFLAGS "-DSTATIC_QRENDERDOC=1") @@ -14,6 +15,10 @@ if(STATIC_QRENDERDOC) set(QMAKE_LDFLAGS "-static-libstdc++ -lutil") endif() +if(NOT APPLE) + set(SWIG_FLAGS "-DSWIGWORDSIZE64") +endif() + if(QRENDERDOC_NO_CXX11_REGEX) set(QMAKE_CXXFLAGS "-DNO_CXX11_REGEX=1 ${QMAKE_CXXFLAGS}") endif() @@ -189,7 +194,7 @@ foreach(in ${swig_interfaces}) get_filename_component(swig_file ${in} NAME_WE) add_custom_command(OUTPUT ${swig_file}_python.cxx ${swig_file}.py - COMMAND ${CMAKE_BINARY_DIR}/bin/swig -v -Wextra -Werror -DSWIGWORDSIZE64 -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} + COMMAND ${CMAKE_BINARY_DIR}/bin/swig -v -Wextra -Werror ${SWIG_FLAGS} -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} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${in} DEPENDS custom_swig DEPENDS ${RDOC_REPLAY_FILES}