[Bf-blender-cvs] [ad6b7c0] master: CMake: remove mingw64_gcc49

Campbell Barton noreply at git.blender.org
Tue Jan 5 13:43:15 CET 2016


Commit: ad6b7c07dd2a3240945e2d4fe739c4622c75e980
Author: Campbell Barton
Date:   Tue Jan 5 23:35:14 2016 +1100
Branches: master
https://developer.blender.org/rBad6b7c07dd2a3240945e2d4fe739c4622c75e980

CMake: remove mingw64_gcc49

Not supported or in working state.

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4206c3..193ac48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1619,12 +1619,7 @@ elseif(WIN32)
 		
 		if(WITH_MINGW64)
 			message(STATUS "Compiling for 64 bit with MinGW-w64.")
-			execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-			if(GCC_VERSION VERSION_GREATER 4.9 OR GCC_VERSION VERSION_EQUAL 4.9)
-				set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64_gcc49)
-			else()
-				set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
-			endif()
+			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
 		else()
 			message(STATUS "Compiling for 32 bit with MinGW-w32.")
 			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)




More information about the Bf-blender-cvs mailing list