[Bf-blender-cvs] [19e6642] buildbot_linux_cmake: Add find_library_static, use instead of `gcc -print-file-name`

[Campbell Barton]

Commit: 19e66421b3906415020e80509a2dd9dd087690d6
Author: Campbell Barton
Date:   Wed Dec 2 23:17:21 2015 +1100
Branches: buildbot_linux_cmake
https://developer.blender.org/rB19e66421b3906415020e80509a2dd9dd087690d6

Add find_library_static, use instead of `gcc -print-file-name`

===================================================================

M	CMakeLists.txt
M	build_files/cmake/macros.cmake

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e13b92..039a745 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -869,13 +869,9 @@ endif()
 if(UNIX AND NOT APPLE)
 	macro(find_package_wrapper)
 		if(WITH_STATIC_LIBS)
-			set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
-			set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-		endif()
-		find_package(${ARGV})
-		if(WITH_STATIC_LIBS)
-			set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
-			unset(_cmake_find_library_suffixes_back)
+			find_package_static(${ARGV})
+		else()
+			find_package(${ARGV})
 		endif()
 	endmacro()
 
@@ -2472,9 +2468,7 @@ if(WITH_OPENMP)
 			# since they're passed to the linker as well.
 			add_definitions("${OpenMP_C_FLAGS}")
 
-			execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=libgomp.a
-			                OUTPUT_VARIABLE OpenMP_LIBRARIES
-			                OUTPUT_STRIP_TRAILING_WHITESPACE)
+			find_library_static(OpenMP_LIBRARIES gomp)
 		endif()
 	else()
 		set(WITH_OPENMP OFF)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index de6dea7..74ef7b1 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -103,6 +103,23 @@ macro(file_list_suffix
 
 endmacro()
 
+if(UNIX AND NOT APPLE)
+	macro(find_package_static)
+		set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
+		set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+		find_package(${ARGV})
+		set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
+		unset(_cmake_find_library_suffixes_back)
+	endmacro()
+
+	macro(find_library_static)
+		set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
+		set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+		find_library(${ARGV})
+		set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
+		unset(_cmake_find_library_suffixes_back)
+	endmacro()
+endif()
 
 function(target_link_libraries_optimized
 	TARGET