From 0170977914af3dd8dccc445485f13e59e0ede348 Mon Sep 17 00:00:00 2001 From: Vasista Vovveti Date: Mon, 16 Nov 2020 00:50:30 -0600 Subject: [PATCH] [build] CMake: build sim extensions as shared libs (#2866) This builds sim extensions as dylib's instead of so's on macOS. --- simulation/halsim_ds_socket/CMakeLists.txt | 2 +- simulation/halsim_gui/CMakeLists.txt | 2 +- simulation/halsim_ws_client/CMakeLists.txt | 2 +- simulation/halsim_ws_server/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/simulation/halsim_ds_socket/CMakeLists.txt b/simulation/halsim_ds_socket/CMakeLists.txt index 3e2518c8e2..bc9adb1041 100644 --- a/simulation/halsim_ds_socket/CMakeLists.txt +++ b/simulation/halsim_ds_socket/CMakeLists.txt @@ -4,7 +4,7 @@ include(CompileWarnings) file(GLOB halsim_ds_socket_src src/main/native/cpp/*.cpp) -add_library(halsim_ds_socket MODULE ${halsim_ds_socket_src}) +add_library(halsim_ds_socket SHARED ${halsim_ds_socket_src}) wpilib_target_warnings(halsim_ds_socket) set_target_properties(halsim_ds_socket PROPERTIES DEBUG_POSTFIX "d") target_link_libraries(halsim_ds_socket PUBLIC hal) diff --git a/simulation/halsim_gui/CMakeLists.txt b/simulation/halsim_gui/CMakeLists.txt index 424ff5bdc7..bd45b62789 100644 --- a/simulation/halsim_gui/CMakeLists.txt +++ b/simulation/halsim_gui/CMakeLists.txt @@ -5,7 +5,7 @@ include(LinkMacOSGUI) file(GLOB halsim_gui_src src/main/native/cpp/*.cpp) -add_library(halsim_gui MODULE ${halsim_gui_src}) +add_library(halsim_gui SHARED ${halsim_gui_src}) wpilib_target_warnings(halsim_gui) set_target_properties(halsim_gui PROPERTIES DEBUG_POSTFIX "d") diff --git a/simulation/halsim_ws_client/CMakeLists.txt b/simulation/halsim_ws_client/CMakeLists.txt index d869f28eab..5bc99dbda4 100644 --- a/simulation/halsim_ws_client/CMakeLists.txt +++ b/simulation/halsim_ws_client/CMakeLists.txt @@ -4,7 +4,7 @@ include(CompileWarnings) file(GLOB halsim_ws_client_src src/main/native/cpp/*.cpp) -add_library(halsim_ws_client MODULE ${halsim_ws_client_src}) +add_library(halsim_ws_client SHARED ${halsim_ws_client_src}) wpilib_target_warnings(halsim_ws_client) set_target_properties(halsim_ws_client PROPERTIES DEBUG_POSTFIX "d") target_link_libraries(halsim_ws_client PUBLIC hal halsim_ws_core) diff --git a/simulation/halsim_ws_server/CMakeLists.txt b/simulation/halsim_ws_server/CMakeLists.txt index d1c7983e36..e5b55c801b 100644 --- a/simulation/halsim_ws_server/CMakeLists.txt +++ b/simulation/halsim_ws_server/CMakeLists.txt @@ -4,7 +4,7 @@ include(CompileWarnings) file(GLOB halsim_ws_server_src src/main/native/cpp/*.cpp) -add_library(halsim_ws_server MODULE ${halsim_ws_server_src}) +add_library(halsim_ws_server SHARED ${halsim_ws_server_src}) wpilib_target_warnings(halsim_ws_server) set_target_properties(halsim_ws_server PROPERTIES DEBUG_POSTFIX "d") target_link_libraries(halsim_ws_server PUBLIC hal halsim_ws_core)