Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-01-16 16:02:48 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-01-16 16:04:02 +0300
commit5685c43586b900ed561eac3e5762a7d68b304447 (patch)
treeba97981981618c44f2213fac95b699ae77865e93 /CMakeLists.txt
parent9bb06c99f3a0e7d397978dbf166ae01f85f18514 (diff)
Select appropriate folder for MinGW-w64 gcc 4.9
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index df5b458a4d0..4f0fa76969c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1510,7 +1510,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)