From 7e024a2ccec560610409137060c9f3047d0b64d6 Mon Sep 17 00:00:00 2001
From: Roland Kaufmann <roland.kaufmann@uni.no>
Date: Tue, 22 Oct 2013 11:23:57 +0200
Subject: [PATCH] Allow to search for multiple libraries in package

Some packages are split up in several library files, where each of them
doesn't have their own CMake find-module. So we cannot put this list in
the prerequisites. Unlike the headers, where we just add the directory,
all the libraries must be explicitly named on the link line. Thus, we
should allow to specify more than one name in the lib parameter.

The first name specified is designated as the "primary" library and is
assigned to the _LIBRARY variable; the others occur in _LIBRARIES as if
they were prerequisites.

Note that the build system cannot replicate this setup itself; it always
assumes that we are building (at most) one library from the source
files.
---
 cmake/Modules/OpmPackage.cmake | 50 +++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/cmake/Modules/OpmPackage.cmake b/cmake/Modules/OpmPackage.cmake
index 928d28ccc..65eec4954 100644
--- a/cmake/Modules/OpmPackage.cmake
+++ b/cmake/Modules/OpmPackage.cmake
@@ -206,13 +206,30 @@ macro (find_opm_package module deps header lib defs prog conf)
 	  set (_no_system_lib "${_no_system}")
 	endif ()
 
-	find_library (${module}_LIBRARY
-	  NAMES "${lib}"
-	  PATHS ${_guess_bin}
-	  HINTS ${PkgConf_${module}_LIBRARY_DIRS} ${_guess_hints_bin}
-	  PATH_SUFFIXES "lib" "lib/.libs" ".libs" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "build-cmake/lib"
-	  ${_no_system_lib}
-	  )
+	# if there is more than one library, then look for all of them, putting
+	# them in variables with the name of the library appended. however, the
+	# first entry is assumed to be the "primary" library and will be named
+	# like the module. thus, with a lib entry of "foo;bar", the first library
+	# is called ${module}_LIBRARY and the second ${module}_LIBRARY_bar
+	foreach (_lib IN ITEMS ${lib})
+	  # don't include any suffix if it is the first one
+	  if ("${lib}" MATCHES "^${_lib}")
+		set (_which)
+	  else ()
+		set (_which "_${_lib}")
+	  endif ()
+	  find_library (${module}_LIBRARY${_which}
+		NAMES "${_lib}"
+		PATHS ${_guess_bin}
+		HINTS ${PkgConf_${module}_LIBRARY_DIRS} ${_guess_hints_bin}
+		PATH_SUFFIXES "lib" "lib/.libs" ".libs" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "build-cmake/lib"
+		${_no_system_lib}		
+		)
+	  # debug info if we didn't find the desired library
+	  if (NOT ${module}_LIBRARY${_which})
+		message (STATUS "Failed to find library \"${_lib}\" for module ${module}")
+	  endif ()
+	endforeach (_lib)
   else (NOT "${lib}" STREQUAL "")
 	set (${module}_LIBRARY "")
   endif (NOT "${lib}" STREQUAL "")
@@ -220,7 +237,13 @@ macro (find_opm_package module deps header lib defs prog conf)
   # add dependencies so that our result variables are complete
   # list of necessities to build with the software
   set (${module}_INCLUDE_DIRS "${${module}_INCLUDE_DIR}")
-  set (${module}_LIBRARIES "${${module}_LIBRARY}")
+  foreach (_lib IN ITEMS ${lib})
+	if ("${lib}" MATCHES "^${_lib}")
+	  set (${module}_LIBRARIES "${${module}_LIBRARY}")
+	else ()
+	  list (APPEND ${module}_LIBRARIES "${${module}_LIBRARY_${_lib}}")
+	endif ()
+  endforeach (_lib)
   # period because it should be something that evaluates to true
   # in find_package_handle_standard_args
   set (${module}_ALL_PREREQS ".")
@@ -295,8 +318,15 @@ macro (find_opm_package module deps header lib defs prog conf)
 	set (_lib_var "")
 	set (_and_lib_var)
   else ("${lib}" STREQUAL "")
-	set (_lib_var "${module}_LIBRARY")
-	set (_and_lib_var AND ${_lib_var})
+	foreach (_lib IN ITEMS ${lib})
+	  if ("${lib}" MATCHES "^${_lib}")
+		set (_lib_var "${module}_LIBRARY")
+		set (_and_lib_var AND ${_lib_var})
+	  else ()
+		list (APPEND _lib_var "${module}_LIBRARY_${_lib}")
+		set (_and_lib_var ${_and_lib_var} AND "${module}_LIBRARY_${_lib}")
+	  endif ()
+	endforeach (_lib)
   endif ("${lib}" STREQUAL "")
   # if the search is going to fail, then write these variables to
   # the console as well as a diagnostics