X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=CMakeLists.txt;h=ab55827c77f948cf760ea42a8eb0c85ef7a1c792;hp=bd078ad0ee6a38138d500338222f261f7068fe01;hb=9e283567ac56a6433e832d0fa38cf534a0cb8f9f;hpb=9f0c6d8fbed0f25248f28acced4c7372dd259d7a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd078ad..ab55827 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,15 +22,18 @@ if(NOT LLVM_CONFIG)
   message(FATAL_ERROR "LLVM not found")
 endif()
 
-execute_process(COMMAND ${LLVM_CONFIG} --cxxflags OUTPUT_VARIABLE LLVM_CFLAGS  OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${LLVM_CONFIG} --ldflags  OUTPUT_VARIABLE LLVM_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${LLVM_CONFIG} --libs     OUTPUT_VARIABLE LLVM_LIBS    OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${LLVM_CONFIG} --cxxflags    OUTPUT_VARIABLE LLVM_CFLAGS      OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${LLVM_CONFIG} --ldflags     OUTPUT_VARIABLE LLVM_LDFLAGS     OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${LLVM_CONFIG} --libs        OUTPUT_VARIABLE LLVM_LIBS        OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${LLVM_CONFIG} --system-libs OUTPUT_VARIABLE LLVM_SYSTEM_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-string(REPLACE -O2 '' LLVM_CFLAGS ${LLVM_CFLAGS})
+string(REPLACE -O2 "" LLVM_CFLAGS ${LLVM_CFLAGS})
+string(REPLACE -fno-exceptions "" LLVM_CFLAGS ${LLVM_CFLAGS})
 
 separate_arguments(LLVM_CFLAGS)
 add_definitions(${LLVM_CFLAGS})
 add_definitions(-std=c++11 -Wall)
+add_definitions(-DQT_NO_KEYWORDS)
 
 separate_arguments(LLVM_LDFLAGS)
 separate_arguments(LLVM_LIBS)
@@ -39,17 +42,21 @@ set(CMAKE_CXX_COMPILER "clang++")
 
 SET(frida_SOURCES
   src/main.cxx
+  src/core/InformationManager.cxx
   src/gui/Mainwindow.cxx
   src/gui/widgets/BasicBlockWidget.cxx
+  src/gui/widgets/CFGScene.cxx
   src/gui/widgets/ScriptingDock.cxx
   src/disassembler/Disassembler.cxx
   src/disassembler/llvm/LLVMDisassembler.cxx
   )
 SET(frida_HEADERS
   src/include_llvm.hxx
+  src/core/InformationManager.hxx
   src/gui/qt.hxx
   src/gui/Mainwindow.hxx
   src/gui/widgets/BasicBlockWidget.hxx
+  src/gui/widgets/CFGScene.hxx
   src/gui/widgets/ScriptingDock.hxx
   src/disassembler/llvm/LLVMDisassembler.hxx
   src/disassembler/Disassembler.hxx
@@ -63,4 +70,4 @@ ADD_DEFINITIONS(${QT_DEFINITIONS})
 qt5_use_modules(frida Widgets)
 INCLUDE_DIRECTORIES("src")
 
-TARGET_LINK_LIBRARIES(frida ${QT_LIBRARIES} ${LLVM_LDFLAGS} ${LLVM_LIBS} ${LOG4CXX_LDFLAGS} ${GUILE_LDFLAGS} -ltinfo -lpthread -ldl)
+TARGET_LINK_LIBRARIES(frida ${QT_LIBRARIES} ${LLVM_LDFLAGS} -lLLVM-3.5 ${LLVM_SYSTEM_LIBS} ${LOG4CXX_LDFLAGS} ${GUILE_LDFLAGS})