X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=CMakeLists.txt;h=8c7fad6e72ccee825f8c1342523f593ba1a42dd9;hp=3529b485fb3c2c5490edeee16e62f8604bbad076;hb=25c5224fd78d69d669d4f2722ffd2f512a65834e;hpb=aee81ec403637676282822ff680bce9fde998b9f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3529b48..8c7fad6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,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 +72,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
@@ -96,7 +98,7 @@ qt5_use_modules(frida Widgets)
 TARGET_LINK_LIBRARIES(frida
   ${QT_LIBRARIES}
   ${LLVM_LDFLAGS}
-  -lLLVM-3.5
+  ${LLVM_DYNAMIC_LIB}
   ${LLVM_SYSTEM_LIBS}
   ${LOG4CXX_LDFLAGS}
   ${QUAZIP_LIBRARIES})
@@ -117,7 +119,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})
 
 ##################
@@ -128,6 +130,11 @@ set(fridatest_SOURCES
   src/test.cxx
   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}
   )
 
@@ -138,8 +145,17 @@ qt5_use_modules(fridatest Widgets)
 #ADD_SUBDIRECTORY(/usr/src/gtest gtest)
 ADD_SUBDIRECTORY(/usr/src/gmock gmock)
 enable_testing()
-add_test(NAME fridatest COMMAND fridatest ${CMAKE_SOURCE_DIR})
-target_link_libraries(fridatest gmock gtest ${QT_LIBRARIES} ${LLVM_LDFLAGS} -lLLVM-3.5 ${LLVM_SYSTEM_LIBS} ${LOG4CXX_LDFLAGS} ${GUILE_LDFLAGS} ${QUAZIP_LIBRARIES})
+add_test(NAME fridatest COMMAND fridatest ${CMAKE_SOURCE_DIR}/testdata)
+target_link_libraries(fridatest
+  gmock
+  gtest
+  ${QT_LIBRARIES}
+  ${LLVM_LDFLAGS}
+  ${LLVM_DYNAMIC_LIB}
+  ${LLVM_SYSTEM_LIBS}
+  ${LOG4CXX_LDFLAGS}
+  ${GUILE_LDFLAGS}
+  ${QUAZIP_LIBRARIES})
 target_compile_options(fridatest PRIVATE -DCONFIG_TEST)
 set_property(TEST fridatest
   APPEND PROPERTY ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR})