Commit: 8a8e29ac6ac5098fe02be6838b7ece3332afaddb
Author: Antony Riakiotakis
Date: Fri Jan 16 15:02:48 2015 +0200
Branches: viewport_experiments
https://developer.blender.org/rB8a8e29ac6ac5098fe02be6838b7ece3332afaddb
Select appropriate folder for MinGW-w64 gcc 4.9
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e7745d..9b4846f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1508,7 +1508,12 @@ elseif(WIN32)
if(WITH_MINGW64)
message(STATUS "Compiling for 64 bit with MinGW-w64.")
- set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
+ 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/mingw)
+ endif()
else()
message(STATUS "Compiling for 32 bit with MinGW-w32.")
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
