Update FindLIEF

This commit is contained in:
Romain Thomas 2021-01-04 10:50:12 +01:00
parent c30a580d6b
commit 65e36a6650
6 changed files with 12 additions and 11 deletions

View File

@ -1,4 +1,4 @@
@PACKAGE_INIT@
set(LIEF_INSTALL_PATH "${PACKAGE_PREFIX_DIR}")
set(LIEF_DIR "${PACKAGE_PREFIX_DIR}")
include("${CMAKE_CURRENT_LIST_DIR}/FindLIEF.cmake")

View File

@ -7,6 +7,7 @@ int main(int argc, char** argv) {
return 1;
}
std::unique_ptr<LIEF::Binary> binary = LIEF::Parser::parse(argv[1]);
auto binary = LIEF::Parser::parse(argv[1]);
std::cout << *binary << std::endl;
return 0;
}

View File

@ -6,10 +6,10 @@ project(CMakeLIEF)
# ==============================
# Custom path to the LIEF install directory
set(LIEF_INSTALL_PATH CACHE PATH ${CMAKE_INSTALL_PREFIX})
set(LIEF_DIR CACHE PATH ${CMAKE_INSTALL_PREFIX})
# Directory to 'FindLIEF.cmake'
list(APPEND CMAKE_MODULE_PATH ${LIEF_INSTALL_PATH}/share/LIEF/cmake)
list(APPEND CMAKE_MODULE_PATH ${LIEF_DIR}/share/LIEF/cmake)
# include 'FindLIEF.cmake'
include(FindLIEF)

View File

@ -6,7 +6,7 @@ LIEF CMake Integration Example - find_package()
$ mkdir build
$ cd build
$ cmake -DLIEF_ROOT=<PATH_TO_LIEF_INSTALL_DIR> .. # By default, LIEF_ROOT=CMAKE_INSTALL_PREFIX
$ cmake -DLIEF_DIR=<PATH_TO_LIEF_INSTALL_DIR> .. # By default, LIEF_DIR=CMAKE_INSTALL_PREFIX
$ make
$ HelloLIEF /bin/ls # or explorer.exe or whatever

View File

@ -7,7 +7,7 @@ int main(int argc, char** argv) {
return 1;
}
LIEF::Binary* binary = LIEF::Parser::parse(argv[1]);
auto binary = LIEF::Parser::parse(argv[1]);
std::cout << *binary << std::endl;
delete binary;
return 0;
}

View File

@ -31,7 +31,7 @@
# Hints
# ^^^^^
#
# A user may set ``LIEF_INSTALL_PATH`` to a LIEF installation root to tell this
# A user may set ``LIEF_DIR`` to a LIEF installation root to tell this
# module where to look.
#
# To choose between STATIC and SHARED version of LIEF library, one
@ -46,13 +46,13 @@
set(_LIEF_SEARCHES)
# Search LIEF_ROOT first if it is set.
if(LIEF_ROOT)
message(DEPRECATION "LIEF_ROOT is deprecated. Please use LIEF_INSTALL_PATH")
message(DEPRECATION "LIEF_ROOT is deprecated. Please use LIEF_DIR")
set(_LIEF_SEARCH_ROOT PATHS ${LIEF_ROOT} NO_DEFAULT_PATH)
list(APPEND _LIEF_SEARCHES _LIEF_SEARCH_ROOT)
endif()
if(LIEF_INSTALL_PATH)
set(_LIEF_SEARCH_ROOT PATHS ${LIEF_INSTALL_PATH} NO_DEFAULT_PATH)
if(LIEF_DIR)
set(_LIEF_SEARCH_ROOT PATHS ${LIEF_DIR} NO_DEFAULT_PATH)
list(APPEND _LIEF_SEARCHES _LIEF_SEARCH_ROOT)
endif()