Skip to content

Commit 0c18d45

Browse files
committed
feat: link jemalloc in cli
1 parent a93c6fd commit 0c18d45

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

jetpack-cli/CMakeLists.txt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,21 @@ target_include_directories(${PROJECT_NAME} PRIVATE
99
"../esparser/src"
1010
"../jetpack/src/"
1111
)
12-
target_link_libraries(${PROJECT_NAME} PRIVATE jetpack)
12+
13+
set(CLI_LIBS "")
14+
15+
if (UNIX AND NOT EMSCRIPTEN)
16+
17+
if (APPLE)
18+
execute_process(COMMAND uname -m OUTPUT_VARIABLE MACHINE_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
19+
message("CLI ARCH: ${MACHINE_ARCH}")
20+
set(CLI_LIBS ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/mac/${MACHINE_ARCH}/libjemalloc.a)
21+
else()
22+
23+
set(CLI_LIBS "-lpthread -ldl ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/linux/libjemalloc_pic.a" )
24+
25+
endif()
26+
27+
ENDIF()
28+
29+
target_link_libraries(${PROJECT_NAME} PRIVATE jetpack ${CLI_LIBS})

jetpack/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ if (UNIX AND NOT EMSCRIPTEN)
9696
execute_process(COMMAND uname -m OUTPUT_VARIABLE MACHINE_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
9797
message("ARCH: ${MACHINE_ARCH}")
9898

99-
target_link_libraries(jetpack ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/mac/${MACHINE_ARCH}/libjemalloc.a)
99+
target_link_libraries(jetpack-test ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/mac/${MACHINE_ARCH}/libjemalloc.a)
100100
target_link_libraries(jetpackd ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/mac/${MACHINE_ARCH}/libjemalloc.2.${DYLIB_SUFFIX})
101101

102102
else()
103103

104104
message("linux jemalloc")
105105
SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -pthread)
106-
target_link_libraries(jetpack-test ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/linux/libjemalloc_pic.a)
106+
target_link_libraries(jetpack-test -ldl ${PROJECT_SOURCE_DIR}/../third_party/jemalloc/lib/linux/libjemalloc_pic.a)
107107

108108
endif()
109109

0 commit comments

Comments
 (0)