Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Frida
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Coenen, Joachim
Frida
Commits
91845f1e
Commit
91845f1e
authored
9 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
link libreadline already in readplus, not later in libfrida
parent
62183de9
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
pub/cmake/modules/FindReadline.cmake
+13
-23
13 additions, 23 deletions
pub/cmake/modules/FindReadline.cmake
pub/lib/CMakeLists.txt
+0
-1
0 additions, 1 deletion
pub/lib/CMakeLists.txt
pub/readplus/CMakeLists.txt
+2
-3
2 additions, 3 deletions
pub/readplus/CMakeLists.txt
with
15 additions
and
27 deletions
pub/cmake/modules/FindReadline.cmake
+
13
−
23
View file @
91845f1e
#
-
Try to find READLINE
# Try to find READLINE
# Once done this will define
# Once done this will define
#
#
# READLINE_FOUND - system has READLINE
# READLINE_FOUND - system has READLINE
# READLINE_INCLUDE_DIR - the READLINE include directory
# READLINE_INCLUDE_DIR - the READLINE include directory
# READLINE_LIBRARIES - Link these to use READLINE
# READLINE_LIBRARIES - Link these to use READLINE
# READLINE_NEED_PREFIX - this is set if the functions are prefixed with BZ2_
# READLINE_NEED_PREFIX - this is set if the functions are prefixed with BZ2_
#=============================================================================
# Copyright 2006-2009 Kitware, Inc.
find_path
(
READLINE_INCLUDE_DIR readline/readline.h
)
# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
find_library
(
READLINE_LIBRARIES NAMES readline history READLINE
)
#
# Distributed under the OSI-approved BSD License (the "License");
# handle the QUIETLY and REQUIRED arguments and set READLINE_FOUND
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
find_path
(
READLINE_INCLUDE_DIR readline/readline.h
)
find_library
(
READLINE_LIBRARIES NAMES readline history READLINE
)
# handle the QUIETLY and REQUIRED arguments and set READLINE_FOUND to TRUE if
# all listed variables are TRUE
include
(
FindPackageHandleStandardArgs
)
include
(
FindPackageHandleStandardArgs
)
FIND_PACKAGE_HANDLE_STANDARD_ARGS
(
READLINE DEFAULT_MSG READLINE_LIBRARIES READLINE_INCLUDE_DIR
)
find_package_handle_standard_args
(
READLINE DEFAULT_MSG READLINE_LIBRARIES READLINE_INCLUDE_DIR
)
IF
(
READLINE_FOUND
)
if
(
READLINE_FOUND
)
include
(
CheckLibraryExists
)
include
(
CheckLibraryExists
)
CHECK_LIBRARY_EXISTS
(
${
READLINE_LIBRARIES
}
rl_initialize
""
READLINE_NEED_PREFIX
)
check_library_exists
(
${
READLINE_LIBRARIES
}
rl_initialize
""
READLINE_NEED_PREFIX
)
ENDIF
(
READLINE_FOUND
)
endif
(
READLINE_FOUND
)
message
(
STATUS
"READLINE_INCLUDE_DIR=
${
READLINE_INCLUDE_DIR
}
"
)
message
(
STATUS
"READLINE_LIBRARIES=
${
READLINE_LIBRARIES
}
"
)
mark_as_advanced
(
READLINE_INCLUDE_DIR READLINE_LIBRARIES
)
mark_as_advanced
(
READLINE_INCLUDE_DIR READLINE_LIBRARIES
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pub/lib/CMakeLists.txt
+
0
−
1
View file @
91845f1e
...
@@ -95,7 +95,6 @@ ${LIBKWW_LIBS}
...
@@ -95,7 +95,6 @@ ${LIBKWW_LIBS}
${
LIBCERF_LIBS
}
${
LIBCERF_LIBS
}
${
YAMLCPP_LIBRARY
}
${
YAMLCPP_LIBRARY
}
${
LIBLMFIT_LIBS
}
${
LIBLMFIT_LIBS
}
${
READLINE_LIBRARIES
}
)
)
install
(
TARGETS libfrida DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib
)
install
(
TARGETS libfrida DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib
)
This diff is collapsed.
Click to expand it.
pub/readplus/CMakeLists.txt
+
2
−
3
View file @
91845f1e
# frida: readplus/CMakeLists.txt
# frida: readplus/CMakeLists.txt
include_directories
(
${
Frida_SOURCE_DIR
}
/readplus
${
CMAKE_CURRENT_BINARY
_DIR
}
)
include_directories
(
${
Frida_SOURCE_DIR
}
/readplus
READLINE_INCLUDE
_DIR
)
set
(
src_files
set
(
src_files
ask.cpp
ask.cpp
...
@@ -20,7 +20,6 @@ ${src_files}
...
@@ -20,7 +20,6 @@ ${src_files}
set_target_properties
(
libreadplus PROPERTIES OUTPUT_NAME readplus
)
set_target_properties
(
libreadplus PROPERTIES OUTPUT_NAME readplus
)
target_link_libraries
(
libreadplus
target_link_libraries
(
libreadplus
${
READLINE_LIBRARIES
}
)
)
install
(
TARGETS libreadplus DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib
)
install
(
TARGETS libreadplus DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment