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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6219ab..37949c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,33 +8,46 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 find_package(Qt5Widgets)
 find_package(Qt5 CONFIG REQUIRED Widgets Gui)
+find_package(PkgConfig)
+pkg_check_modules(LOG4CXX REQUIRED liblog4cxx)
 
-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)
+#add_compile_options(${LOG4CXX_CFLAGS})
+add_definitions(${LOG4CXX_CFLAGS})
+
+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)
 
 set(CMAKE_CXX_COMPILER "clang++")
 
-SET(qtlldb_SOURCES src/Binary.cxx src/main.cxx src/gui/Mainwindow.cxx)
-SET(qtlldb_HEADERS src/Binary.hxx src/include.hxx src/Section.hxx src/gui/Mainwindow.h++)
+SET(qtlldb_SOURCES
+  src/Binary.cxx
+  src/main.cxx
+  src/gui/Mainwindow.cxx
+  src/gui/widgets/BasicBlockWidget.cxx
+  src/disassembler/InstructionReader.cxx
+  src/disassembler/Target.cxx
+  src/disassembler/Disassembler.cxx)
+SET(qtlldb_HEADERS
+  src/Binary.hxx
+  src/include_llvm.hxx
+  src/Section.hxx
+  src/gui/Mainwindow.hxx
+  src/gui/widgets/BasicBlockWidget.hxx)
 
 ADD_EXECUTABLE(qtlldb ${qtlldb_SOURCES} ${qtlldb_HEADERS_MOC})
 
-
-set(CMAKE_LD_FLAGS  "${LLVM_LDFLAGS}")
-set(CMAKE_LIBS  "${LLVM_LIBS}")
-
 ADD_DEFINITIONS(${QT_DEFINITIONS})
 
 qt5_use_modules(qtlldb Widgets)
 INCLUDE_DIRECTORIES("src")
 
 
-TARGET_LINK_LIBRARIES(qtlldb ${QT_LIBRARIES} ${LLVM_LDFLAGS} ${LLVM_LIBS})
+TARGET_LINK_LIBRARIES(qtlldb ${QT_LIBRARIES} ${LLVM_LDFLAGS} ${LLVM_LIBS} ${LOG4CXX_LDFLAGS})