From 256e640fc0de4ceab3f32eac15b7f0ac3aa56173 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Sun, 21 Dec 2014 19:32:24 +0100
Subject: [PATCH] This is release Frida2.2.2a (corrected).
---
distrib/core/HOWTO | 1 -
pub/CMakeLists.txt | 3 ++-
pub/cmake/modules/FindFridalibs.cmake | 20 --------------------
pub/lib/CMakeLists.txt | 5 ++---
4 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/distrib/core/HOWTO b/distrib/core/HOWTO
index de682327..d442d822 100755
--- a/distrib/core/HOWTO
+++ b/distrib/core/HOWTO
@@ -61,4 +61,3 @@ cd build; m -j7; mi
kcom # Starting post-...
kush
-
diff --git a/pub/CMakeLists.txt b/pub/CMakeLists.txt
index 25f10b87..efb82ed2 100644
--- a/pub/CMakeLists.txt
+++ b/pub/CMakeLists.txt
@@ -11,7 +11,7 @@ project(Frida)
# --- The version number ---
-set(Frida_VERSION post-2.2.2a)
+set(Frida_VERSION 2.2.2a)
# --- General project settings ---
#option(FRIDA_PYTHON "Build with python support" ON)
@@ -35,6 +35,7 @@ include(FindGSL)
include(FindFFTW)
include(FindYamlCpp)
include(FindFridalibs)
+include(FindReadline)
#--- Including macros ---
#include(FridaMacros)
diff --git a/pub/cmake/modules/FindFridalibs.cmake b/pub/cmake/modules/FindFridalibs.cmake
index 8e612335..df24d908 100644
--- a/pub/cmake/modules/FindFridalibs.cmake
+++ b/pub/cmake/modules/FindFridalibs.cmake
@@ -1,21 +1,5 @@
message( "FindFridalibs.cmake begin" )
-function(find_trivia)
- find_path(LIBTRIVIA_INCLUDES trivia/file_ops.hpp PATH_SUFFIXES trivia )
- find_library(LIBTRIVIA_LIBS NAMES trivia )
- find_package_handle_standard_args(libtrivia DEFAULT_MSG
- LIBTRIVIA_LIBS LIBTRIVIA_INCLUDES)
-endfunction(find_trivia)
-
-
-function(find_readplus)
- find_path(LIBREADPLUS_INCLUDES readplus/ask.hpp PATH_SUFFIXES readplus )
- find_library(LIBREADPLUS_LIBS NAMES readplus )
- find_package_handle_standard_args(libreadplus DEFAULT_MSG
- LIBREADPLUS_LIBS LIBREADPLUS_INCLUDES)
-endfunction(find_readplus)
-
-
function(find_kww)
find_path(LIBKWW_INCLUDES kww.h )
find_library(LIBKWW_LIBS NAMES kww )
@@ -23,7 +7,6 @@ function(find_kww)
LIBKWW_LIBS LIBKWW_INCLUDES)
endfunction(find_kww)
-
function(find_cerf)
find_path(LIBCERF_INCLUDES cerf.h )
find_library(LIBCERF_LIBS NAMES cerf )
@@ -31,7 +14,6 @@ function(find_cerf)
LIBCERF_LIBS LIBCERF_INCLUDES)
endfunction(find_cerf)
-
function(find_lmfit)
find_path(LIBLMFIT_INCLUDES lmmin.h )
find_library(LIBLMFIT_LIBS NAMES lmfit )
@@ -41,8 +23,6 @@ endfunction(find_lmfit)
find_package(PkgConfig)
include(FindPackageHandleStandardArgs)
-find_trivia()
-find_readplus()
find_kww()
find_cerf()
find_lmfit()
diff --git a/pub/lib/CMakeLists.txt b/pub/lib/CMakeLists.txt
index 1973aed2..6c8dd51d 100644
--- a/pub/lib/CMakeLists.txt
+++ b/pub/lib/CMakeLists.txt
@@ -88,15 +88,14 @@ ${FLEX_xaxlex_OUTPUTS}
SET_TARGET_PROPERTIES(libfrida PROPERTIES OUTPUT_NAME frida)
-TARGET_LINK_LIBRARIES(libfrida
+TARGET_LINK_LIBRARIES(libfrida libreadplus libtrivia
${GSL_LIBRARIES}
${FFTW_LIBRARIES}
-${LIBTRIVIA_LIBS}
-${LIBREADPLUS_LIBS}
${LIBKWW_LIBS}
${LIBCERF_LIBS}
${YAMLCPP_LIBRARY}
${LIBLMFIT_LIBS}
+${READLINE_LIBRARIES}
)
INSTALL(TARGETS libfrida DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
--
GitLab