disable new ABI (can't catch ios_base::failure with new ABI)
This commit is contained in:
parent
b9b16895f0
commit
7859da9ca8
|
@ -83,7 +83,12 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
|
|
||||||
# generate DBus interfaces
|
# generate DBus interfaces
|
||||||
qt5_add_dbus_interfaces(SRC_FILES ${DBUS_FILES})
|
qt5_add_dbus_interfaces(SRC_FILES ${DBUS_FILES})
|
||||||
add_definitions(-DCMAKE_BUILD)
|
|
||||||
|
# disable new ABI (can't catch ios_base::failure with new ABI)
|
||||||
|
add_definitions(
|
||||||
|
-D_GLIBCXX_USE_CXX11_ABI=0
|
||||||
|
-DCMAKE_BUILD
|
||||||
|
)
|
||||||
|
|
||||||
# executable and linking
|
# executable and linking
|
||||||
add_executable(${META_PROJECT_NAME} ${HEADER_FILES} ${SRC_FILES} ${RES_FILES} ${WINDOWS_ICON_PATH})
|
add_executable(${META_PROJECT_NAME} ${HEADER_FILES} ${SRC_FILES} ${RES_FILES} ${WINDOWS_ICON_PATH})
|
||||||
|
|
|
@ -7,6 +7,9 @@ RCC_DIR = ./res
|
||||||
QMAKE_CXXFLAGS += -std=c++11
|
QMAKE_CXXFLAGS += -std=c++11
|
||||||
QMAKE_LFLAGS += -std=c++11
|
QMAKE_LFLAGS += -std=c++11
|
||||||
|
|
||||||
|
# disable new ABI (can't catch ios_base::failure with new ABI)
|
||||||
|
DEFINES += _GLIBCXX_USE_CXX11_ABI=0
|
||||||
|
|
||||||
# variables to check target architecture
|
# variables to check target architecture
|
||||||
win32-g++:QMAKE_TARGET.arch = $$QMAKE_HOST.arch
|
win32-g++:QMAKE_TARGET.arch = $$QMAKE_HOST.arch
|
||||||
win32-g++-32:QMAKE_TARGET.arch = x86
|
win32-g++-32:QMAKE_TARGET.arch = x86
|
||||||
|
|
Loading…
Reference in New Issue