X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=CMakeLists.txt;h=cbc597f0f6ed7ddc7f4bbeb7dc99cae656476d3b;hp=9d27f61b6add59a10607938575cb77303c5701e5;hb=3a4fade0292b9b8776c6195467b70a8f25a3b1c7;hpb=b99a252c3503b095b6111b59b11a6659e42205c8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d27f61..cbc597f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.0.0)
 PROJECT(frida)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules")
+include(GNUInstallDirs)
 
 find_package(Qt5Widgets)
 find_package(Qt5 CONFIG REQUIRED Widgets Gui)
@@ -15,9 +15,9 @@ find_package(PkgConfig)
 pkg_check_modules(LOG4CXX REQUIRED liblog4cxx)
 pkg_check_modules(GUILE REQUIRED guile-2.0)
 FIND_PACKAGE(SWIG REQUIRED)
+find_program(SWIG_EXECUTABLE NAMES swig3.0)
 INCLUDE(${SWIG_USE_FILE})
 
-#add_compile_options(${LOG4CXX_CFLAGS})
 add_definitions(${LOG4CXX_CFLAGS})
 add_definitions(${GUILE_CFLAGS})
 
@@ -29,17 +29,21 @@ separate_arguments(LLVM_LDFLAGS)
 separate_arguments(LLVM_LIBS)
 
 INCLUDE_DIRECTORIES("src")
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
 
 #####################
 # Language Bindings #
 #####################
 
 SET(CMAKE_SWIG_FLAGS -Linkage passive)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -DSWIGWORDSIZE64)
+endif()
 #FIND_PACKAGE(PythonLibs)
 #INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
 SET_SOURCE_FILES_PROPERTIES(src/bindings/guile/frida.i PROPERTIES CPLUSPLUS ON)
-SWIG_ADD_MODULE(frida-guile guile src/bindings/guile/frida.i)
-SWIG_LINK_LIBRARIES(frida-guile ${GUILE_LDFLAGS})
+SWIG_ADD_MODULE(guile-frida-binding guile src/bindings/guile/frida.i)
+SWIG_LINK_LIBRARIES(guile-frida-binding ${GUILE_LDFLAGS})
 
 
 #################
@@ -49,10 +53,14 @@ SWIG_LINK_LIBRARIES(frida-guile ${GUILE_LDFLAGS})
 SET(frida_SOURCES
   src/core/InformationManager.cxx
   src/core/BasicBlock.cxx
+  src/core/Comment.cxx
   src/core/Function.cxx
   src/gui/Mainwindow.cxx
   src/gui/widgets/BasicBlockWidget.cxx
   src/gui/widgets/CFGScene.cxx
+  src/gui/widgets/FridaDock.cxx
+  src/gui/widgets/LogDock.cxx
+  src/gui/widgets/LogDockAppender.cxx
   src/gui/widgets/ScriptingDock.cxx
   src/gui/widgets/FunctionWidget.cxx
   src/gui/dialogs/NewFunctionDialog.cxx
@@ -67,6 +75,9 @@ SET(frida_HEADERS
   src/gui/Mainwindow.hxx
   src/gui/widgets/BasicBlockWidget.hxx
   src/gui/widgets/CFGScene.hxx
+  src/gui/widgets/FridaDock.hxx
+  src/gui/widgets/LogDock.hxx
+  src/gui/widgets/LogDockAppender.hxx
   src/gui/widgets/ScriptingDock.hxx
   src/gui/widgets/FunctionWidget.hxx
   src/gui/dialogs/NewFunctionDialog.hxx
@@ -76,7 +87,7 @@ SET(frida_HEADERS
   )
 
 ADD_EXECUTABLE(frida src/main.cxx ${frida_SOURCES} ${frida_HEADERS_MOC})
-#ADD_LIBRARY(llvm SHARED )
+
 
 ADD_DEFINITIONS(${QT_DEFINITIONS})
 
@@ -90,6 +101,7 @@ TARGET_LINK_LIBRARIES(frida
   ${LOG4CXX_LDFLAGS}
   ${QUAZIP_LIBRARIES})
 
+configure_file(src/Config.hxx.in src/Config.hxx @ONLY)
 
 ###########
 # Plugins #
@@ -98,7 +110,6 @@ TARGET_LINK_LIBRARIES(frida
 # GUILE
 
 set(plugin_guile_SOURCES
-  src/bindings/Interpreter.cxx
   src/bindings/Guile.cxx)
 
 set(plugin_guile_HEADERS
@@ -117,6 +128,7 @@ set(fridatest_SOURCES
   src/test.cxx
   src/core/tests/BasicBlockTest.cxx
   src/core/tests/FunctionTest.cxx
+  src/core/tests/CommentTest.cxx
   ${frida_SOURCES}
   )
 
@@ -127,5 +139,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}/testdata)
 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})
+target_compile_options(fridatest PRIVATE -DCONFIG_TEST)
+set_property(TEST fridatest
+  APPEND PROPERTY ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR})
+
+install(TARGETS frida
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+install(TARGETS guilePlugin
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/frida/plugins/Interpreter)
+
+install(TARGETS guile-frida-binding
+  DESTINATION ${CMAKE_INSTALL_LIBDIR})
\ No newline at end of file