X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=CMakeLists.txt;h=dfa41120b60602dcc546568b432cbe6f373b2277;hp=49f09e09c952819805dd43fba9ab0b8f08c8d50c;hb=98e46099f6366309366ea54fc4b97fd5cb383fa7;hpb=ebe7b20f8756f239fb61b5a3e3faabeebe708ad1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49f09e0..dfa4112 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.0.0)
 PROJECT(frida)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
@@ -71,7 +71,7 @@ SET(frida_SOURCES
 SET(frida_HEADERS
   src/include_llvm.hxx
   src/core/InformationManager.hxx
-  src/gui/qt.hxx
+  src/qt.hxx
   src/gui/Mainwindow.hxx
   src/gui/widgets/BasicBlockWidget.hxx
   src/gui/widgets/CFGScene.hxx
@@ -96,7 +96,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})
@@ -128,6 +128,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 +143,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})