X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=CMakeLists.txt;h=c88c46a75ab99240fe2f7aeb034c679e186ecf1c;hp=7b8663434be6b35fe27badfd74ac85a01d69e8b5;hb=f44ed1e33c85254a6176b1db3775b9b13baaaa29;hpb=ccde95277ce5e3929d09aef387c2f5956592d066

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b86634..c88c46a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,10 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules")
 
-
 find_package(Qt5Widgets)
 find_package(Qt5 CONFIG REQUIRED Widgets Gui)
 find_package(QuaZip REQUIRED)
+find_package(LLVM REQUIRED)
 find_package(PkgConfig)
 pkg_check_modules(LOG4CXX REQUIRED liblog4cxx)
 pkg_check_modules(GUILE REQUIRED guile-2.0)
@@ -19,24 +19,6 @@ pkg_check_modules(GUILE REQUIRED guile-2.0)
 add_definitions(${LOG4CXX_CFLAGS})
 add_definitions(${GUILE_CFLAGS})
 
-find_program(LLVM_CONFIG llvm-config-3.5)
-
-if(NOT LLVM_CONFIG)
-  message(FATAL_ERROR "LLVM not found")
-endif()
-
-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)
-execute_process(COMMAND ${LLVM_CONFIG} --system-libs OUTPUT_VARIABLE LLVM_SYSTEM_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-string(REPLACE -O2 "" LLVM_CFLAGS ${LLVM_CFLAGS})
-string(REPLACE -fno-exceptions "" LLVM_CFLAGS ${LLVM_CFLAGS})
-string(REPLACE -fno-rtti "" LLVM_CFLAGS ${LLVM_CFLAGS})
-string(REPLACE -DNDEBUG "" LLVM_CFLAGS ${LLVM_CFLAGS})
-string(REPLACE -I "-isystem" LLVM_CFLAGS ${LLVM_CFLAGS})
-
-separate_arguments(LLVM_CFLAGS)
 add_definitions(${LLVM_CFLAGS})
 add_definitions(-std=c++11 -Wall -Wextra)
 add_definitions(-DQT_NO_KEYWORDS)
@@ -101,5 +83,5 @@ qt5_use_modules(fridatest Widgets)
 #ADD_SUBDIRECTORY(/usr/src/gtest gtest)
 ADD_SUBDIRECTORY(/usr/src/gmock gmock)
 enable_testing()
-target_link_libraries(fridatest gmock gtest gmock_main ${QT_LIBRARIES} ${LLVM_LDFLAGS} -lLLVM-3.5 ${LLVM_SYSTEM_LIBS} ${LOG4CXX_LDFLAGS} ${GUILE_LDFLAGS} ${QUAZIP_LIBRARIES})
-add_test(NAME fridatest COMMAND fridatest WORKING_DIRECTORY ${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})
+add_test(NAME fridatest COMMAND fridatest ${CMAKE_SOURCE_DIR})