Skip to content

Commit 9ce2612

Browse files
committed
Fix Rhythm processors on Linux
1 parent 1d220f1 commit 9ce2612

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ elseif(LINUX)
132132
target_compile_options(open-ephys PRIVATE -O3) #enable optimization for linux debug
133133
set_property(TARGET open-ephys PROPERTY RUNTIME_OUTPUT_DIRECTORY ${BASE_BUILD_DIRECTORY}/${CMAKE_BUILD_TYPE})
134134

135-
set(_copysrc "${RESOURCES_DIRECTORY}/DLLs/Linux/*.so" )
136-
file(GLOB _dllfiles ${_copysrc})
135+
set(DLLDIR ${RESOURCES_DIRECTORY}/DLLs/Linux)
136+
file(GLOB _dllfiles "${DLLDIR}/*.so")
137137
add_custom_command(TARGET open-ephys POST_BUILD
138138
COMMAND ${CMAKE_COMMAND} -E copy ${_dllfiles} ${BIN_SHARED_DIR}
139139
)
@@ -164,6 +164,8 @@ elseif(APPLE)
164164
"-framework QuartzCore"
165165
"-framework WebKit"
166166
)
167+
168+
set(DLLDIR ${RESOURCES_DIRECTORY}/DLLs/Mac)
167169

168170
set_target_properties(open-ephys PROPERTIES
169171
XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf

Plugins/IntanRecordingController/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ add_sources(${PLUGIN_NAME}
2222
)
2323

2424
if (MSVC)
25-
target_link_libraries(${PLUGIN_NAME} ${DLLDIR}/okFrontPanel.lib)
25+
target_link_libraries(${PLUGIN_NAME} "${DLLDIR}/okFrontPanel.lib")
26+
elseif(LINUX)
27+
target_link_libraries(${PLUGIN_NAME} "${DLLDIR}/libokFrontPanel.so")
2628
endif()
2729

2830
#optional: create IDE groups
29-
plugin_create_filters()
31+
plugin_create_filters()

Plugins/RhythmNode/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ add_sources(${PLUGIN_NAME}
2121
)
2222

2323
if (MSVC)
24-
target_link_libraries(${PLUGIN_NAME} ${DLLDIR}/okFrontPanel.lib)
24+
target_link_libraries(${PLUGIN_NAME} "${DLLDIR}/okFrontPanel.lib")
25+
elseif(LINUX)
26+
target_link_libraries(${PLUGIN_NAME} "${DLLDIR}/libokFrontPanel.so")
2527
endif()
2628

2729
#optional: create IDE groups
28-
plugin_create_filters()
30+
plugin_create_filters()

0 commit comments

Comments
 (0)