(De)serialization of Comments

[frida/frida.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36cf17e0a99b5d826eee7d744e6e1dc26ab1911e..cbc597f0f6ed7ddc7f4bbeb7dc99cae656476d3b 100644 (file)
--- 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)
@@ -36,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)
@@ -125,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}
   )
 
@@ -135,7 +139,7 @@ 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})
+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})
 target_compile_options(fridatest PRIVATE -DCONFIG_TEST)
 set_property(TEST fridatest