Fix building rhythm-based plugins on mac

Author: aacuevas

CMakeLists.txt

@@ -86,12 +86,12 @@ add_custom_command(TARGET open-ephys POST_BUILD
 		COMMAND ${CMAKE_COMMAND} -E make_directory "${BIN_SHARED_DIR}"
 		COMMAND ${CMAKE_COMMAND} -E make_directory "${BIN_PLUGIN_DIR}"
 		)
-		
+
 file(GLOB _bitfiles "${RESOURCES_DIRECTORY}/Bitfiles/*.bit")
 add_custom_command(TARGET open-ephys POST_BUILD
 		COMMAND ${CMAKE_COMMAND} -E copy ${_bitfiles} $<TARGET_FILE_DIR:open-ephys>
 		)
-	
+
 elseif(APPLE)
 	set(BIN_PLUGIN_DIR $<TARGET_FILE_DIR:open-ephys>/../PlugIns)
 	add_custom_command(TARGET open-ephys POST_BUILD
@@ -164,27 +164,18 @@ elseif(APPLE)
 		"-framework QuartzCore"
 		"-framework WebKit"
 	)
-	
+
 	set(DLLDIR ${RESOURCES_DIRECTORY}/DLLs/Mac)
 
 	set_target_properties(open-ephys PROPERTIES
 		XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf
 		XCODE_ATTRIBUTE_GCC_INLINES_ARE_PRIVATE_EXTERN YES
-		XCODE_ATTRIBUTE_GCC_WARN_ABOUT_RETURN_TYPE YES
-		XCODE_ATTRIBUTE_GCC_WARN_CHECK_SWITCH_STATEMENTS YES
-		XCODE_ATTRIBUTE_GCC_WARN_MISSING_PARENTHESES YES
-		XCODE_ATTRIBUTE_GCC_WARN_NON_VIRTUAL_DESTRUCTOR YES
-		XCODE_ATTRIBUTE_GCC_WARN_TYPECHECK_CALLS_TO_PRINTF YES
-		XCODE_ATTRIBUTE_GCC_WARN_UNUSED_VARIABLE YES
-		XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++0x"
-		XCODE_ATTRIBUTE_GCC_C_LANGUAGE_STANDARD c99
 		XCODE_ATTRIBUTE_CLANG_LINK_OBJC_RUNTIME NO
 		)
 
 		set(MAC_RESOURCE_FILES
 			${RESOURCES_DIRECTORY}/Build-files/Icon.icns
 			${RESOURCES_DIRECTORY}/Build-files/RecentFilesMenuTemplate.nib
-			${RESOURCES_DIRECTORY}/DLLs/Mac/libokFrontPanel.dylib
 			${RESOURCES_DIRECTORY}/Bitfiles/rhd2000.bit
 			${RESOURCES_DIRECTORY}/Bitfiles/rhd2000_usb3.bit
 			${RESOURCES_DIRECTORY}/Fonts/unibody-8.otf

Plugins/IntanRecordingController/CMakeLists.txt

@@ -20,12 +20,16 @@ add_sources(${PLUGIN_NAME}
 	USBThread.cpp
 	USBThread.h
 	)
-	
+
 if (MSVC)
 	target_link_libraries(${PLUGIN_NAME} "${DLLDIR}/okFrontPanel.lib")
 elseif(LINUX)
 	target_link_libraries(${PLUGIN_NAME} "${DLLDIR}/libokFrontPanel.so")
+elseif(APPLE)
+	target_link_libraries(${PLUGIN_NAME} "${DLLDIR}/libokFrontPanel.dylib")
+	set_source_files_properties(${DLLDIR}/libokFrontPanel.dylib PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks)
+	target_sources(${PLUGIN_NAME} PRIVATE ${DLLDIR}/libokFrontPanel.dylib)
 endif()
-	
+
 #optional: create IDE groups
 plugin_create_filters()

Plugins/PluginRules.cmake

@@ -21,7 +21,7 @@ if(MSVC)
 elseif(LINUX)
 	target_link_libraries(${PLUGIN_NAME} GL X11 Xext Xinerama asound dl freetype pthread rt)
 	set_property(TARGET ${PLUGIN_NAME} APPEND_STRING PROPERTY LINK_FLAGS
-		"-fvisibility=hidden -fPIC -rdynamic -Wl,-rpath,'$$ORIGIN/../shared'")
+		"-fvisibility=hidden -fPIC -rdynamic -Wl,-rpath,'$ORIGIN/../shared'")
 	target_compile_options(${PLUGIN_NAME} PRIVATE -fPIC -rdynamic)
 	target_compile_options(${PLUGIN_NAME} PRIVATE -O3) #enable optimization for linux debug
 elseif(APPLE)
@@ -36,14 +36,6 @@ elseif(APPLE)
 	set_target_properties(${PLUGIN_NAME} PROPERTIES
 		XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf
 		XCODE_ATTRIBUTE_GCC_INLINES_ARE_PRIVATE_EXTERN YES
-		XCODE_ATTRIBUTE_GCC_WARN_ABOUT_RETURN_TYPE YES
-		XCODE_ATTRIBUTE_GCC_WARN_CHECK_SWITCH_STATEMENTS YES
-		XCODE_ATTRIBUTE_GCC_WARN_MISSING_PARENTHESES YES
-		XCODE_ATTRIBUTE_GCC_WARN_NON_VIRTUAL_DESTRUCTOR YES
-		XCODE_ATTRIBUTE_GCC_WARN_TYPECHECK_CALLS_TO_PRINTF YES
-		XCODE_ATTRIBUTE_GCC_WARN_UNUSED_VARIABLE YES
-		XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++0x"
-		XCODE_ATTRIBUTE_GCC_C_LANGUAGE_STANDARD c99
 		XCODE_ATTRIBUTE_CLANG_LINK_OBJC_RUNTIME NO
 		)
 endif()

Plugins/RhythmNode/CMakeLists.txt

@@ -19,12 +19,16 @@ add_sources(${PLUGIN_NAME}
 	RHD2000Editor.h
 
 	)
-	
+
 if (MSVC)
 	target_link_libraries(${PLUGIN_NAME} "${DLLDIR}/okFrontPanel.lib")
 elseif(LINUX)
 	target_link_libraries(${PLUGIN_NAME} "${DLLDIR}/libokFrontPanel.so")
+elseif(APPLE)
+	target_link_libraries(${PLUGIN_NAME} "${DLLDIR}/libokFrontPanel.dylib")
+	set_source_files_properties(${DLLDIR}/libokFrontPanel.dylib PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks)
+	target_sources(${PLUGIN_NAME} PRIVATE ${DLLDIR}/libokFrontPanel.dylib)
 endif()
-	
+
 #optional: create IDE groups
 plugin_create_filters()