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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 242fbfc..cbc597f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.0.0)
 PROJECT(frida)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
@@ -15,6 +15,7 @@ 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_definitions(${LOG4CXX_CFLAGS})
@@ -35,6 +36,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
 #####################
 
 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)
@@ -124,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}
   )
 
@@ -134,13 +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 guile-frida-binding
+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