Reenable Qt Signal keywords

[frida/frida.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c54380dd76dc17d8812553728fe7ffd5b88ac2eb..4ad154583b4df40800d8fa6f500c993b28351e23 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,6 @@ add_definitions(${GUILE_CFLAGS})
 
 add_definitions(${LLVM_CFLAGS})
 add_definitions(-std=c++11 -Wall -Wextra)
-add_definitions(-DQT_NO_KEYWORDS)
 
 separate_arguments(LLVM_LDFLAGS)
 separate_arguments(LLVM_LIBS)
@@ -44,7 +43,7 @@ endif()
 SET_SOURCE_FILES_PROPERTIES(src/bindings/guile/frida.i PROPERTIES CPLUSPLUS ON)
 SWIG_ADD_MODULE(guile-frida-binding guile src/bindings/guile/frida.i)
 SWIG_LINK_LIBRARIES(guile-frida-binding ${GUILE_LDFLAGS})
-
+qt5_use_modules(guile-frida-binding Widgets)
 
 #################
 # Main Programm #
@@ -55,6 +54,7 @@ SET(frida_SOURCES
   src/core/BasicBlock.cxx
   src/core/Comment.cxx
   src/core/Function.cxx
+  src/core/Settings.cxx
   src/gui/Mainwindow.cxx
   src/gui/widgets/BasicBlockWidget.cxx
   src/gui/widgets/CFGScene.cxx
@@ -71,7 +71,8 @@ SET(frida_SOURCES
 SET(frida_HEADERS
   src/include_llvm.hxx
   src/core/InformationManager.hxx
-  src/gui/qt.hxx
+  src/core/Settings.hxx
+  src/qt.hxx
   src/gui/Mainwindow.hxx
   src/gui/widgets/BasicBlockWidget.hxx
   src/gui/widgets/CFGScene.hxx
@@ -117,7 +118,7 @@ set(plugin_guile_HEADERS
   src/bindings/Guile.hxx)
 
 add_library(guilePlugin MODULE ${plugin_guile_SOURCES} ${plugin_guile_HEADERS_MOC})
-qt5_use_modules(guilePlugin Core)
+qt5_use_modules(guilePlugin Core Widgets)
 target_link_libraries(guilePlugin ${QT_LIBRARIES} ${GUILE_LDFLAGS})
 
 ##################
@@ -129,6 +130,10 @@ set(fridatest_SOURCES
   src/core/tests/BasicBlockTest.cxx
   src/core/tests/FunctionTest.cxx
   src/core/tests/CommentTest.cxx
+  src/disassembler/llvm/tests/amd64LinuxDisassemblerTest.cxx
+  src/disassembler/llvm/tests/mipselLinuxDisassemblerTest.cxx
+  src/disassembler/llvm/tests/armelLinuxDisassemblerTest.cxx
+  src/disassembler/llvm/tests/amd64MachODisassemblerTest.cxx
   ${frida_SOURCES}
   )