[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35539] trunk/blender: Fixes for GNUmakefile on Mac:

[Brecht Van Lommel]

Revision: 35539
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35539
Author:   blendix
Date:     2011-03-14 15:40:07 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Fixes for GNUmakefile on Mac:
* Don't use "make install", doesn't work yet.
* Use total number of cores rather than number of processors.
* Quicker number of cores query, by not asking for all system info. 

Modified Paths:
--------------
    trunk/blender/GNUmakefile
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile	2011-03-14 14:00:15 UTC (rev 35538)
+++ trunk/blender/GNUmakefile	2011-03-14 15:40:07 UTC (rev 35539)
@@ -48,11 +48,14 @@
 
 # Get the number of cores for threaded build
 NPROCS:=1
+DEFAULT_TARGET=install
 ifeq ($(OS), Linux)
 	NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
 endif
 ifeq ($(OS), Darwin)
-	NPROCS:=$(shell system_profiler | awk '/Number Of CPUs/{print $4}{next;}')
+	NPROCS:=$(shell system_profiler SPHardwareDataType | awk '/Total Number Of Cores/ {print $5}{next;};')
+	# make install not support on mac yet 
+	DEFAULT_TARGET=
 endif
 ifeq ($(OS), FreeBSD)
 	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
@@ -75,7 +78,7 @@
 
 	@echo 
 	@echo Building Blender ...
-	cd $(BUILD_DIR) ; make -s -j $(NPROCS) install
+	cd $(BUILD_DIR) ; make -s -j $(NPROCS) ${DEFAULT_TARGET} 
 	@echo 
 	@echo run blender from "$(BUILD_DIR)/bin/blender"
 	@echo 

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-03-14 14:00:15 UTC (rev 35538)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-03-14 15:40:07 UTC (rev 35539)
@@ -529,6 +529,7 @@
 
 	elseif(APPLE)
 		# TODO, APPLE needs a 'make install' target like win32 and unix
+		# also update GNUmakefile to run make install if you do this
 
 		set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
 		set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)