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

NodeJSUtils.cmake: adding missing libraries to the build #2

Closed
wants to merge 4 commits into from
Closed

NodeJSUtils.cmake: adding missing libraries to the build #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71b3fbb
NodeJSUtils.cmake: adding missing libraries to the build
TonyRice May 14, 2017
9677fdf
NodeJSUtils.cmake: fixing weird indention caused by my commit
TonyRice May 16, 2017
0313a05
CmakeLists.txt: removing usage of link_static_crt() - causing windows…
TonyRice May 16, 2017
235c9de
Merge remote-tracking branch 'drywolf/master' into cmake_drywolf_changes
TonyRice May 17, 2017
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
5 changes: 0 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,6 @@ if(J2V8_BUILD_ONLY_DEBUG_RELEASE)
#}
endif()

# link against the static MS C++ runtime libraries
if(MSVC)
link_static_crt()
endif()

# create the j2v8 library
add_library(j2v8 SHARED ${src_files})

Expand Down
14 changes: 7 additions & 7 deletions cmake/NodeJsUtils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,18 @@ function (get_njs_libs nodejs_dir config_name)
${njs_build_lib}/v8_base_1.lib
${njs_build_lib}/v8_base_2.lib
${njs_build_lib}/v8_base_3.lib
${njs_build_lib}/v8_base_4.lib
${njs_build_lib}/v8_base_5.lib
${njs_build_lib}/v8_base_6.lib
${njs_build_lib}/v8_base_7.lib
${njs_build_lib}/v8_base_8.lib
${njs_build_lib}/v8_base_9.lib
${njs_build_lib}/v8_libbase.lib
${njs_build_lib}/v8_libplatform.lib
${njs_build_lib}/v8_libsampler.lib
${njs_build_lib}/v8_nosnapshot.lib
${njs_build_lib}/v8_snapshot.lib

# nodejs/build/$Config
${njs_build}/mksnapshot.lib

# nodejs/$Config/lib
${njs_extra_lib}/cares.lib
${njs_extra_lib}/gtest.lib
Expand All @@ -41,9 +44,6 @@ function (get_njs_libs nodejs_dir config_name)
${njs_extra_lib}/openssl.lib
${njs_extra_lib}/zlib.lib

# nodejs/$Config
${njs_extra}/cctest.lib

# additional windows libs, required by Node.js
Dbghelp
Shlwapi
Expand Down Expand Up @@ -79,4 +79,4 @@ function (get_njs_libs nodejs_dir config_name)
#}
endif()
#}
endfunction (get_njs_libs)
endfunction (get_njs_libs)