X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=CMakeLists.txt;h=37949c23506bf21166d293e4f4988aec05326ad8;hp=c1ef103a5de1dbd2fbbdcf796f12741f421fa9a2;hb=0454d885d5994f4d6b765864b77998137dad7204;hpb=2a014774e29e324bc5b5f26143d0384351738ca1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1ef103..37949c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,15 +11,16 @@ find_package(Qt5 CONFIG REQUIRED Widgets Gui)
 find_package(PkgConfig)
 pkg_check_modules(LOG4CXX REQUIRED liblog4cxx)
 
-add_compile_options(${LOG4CXX_CFLAGS})
+#add_compile_options(${LOG4CXX_CFLAGS})
+add_definitions(${LOG4CXX_CFLAGS})
 
-execute_process(COMMAND llvm-config-3.4 --cflags  OUTPUT_VARIABLE LLVM_CFLAGS  OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND llvm-config-3.4 --ldflags OUTPUT_VARIABLE LLVM_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND llvm-config-3.4 --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)
 
 separate_arguments(LLVM_CFLAGS)
-add_compile_options(${LLVM_CFLAGS})
-add_compile_options(-std=c++11 -Wall)
+add_definitions(${LLVM_CFLAGS})
+add_definitions(-std=c++11 -Wall)
 
 separate_arguments(LLVM_LDFLAGS)
 separate_arguments(LLVM_LIBS)
@@ -36,7 +37,7 @@ SET(qtlldb_SOURCES
   src/disassembler/Disassembler.cxx)
 SET(qtlldb_HEADERS
   src/Binary.hxx
-  src/include.hxx
+  src/include_llvm.hxx
   src/Section.hxx
   src/gui/Mainwindow.hxx
   src/gui/widgets/BasicBlockWidget.hxx)