[Bf-blender-cvs] [45a47be6dfd] temp-remove-mingw: MinGW: Adress review points raised in cmake
Aaron Carlisle
noreply at git.blender.org
Tue Apr 25 20:30:57 CEST 2017
Commit: 45a47be6dfd5c3736d459b103e30ecaeca856efb
Author: Aaron Carlisle
Date: Tue Apr 25 14:29:03 2017 -0400
Branches: temp-remove-mingw
https://developer.blender.org/rB45a47be6dfd5c3736d459b103e30ecaeca856efb
MinGW: Adress review points raised in cmake
- Add early error on unsupported compiler
- Remove some `CMAKE_COMPILER_IS_GNUCC`
- Add back `if sys.platform == "win32":`
===================================================================
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_release.cmake
M build_files/cmake/platform/platform_win32.cmake
M build_files/cmake/project_info.py
===================================================================
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index 1d520b34bd4..a35ea464bd9 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -63,9 +63,6 @@ if(UNIX AND NOT APPLE)
set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE)
elseif(WIN32)
set(WITH_JACK OFF CACHE BOOL "" FORCE)
- if(NOT CMAKE_COMPILER_IS_GNUCC)
- set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE)
- endif()
elseif(APPLE)
set(WITH_JACK ON CACHE BOOL "" FORCE)
set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index a35b6dc124f..0ef20476741 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -64,9 +64,6 @@ if(UNIX AND NOT APPLE)
set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE)
elseif(WIN32)
set(WITH_JACK OFF CACHE BOOL "" FORCE)
- if(NOT CMAKE_COMPILER_IS_GNUCC)
- set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE)
- endif()
elseif(APPLE)
set(WITH_JACK ON CACHE BOOL "" FORCE)
set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 952528eb728..7ce6992d043 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -27,6 +27,8 @@ add_definitions(-DWIN32)
if(MSVC)
include(platform_win32_msvc)
+else()
+ message([FATAL_ERROR] "Compiler is unsupported")
endif()
set(WINTAB_INC ${LIBDIR}/wintab/include)
diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py
index 6e73c5cdcdf..3ac4c4c9480 100755
--- a/build_files/cmake/project_info.py
+++ b/build_files/cmake/project_info.py
@@ -144,12 +144,15 @@ def cmake_advanced_info():
def create_eclipse_project():
print("CMAKE_DIR %r" % CMAKE_DIR)
- if make_exe_basename.startswith(("make", "gmake")):
- cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
- elif make_exe_basename.startswith("ninja"):
- cmd = 'cmake "%s" -G"Eclipse CDT4 - Ninja"' % CMAKE_DIR
+ if sys.platform == "win32":
+ raise Exception("Error: win32 is not supported")
else:
- raise Exception("Unknown make program %r" % make_exe)
+ if make_exe_basename.startswith(("make", "gmake")):
+ cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
+ elif make_exe_basename.startswith("ninja"):
+ cmd = 'cmake "%s" -G"Eclipse CDT4 - Ninja"' % CMAKE_DIR
+ else:
+ raise Exception("Unknown make program %r" % make_exe)
os.system(cmd)
return join(CMAKE_DIR, ".cproject")
More information about the Bf-blender-cvs
mailing list