From b99d1a0a2075b671478f5b3415cb17578c4dccfc Mon Sep 17 00:00:00 2001
From: Christian Widmer <shadow@umbrox.de>
Date: Tue, 6 Oct 2015 17:28:29 +0200
Subject: [PATCH] Fix OProfile discovery and drop bfd dependency

Adds a cmake module to correctly discover OProfile and adjusts the
corresponding CMakeLists to make use of it. Additionally removes
linking against the bfd library when compiling with OProfile because
Dolphin does not use it.
---
 CMakeLists.txt                  | 10 +++++-----
 CMakeTests/FindOProfile.cmake   | 19 +++++++++++++++++++
 Source/Core/Core/CMakeLists.txt |  2 +-
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 CMakeTests/FindOProfile.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30c424a2b6..952cb2290b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -512,13 +512,13 @@ if(NOT ANDROID)
 	endif(PORTAUDIO)
 
 	if(OPROFILING)
-		check_lib(OPROFILE "(no .pc for opagent)" opagent opagent.h)
-		check_lib(BFD "(no .pc for bfd)" bfd bfd.h)
-		if(OPROFILE_FOUND AND BFD_FOUND)
-			message("oprofile found, enabling profiling support")
+		include(FindOProfile)
+		if(OPROFILE_FOUND)
+			message("OProfile found, enabling profiling support")
 			add_definitions(-DUSE_OPROFILE=1)
+			include_directories(${OPROFILE_INCLUDE_DIRS})
 		else()
-			message(FATAL_ERROR "oprofile or bfd not found. Can't build profiling support.")
+			message(FATAL_ERROR "OProfile not found. Can't build profiling support.")
 		endif()
 	endif()
 endif()
diff --git a/CMakeTests/FindOProfile.cmake b/CMakeTests/FindOProfile.cmake
new file mode 100644
index 0000000000..b82e47307d
--- /dev/null
+++ b/CMakeTests/FindOProfile.cmake
@@ -0,0 +1,19 @@
+# - Try to find OProfile
+# Once done this will define
+# OPROFILE_FOUND - System has OProfile
+# OPROFILE_INCLUDE_DIRS - The OProfile include directories
+# OPROFILE_LIBRARIES - The libraries needed to use OProfile
+
+find_path(OPROFILE_INCLUDE_DIR opagent.h)
+
+find_library(OPROFILE_LIBRARY opagent
+	PATH_SUFFIXES oprofile)
+
+set(OPROFILE_INCLUDE_DIRS ${OPROFILE_INCLUDE_DIR})
+set(OPROFILE_LIBRARIES ${OPROFILE_LIBRARY})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OProfile DEFAULT_MSG
+	OPROFILE_LIBRARY OPROFILE_INCLUDE_DIR)
+
+mark_as_advanced(OPROFILE_INCLUDE_DIR OPROFILE_LIBRARY)
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index 2fd2bf7bb5..bd69afeb80 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -265,7 +265,7 @@ if(PORTAUDIO_FOUND)
 endif(PORTAUDIO_FOUND)
 
 if(OPROFILE_FOUND)
-	set(LIBS ${LIBS} opagent bfd)
+	set(LIBS ${LIBS} ${OPROFILE_LIBRARIES})
 endif(OPROFILE_FOUND)
 
 if(GDBSTUB)