Skip to content

Commit 24b3b7d

Browse files
[CMake] Fix static linking w/o V8.
When configuring a static library build with `-DWITH_V8=OFF`, there was a CMake error that there is no rule to build `libv8_monolith`, that is required by `libmutable_bundled`. This was due to a mistake in the configuration of the libraries included in `libmutable_bundled`. This commit introduces a check for `WITH_V8` before adding the V8 and Binaryen libraries to `libmutable_bundled`.
1 parent 468bc24 commit 24b3b7d

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,14 @@ else()
6666
list(
6767
APPEND static_libs
6868
"${LIBRARY_OUTPUT_PATH}/${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
69-
"${PROJECT_BINARY_DIR}/third-party/src/V8-build/out/obj/${CMAKE_STATIC_LIBRARY_PREFIX}v8_monolith${CMAKE_STATIC_LIBRARY_SUFFIX}"
70-
"${PROJECT_BINARY_DIR}/third-party/src/Binaryen-build/lib/${CMAKE_STATIC_LIBRARY_PREFIX}binaryen${CMAKE_STATIC_LIBRARY_SUFFIX}"
7169
)
70+
if(${WITH_V8})
71+
list(
72+
APPEND static_libs
73+
"${PROJECT_BINARY_DIR}/third-party/src/Binaryen-build/lib/${CMAKE_STATIC_LIBRARY_PREFIX}binaryen${CMAKE_STATIC_LIBRARY_SUFFIX}"
74+
"${PROJECT_BINARY_DIR}/third-party/src/V8-build/out/obj/${CMAKE_STATIC_LIBRARY_PREFIX}v8_monolith${CMAKE_STATIC_LIBRARY_SUFFIX}"
75+
)
76+
endif()
7277
foreach(lib_target ${Boost_LIBRARIES})
7378
get_target_property(lib_location ${lib_target} LOCATION)
7479
list(APPEND static_libs ${lib_location})

0 commit comments

Comments
 (0)