Merge pull request #5929 from JonnyH/PR/fix-oprofile-build-linked-as-…

…needed Fix OPROFILE linux build with -Wl,--as-needed
dolphin-emu · Aug 16, 2017 · 70931f4 · 70931f4
2 parents 8134a63 + 2a66b88
commit 70931f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
@@ -119,6 +119,10 @@ endif()
 
 add_dolphin_library(common "${SRCS}" "${LIBS}")
 
+if(OPROFILE_FOUND)
+  target_link_libraries(common PRIVATE ${OPROFILE_LIBRARIES})
+endif()
+
 if(UNIX)
   # Posix networking code needs to be fixed for Windows
   add_executable(traversal_server TraversalServer.cpp)

diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
@@ -346,10 +346,6 @@ if(TARGET Hidapi::Hidapi)
   add_definitions(-DHAVE_HIDAPI=1)
 endif()
 
-if(OPROFILE_FOUND)
-  set(LIBS ${LIBS} ${OPROFILE_LIBRARIES})
-endif()
-
 if(GDBSTUB)
   set(SRCS ${SRCS} PowerPC/GDBStub.cpp)
 endif()