[Bf-blender-cvs] [07899ddd227] master: Fix double include of `gmp.cmake`

Sybren A. Stüvel noreply at git.blender.org
Tue Sep 1 12:40:05 CEST 2020


Commit: 07899ddd2273918d3c66576f0509355c8b7781d9
Author: Sybren A. Stüvel
Date:   Tue Sep 1 12:39:58 2020 +0200
Branches: master
https://developer.blender.org/rB07899ddd2273918d3c66576f0509355c8b7781d9

Fix double include of `gmp.cmake`

This fixes `make deps` complaining about the `extern_gmp` project being
defined twice.

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

M	build_files/build_environment/CMakeLists.txt

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

diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index 6368430235c..6415d270773 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -120,7 +120,6 @@ endif()
 if(NOT WIN32 OR ENABLE_MINGW64)
   include(cmake/gmp.cmake)
   include(cmake/openjpeg.cmake)
-  include(cmake/gmp.cmake)
   if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
     if(WIN32)
       include(cmake/zlib_mingw.cmake)



More information about the Bf-blender-cvs mailing list