Skip to content

Link libraries and the MSVC CRT statically #38

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Link libraries and the MSVC CRT statically #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ include_directories(${NODE_ADDON_API_DIR} ${CMAKE_JS_INC} ${CMAKE_CURRENT_SOURCE

add_library(${PROJECT_NAME} SHARED ${SOURCES} ${CMAKE_JS_SRC})
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB} CANBridge wpiHal wpiutil)
target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB} CANBridge-static wpiHal wpiutil)

target_link_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/externalCompileTimeDeps)

Expand All @@ -68,11 +68,17 @@ target_link_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/prebu
target_link_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/prebuilds/node_canbridge-linux-arm32)
target_link_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/prebuilds/node_canbridge-darwin-osxuniversal)

# Link against Visual C++ CRT statically
if(WIN32)
target_compile_options(${PROJECT_NAME} PUBLIC /MT)
endif()

include(move-files.cmake)

# TODO: Delete this whole section once we're linking against all libraries statically
foreach(CONFIG_TYPE IN LISTS CMAKE_CONFIGURATION_TYPES)
# Windows
create_move_target(CANBridge.dll ${CMAKE_CURRENT_SOURCE_DIR}/prebuilds/node_canbridge-win32-x64/CANBridge.dll ${CONFIG_TYPE}/CANBridge.dll)
# create_move_target(CANBridge.dll ${CMAKE_CURRENT_SOURCE_DIR}/prebuilds/node_canbridge-win32-x64/CANBridge.dll ${CONFIG_TYPE}/CANBridge.dll)
create_move_target(wpiHal.dll ${CMAKE_CURRENT_SOURCE_DIR}/prebuilds/node_canbridge-win32-x64/wpiHal.dll ${CONFIG_TYPE}/wpiHal.dll)
create_move_target(wpiUtil.dll ${CMAKE_CURRENT_SOURCE_DIR}/prebuilds/node_canbridge-win32-x64/wpiUtil.dll ${CONFIG_TYPE}/wpiUtil.dll)

Expand Down
5 changes: 3 additions & 2 deletions scripts/download-CanBridge.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ const tempDir = 'temp';

try {
await Promise.all(Array.of(
downloadCanBridgeArtifact('CANBridge.lib', externalCompileTimeDepsPath),
downloadCanBridgeArtifact('CANBridge.dll', runtimeArtifactsPath),
downloadCanBridgeArtifact('CANBridge-static.lib', externalCompileTimeDepsPath),
// TODO: Download static versions of wpiHal and wpiutil
// (consider merging https://github.com/REVrobotics/CANBridge/pull/37)
downloadCanBridgeArtifact('wpiHal.lib', externalCompileTimeDepsPath),
downloadCanBridgeArtifact('wpiHal.dll', runtimeArtifactsPath),
downloadCanBridgeArtifact('wpiutil.lib', externalCompileTimeDepsPath),
Expand Down