X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=CMakeLists.txt;h=7b8663434be6b35fe27badfd74ac85a01d69e8b5;hp=d948879d1cb61acb021154ff2bca54f2ae9fa614;hb=ccde95277ce5e3929d09aef387c2f5956592d066;hpb=954c56cbcb4b840e349a1d9df7d975dddd1a0962

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d948879..7b86634 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,18 +33,21 @@ execute_process(COMMAND ${LLVM_CONFIG} --system-libs OUTPUT_VARIABLE LLVM_SYSTEM
 string(REPLACE -O2 "" LLVM_CFLAGS ${LLVM_CFLAGS})
 string(REPLACE -fno-exceptions "" LLVM_CFLAGS ${LLVM_CFLAGS})
 string(REPLACE -fno-rtti "" LLVM_CFLAGS ${LLVM_CFLAGS})
+string(REPLACE -DNDEBUG "" LLVM_CFLAGS ${LLVM_CFLAGS})
+string(REPLACE -I "-isystem" LLVM_CFLAGS ${LLVM_CFLAGS})
 
 separate_arguments(LLVM_CFLAGS)
 add_definitions(${LLVM_CFLAGS})
-add_definitions(-std=c++11 -Wall)
+add_definitions(-std=c++11 -Wall -Wextra)
 add_definitions(-DQT_NO_KEYWORDS)
 
 separate_arguments(LLVM_LDFLAGS)
 separate_arguments(LLVM_LIBS)
 
 SET(frida_SOURCES
-  src/main.cxx
   src/core/InformationManager.cxx
+  src/core/BasicBlock.cxx
+  src/core/Function.cxx
   src/gui/Mainwindow.cxx
   src/gui/widgets/BasicBlockWidget.cxx
   src/gui/widgets/CFGScene.cxx
@@ -70,7 +73,7 @@ SET(frida_HEADERS
   src/disassembler/Disassembler.hxx
   )
 
-ADD_EXECUTABLE(frida ${frida_SOURCES} ${frida_HEADERS_MOC})
+ADD_EXECUTABLE(frida src/main.cxx ${frida_SOURCES} ${frida_HEADERS_MOC})
 #ADD_LIBRARY(llvm SHARED )
 
 ADD_DEFINITIONS(${QT_DEFINITIONS})
@@ -86,11 +89,17 @@ TARGET_LINK_LIBRARIES(frida ${QT_LIBRARIES} ${LLVM_LDFLAGS} -lLLVM-3.5 ${LLVM_SY
 
 set(fridatest_SOURCES
   src/test.cxx
+  src/core/tests/BasicBlockTest.cxx
+  src/core/tests/FunctionTest.cxx
+  ${frida_SOURCES}
   )
 
 add_executable(fridatest ${fridatest_SOURCES})
+
+qt5_use_modules(fridatest Widgets)
+
 #ADD_SUBDIRECTORY(/usr/src/gtest gtest)
 ADD_SUBDIRECTORY(/usr/src/gmock gmock)
 enable_testing()
-target_link_libraries(fridatest gmock gtest gmock_main)
-add_test( fridatest fridatest )
+target_link_libraries(fridatest gmock gtest gmock_main ${QT_LIBRARIES} ${LLVM_LDFLAGS} -lLLVM-3.5 ${LLVM_SYSTEM_LIBS} ${LOG4CXX_LDFLAGS} ${GUILE_LDFLAGS} ${QUAZIP_LIBRARIES})
+add_test(NAME fridatest COMMAND fridatest WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})