[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57257] trunk/blender/CMakeLists.txt: issue warning when WITH_RAYOPTIMIZATION is used with MinGW-w32, since this is known to give crashes.

Campbell Barton ideasman42 at gmail.com
Wed Jun 5 21:33:19 CEST 2013


Revision: 57257
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57257
Author:   campbellbarton
Date:     2013-06-05 19:33:19 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
issue warning when WITH_RAYOPTIMIZATION is used with MinGW-w32, since this is known to give crashes.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-06-05 19:28:59 UTC (rev 57256)
+++ trunk/blender/CMakeLists.txt	2013-06-05 19:33:19 UTC (rev 57257)
@@ -931,20 +931,26 @@
 	#  include(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
 
 	if(CMAKE_COMPILER_IS_GNUCC)
-		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
 		include(CheckCSourceCompiles)
 		# Setup 64bit and 64bit windows systems
 		CHECK_C_SOURCE_COMPILES("
 			#ifndef __MINGW64__
 			#error
 			#endif
-			main(){}
+			int main(void) { return 0; }
 			" 
 			WITH_MINGW64)
 		
 		if(WITH_MINGW64)
 			message(STATUS "Compiling for 64 bit with MinGW-w64.")
 			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
+		else()
+			message(STATUS "Compiling for 32 bit with MinGW-w32.")
+			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
+			
+			if(WITH_RAYOPTIMIZATION)
+				message(WARNING "MinGW-w32 is known to be unstable with 'WITH_RAYOPTIMIZATION' option enabled.")
+			endif()
 		endif()
 	else()
 		# Setup 64bit and 64bit windows systems




More information about the Bf-blender-cvs mailing list