Merge pull request #6558 from lioncash/input

InputCommon/CMakeLists: Link in ForceFeedback library explicitly on macOS
dolphin-emu · Mar 30, 2018 · 7833f1a · 7833f1a
2 parents c3398c9 + b8a4ab2
commit 7833f1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -291,7 +291,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   find_library(FOUNDATION_LIBRARY Foundation)
   find_library(IOB_LIBRARY IOBluetooth)
   find_library(IOK_LIBRARY IOKit)
-  find_library(FORCEFEEDBACK ForceFeedback)
   find_library(OPENGL_LIBRARY OpenGL)
 
   # Link against OS X system frameworks.
@@ -302,7 +301,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
     ${COREFUND_LIBRARY}
     ${CORESERV_LIBRARY}
     ${IOK_LIBRARY}
-    ${FORCEFEEDBACK}
   )
 endif()
 

diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
@@ -40,17 +40,19 @@ elseif(APPLE)
   find_library(COREFOUNDATION_LIBRARY CoreFoundation)
   find_library(CARBON_LIBRARY Carbon)
   find_library(COCOA_LIBRARY Cocoa)
+  find_library(FORCEFEEDBACK_LIBRARY ForceFeedback)
   target_sources(inputcommon PRIVATE
     ControllerInterface/OSX/OSX.mm
     ControllerInterface/OSX/OSXJoystick.mm
     ControllerInterface/Quartz/Quartz.mm
     ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm
     ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
   )
-  target_link_libraries(inputcommon PUBLIC
+  target_link_libraries(inputcommon PRIVATE
     ${COREFOUNDATION_LIBRARY}
     ${CARBON_LIBRARY}
     ${COCOA_LIBRARY}
+    ${FORCEFEEDBACK_LIBRARY}
   )
 elseif(X11_FOUND)
   target_sources(inputcommon PRIVATE