|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index 43464c9..bbbcebc 100644
|
|
|
|
|
index 60b4da8..13141a9 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -1,6 +1,6 @@
|
|
|
|
|
@@ -26,7 +26,16 @@ index 43464c9..bbbcebc 100644
|
|
|
|
|
|
|
|
|
|
set(LIBMEM_DIR "${PROJECT_SOURCE_DIR}")
|
|
|
|
|
set(LIBMEM_INC "${LIBMEM_DIR}/include")
|
|
|
|
|
@@ -98,10 +100,16 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
|
|
|
|
|
@@ -73,7 +75,7 @@ set(INTERNAL_DIR "${LIBMEM_DIR}/internal")
|
|
|
|
|
set(COMMON_DIR "${LIBMEM_DIR}/src/common")
|
|
|
|
|
|
|
|
|
|
if(${CMAKE_SYSTEM_NAME} STREQUAL Windows OR ${CMAKE_SYSTEM_NAME} STREQUAL CYGWIN)
|
|
|
|
|
- if(${LIBMEM_ARCH} STREQUAL AMD64 OR ${LIBMEM_ARCH} STREQUAL X86 OR ${LIBMEM_ARCH} STREQUAL x86_64 OR ${LIBMEM_ARCH} STREQUAL i686 OR ${LIBMEM_ARCH} STREQUAL i386)
|
|
|
|
|
+ if(${LIBMEM_ARCH} STREQUAL AMD64 OR ${LIBMEM_ARCH} STREQUAL x86 OR ${LIBMEM_ARCH} STREQUAL x86_64 OR ${LIBMEM_ARCH} STREQUAL i686 OR ${LIBMEM_ARCH} STREQUAL i386)
|
|
|
|
|
set(LIBMEM_ARCH_SRC "${LIBMEM_DIR}/src/common/arch/x86.c")
|
|
|
|
|
elseif(${LIBMEM_ARCH} STREQUAL aarch64)
|
|
|
|
|
set(LIBMEM_ARCH_SRC "${LIBMEM_DIR}/src/common/arch/aarch64.c")
|
|
|
|
|
@@ -108,10 +110,16 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
|
|
|
|
|
|
|
|
|
|
file(GLOB LIBMEM_SRC ${LIBMEM_ARCH_SRC} "${LIBMEM_DIR}/src/freebsd/*.c" "${LIBMEM_DIR}/src/freebsd/ptrace/*.c" "${LIBMEM_DIR}/src/common/*.c" "${LIBMEM_DIR}/src/common/*.cpp" "${INTERNAL_DIR}/posixutils/*.c" "${INTERNAL_DIR}/elfutils/*.c" "${INTERNAL_DIR}/demangler/*.cpp")
|
|
|
|
|
endif()
|
|
|
|
|
@@ -46,7 +55,7 @@ index 43464c9..bbbcebc 100644
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if (LIBMEM_BUILD_STATIC)
|
|
|
|
|
@@ -113,9 +121,6 @@ target_include_directories(libmem PRIVATE "${LIBMEM_DIR}/src" "${INTERNAL_DIR}"
|
|
|
|
|
@@ -123,9 +131,6 @@ target_include_directories(libmem PRIVATE "${LIBMEM_DIR}/src" "${INTERNAL_DIR}"
|
|
|
|
|
|
|
|
|
|
include_directories(${PROJECT_SOURCE_DIR}
|
|
|
|
|
${LIBMEM_INC}
|
|
|
|
|
@@ -56,7 +65,7 @@ index 43464c9..bbbcebc 100644
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if (LIBMEM_BUILD_TESTS)
|
|
|
|
|
@@ -125,10 +130,6 @@ endif()
|
|
|
|
|
@@ -135,10 +140,6 @@ endif()
|
|
|
|
|
|
|
|
|
|
set_target_properties(libmem PROPERTIES POSITION_INDEPENDENT_CODE True INCLUDES ${LIBMEM_INC})
|
|
|
|
|
target_compile_definitions(libmem PUBLIC LM_EXPORT)
|
|
|
|
|
@@ -67,7 +76,7 @@ index 43464c9..bbbcebc 100644
|
|
|
|
|
|
|
|
|
|
if(${CMAKE_SYSTEM_NAME} STREQUAL Windows OR ${CMAKE_SYSTEM_NAME} STREQUAL CYGWIN)
|
|
|
|
|
set(LIBMEM_DEPS
|
|
|
|
|
@@ -161,7 +162,7 @@ else()
|
|
|
|
|
@@ -171,7 +172,7 @@ else()
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
target_link_libraries(libmem ${LIBMEM_DEPS})
|
|
|
|
|
@@ -76,7 +85,7 @@ index 43464c9..bbbcebc 100644
|
|
|
|
|
# Create a bundled static library containing all dependencies (to mimic the shared library behavior)
|
|
|
|
|
set_target_properties(libmem PROPERTIES OUTPUT_NAME "libmem_partial")
|
|
|
|
|
set(libmem_bundle_files "$<TARGET_FILE:libmem>")
|
|
|
|
|
@@ -202,7 +203,7 @@ if(LIBMEM_BUILD_STATIC)
|
|
|
|
|
@@ -212,7 +213,7 @@ if(LIBMEM_BUILD_STATIC)
|
|
|
|
|
endif()
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
@@ -85,7 +94,7 @@ index 43464c9..bbbcebc 100644
|
|
|
|
|
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL CYGWIN)
|
|
|
|
|
cmake_path(SET CMAKE_INSTALL_PREFIX "$ENV{ProgramFiles}")
|
|
|
|
|
else()
|
|
|
|
|
@@ -211,14 +212,27 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL Windows OR ${CMAKE_SYSTEM_NAME} STREQUAL CYGWIN
|
|
|
|
|
@@ -221,14 +222,27 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL Windows OR ${CMAKE_SYSTEM_NAME} STREQUAL CYGWIN
|
|
|
|
|
endif()
|
|
|
|
|
set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/libmem")
|
|
|
|
|
execute_process(COMMAND mkdir "${CMAKE_INSTALL_PREFIX}")
|
|
|
|
|
|