Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid polluting global include and link dirs #20

Merged
merged 9 commits into from
Nov 29, 2020
Merged

Avoid polluting global include and link dirs #20

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f0a8b69
Avoid polluting global include and link dirs
rumblehhh Nov 24, 2020
97297e2
Fix travis-ci builds.
Nov 25, 2020
1b85b39
Use CMAKE_STATIC_LIBRARY_PREFIX/CMAKE_STATIC_LIBRARY_SUFFIX
rumblehhh Nov 26, 2020
8ecd7f9
Install captone to match zydis behaviour
rumblehhh Nov 26, 2020
d047338
Use ${CMAKE_INSTALL_LIBDIR} instead of hardcoded lib directory
rumblehhh Nov 26, 2020
8fa55a3
Move inclusion of GNUInstallDirs earlier
rumblehhh Nov 26, 2020
8c3786f
Include GNUInstallDirs after project definition.
rumblehhh Nov 26, 2020
a5fc944
Merge branch 'master' into patch-3
rumblehhh Nov 26, 2020
23f97d3
Zydis includes GNUInstallDirs prior to language being enabled
rumblehhh Nov 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ project(funchook LANGUAGES C ASM)
set(PROJECT_VERSION 1.1.0)
set(PROJECT_VERSION_MAJOR 1)

include("GNUInstallDirs")

if(NOT FUNCHOOK_CPU)
set(FUNCHOOK_CPU ${CMAKE_SYSTEM_PROCESSOR})
if (FUNCHOOK_CPU STREQUAL x86_64 OR FUNCHOOK_CPU MATCHES "i.86" OR FUNCHOOK_CPU STREQUAL AMD64)
Expand Down Expand Up @@ -67,6 +69,14 @@ else ()
set(TOOLCHAIN_FILE "")
endif ()

if (WIN32)
set(FUNCHOOK_OS windows)
set(FUNCHOOK_DEPS psapi)
else ()
set(FUNCHOOK_OS unix)
set(FUNCHOOK_DEPS dl)
endif ()

#
# capstone
#
Expand Down Expand Up @@ -102,12 +112,13 @@ if (DISASM_CAPSTONE)
-DCAPSTONE_TMS320C64X_SUPPORT=OFF
-DCAPSTONE_XCORE_SUPPORT=OFF
-DCAPSTONE_X86_SUPPORT=${CAPSTONE_x86_SUPPORT}
INSTALL_COMMAND ""
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
)
ExternalProject_Get_Property(capstone_src SOURCE_DIR)
include_directories(${SOURCE_DIR}/include)
ExternalProject_Get_Property(capstone_src BINARY_DIR)
link_directories(${BINARY_DIR})
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/include)
add_library(capstone STATIC IMPORTED)
set_property(TARGET capstone PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}capstone${CMAKE_STATIC_LIBRARY_SUFFIX})
set_property(TARGET capstone PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/include)
list(APPEND FUNCHOOK_DEPS capstone)
set(DISASM capstone)
endif ()

Expand Down Expand Up @@ -136,6 +147,7 @@ if (DISASM_DISTORM)
target_compile_options(distorm PRIVATE -fvisibility=hidden)
endif ()
set(DISASM distorm)
list(APPEND FUNCHOOK_DEPS distorm)
endif ()

#
Expand All @@ -158,23 +170,18 @@ if (DISASM_ZYDIS)
-DZYDIS_BUILD_TOOLS=OFF
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install && ${CMAKE_COMMAND} --build zycore --target install
)
include_directories(${CMAKE_BINARY_DIR}/include)
link_directories(${CMAKE_BINARY_DIR}/lib)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/include)
add_library(Zydis STATIC IMPORTED)
set_property(TARGET Zydis PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}Zydis${CMAKE_STATIC_LIBRARY_SUFFIX})
set_property(TARGET Zydis PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/include)
list(APPEND FUNCHOOK_DEPS Zydis)
set(DISASM Zydis)
endif ()

#
# funchook
#

if (WIN32)
set(FUNCHOOK_OS windows)
set(FUNCHOOK_DEPS psapi)
else ()
set(FUNCHOOK_OS unix)
set(FUNCHOOK_DEPS dl)
endif ()

set(FUNCHOOK_SOURCES src/funchook.c src/funchook_${FUNCHOOK_CPU}.c src/funchook_${FUNCHOOK_OS}.c src/disasm_${DISASM}.c)

set(FUNCHOOK_PROPERTIES
Expand All @@ -193,7 +200,7 @@ function (add_funchook_library target_name target_type)
set_target_properties(${target_name} PROPERTIES ${FUNCHOOK_PROPERTIES})
target_include_directories(${target_name} PUBLIC include)
target_include_directories(${target_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) # to include config.h
target_link_libraries(${target_name} PRIVATE ${DISASM} ${FUNCHOOK_DEPS})
target_link_libraries(${target_name} PRIVATE ${FUNCHOOK_DEPS})
if (HAVE_FVISIBILITY_HIDDEN)
target_compile_options(${target_name} PRIVATE -fvisibility=hidden)
endif ()
Expand Down Expand Up @@ -226,8 +233,6 @@ endif ()
# install
#

include("GNUInstallDirs")

install(FILES include/funchook.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

if (FUNCHOOK_BUILD_SHARED)
Expand Down