Fix SWIG generation for maps

[frida/frida.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa3d082c7df988faafe09e9403572fce74e2d61b..49f09e09c952819805dd43fba9ab0b8f08c8d50c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
@@ -138,9 +141,14 @@ enable_testing()
 add_test(NAME fridatest COMMAND fridatest ${CMAKE_SOURCE_DIR})
 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
+  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