[Bf-blender-cvs] [356e0099146] sculpt-mode-features: some minor fixes for libQex dependency setup

[Martin Felke]

Commit: 356e0099146fb06b6e8b4ca8fdbe50210c35a73f
Author: Martin Felke
Date:   Tue Apr 16 20:15:37 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rB356e0099146fb06b6e8b4ca8fdbe50210c35a73f

some minor fixes for libQex dependency setup

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

M	build_files/build_environment/cmake/igl.cmake
M	build_files/build_environment/cmake/openmesh.cmake
M	build_files/build_environment/cmake/qex.cmake

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

diff --git a/build_files/build_environment/cmake/igl.cmake b/build_files/build_environment/cmake/igl.cmake
index 057a9d226e8..24dec6f5ab9 100644
--- a/build_files/build_environment/cmake/igl.cmake
+++ b/build_files/build_environment/cmake/igl.cmake
@@ -34,16 +34,15 @@ set(IGL_EXTRA_ARGS
 	-DLIBIGL_WITH_PNG=OFF
 	-DLIBIGL_WITH_PYTHON=OFF
 	-DLIBIGL_WITH_TETGEN=OFF
-        -DLIBIGL_WITH_TRIANGLE=OFF
+	-DLIBIGL_WITH_TRIANGLE=OFF
 	-DLIBIGL_WITH_XML=OFF
-        -DBLAS_LIBRARIES=${LIBDIR}/lapack/lib/libblas.a
-        -DCMAKE_BUILD_TYPE=Debug
+	-DBLAS_LIBRARIES=${LIBDIR}/lapack/lib/libblas.a
 )
 
 ExternalProject_Add(external_igl
 	URL ${IGL_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-        URL_HASH SHA256=${IGL_HASH}
+	URL_HASH SHA256=${IGL_HASH}
 	PREFIX ${BUILD_DIR}/igl
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/igl -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${IGL_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/igl
diff --git a/build_files/build_environment/cmake/openmesh.cmake b/build_files/build_environment/cmake/openmesh.cmake
index 312a6780380..2737115bae4 100644
--- a/build_files/build_environment/cmake/openmesh.cmake
+++ b/build_files/build_environment/cmake/openmesh.cmake
@@ -24,11 +24,11 @@ set(OPENMESH_EXTRA_ARGS
 ExternalProject_Add(external_openmesh
 	URL ${OPENMESH_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-        URL_HASH SHA256=${OPENMESH_HASH}
+	URL_HASH SHA256=${OPENMESH_HASH}
 	PREFIX ${BUILD_DIR}/openmesh
-        PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/openmesh/src/external_openmesh < ${PATCH_DIR}/openmesh.diff
-        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmesh -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENMESH_EXTRA_ARGS}
-        INSTALL_DIR ${LIBDIR}/openmesh
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/openmesh/src/external_openmesh < ${PATCH_DIR}/openmesh.diff
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmesh -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENMESH_EXTRA_ARGS}
+	INSTALL_DIR ${LIBDIR}/openmesh
 )
 
 if (BUILD_MODE STREQUAL Debug)
diff --git a/build_files/build_environment/cmake/qex.cmake b/build_files/build_environment/cmake/qex.cmake
index 80e374794c1..8b80010a73a 100644
--- a/build_files/build_environment/cmake/qex.cmake
+++ b/build_files/build_environment/cmake/qex.cmake
@@ -26,11 +26,11 @@ set(QEX_EXTRA_ARGS
 ExternalProject_Add(external_qex
 	URL ${QEX_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-        URL_HASH SHA256=${QEX_HASH}
+	URL_HASH SHA256=${QEX_HASH}
 	PREFIX ${BUILD_DIR}/qex
-        PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/qex/src/external_qex < ${PATCH_DIR}/qex.diff
-        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/qex -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${QEX_EXTRA_ARGS}
-        INSTALL_DIR ${LIBDIR}/qex
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/qex/src/external_qex < ${PATCH_DIR}/qex.diff
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/qex -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${QEX_EXTRA_ARGS}
+	INSTALL_DIR ${LIBDIR}/qex
 )
 
 #grr, INSTALL(TARGETS has no exclude pattern, so removing unnecessary empty dirs here