[Bf-blender-cvs] [e24cd10245e] master: build_environment: Remove lapack

[Ray Molenkamp]

Commit: e24cd10245ec5754009db5417289b68d5d69ff14
Author: Ray Molenkamp
Date:   Mon Aug 13 14:56:49 2018 -0600
Branches: master
https://developer.blender.org/rBe24cd10245ec5754009db5417289b68d5d69ff14

build_environment: Remove lapack

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

M	build_files/build_environment/CMakeLists.txt
D	build_files/build_environment/cmake/lapack.cmake

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

diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index 1ca102508e1..8376306caa1 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -118,7 +118,6 @@ if(NOT WIN32 OR ENABLE_MINGW64)
 		include(cmake/sndfile.cmake)
 		if(WIN32)
 			include(cmake/iconv.cmake)
-			include(cmake/lapack.cmake)
 		endif()
 		if(UNIX)
 			include(cmake/flac.cmake)
diff --git a/build_files/build_environment/cmake/lapack.cmake b/build_files/build_environment/cmake/lapack.cmake
deleted file mode 100644
index 3110503db52..00000000000
--- a/build_files/build_environment/cmake/lapack.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(LAPACK_EXTRA_ARGS)
-
-if(WIN32)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(LAPACK_EXTRA_ARGS -G "MSYS Makefiles" -DCMAKE_Fortran_COMPILER=${DOWNLOAD_DIR}/mingw/mingw64/bin/gfortran.exe)
-	else()
-		set(LAPACK_EXTRA_ARGS -G "MSYS Makefiles" -DCMAKE_Fortran_COMPILER=${DOWNLOAD_DIR}/mingw/mingw32/bin/gfortran.exe)
-	endif()
-endif()
-
-ExternalProject_Add(external_lapack
-	URL ${LAPACK_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${LAPACK_HASH}
-	PREFIX ${BUILD_DIR}/lapack
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lapack/src/external_lapack/ && ${CMAKE_COMMAND} ${LAPACK_EXTRA_ARGS} -DBUILD_TESTING=Off -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lapack .
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lapack/src/external_lapack/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lapack/src/external_lapack/ && make install
-
-	INSTALL_DIR ${LIBDIR}/lapack
-)
-
-if(MSVC)
-	set_target_properties(external_lapack PROPERTIES FOLDER Mingw)
-endif()