From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 27 Jan 2012 20:36:53 +0000 (+0100)
Subject: Revert "Put PROCESSOR_COUNT in gras_config.h"
X-Git-Tag: exp_20120216~119^2~3
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/78dddc6895e9f6b17959649407e33d82129be7aa?ds=sidebyside

Revert "Put PROCESSOR_COUNT in gras_config.h"

We need the runtime amount of cores, not the compile-time one.

This reverts commit 4ca11874986e1a694eb4183f8656ccac844cf3ce.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d360b8f1f9..10b14d897f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,11 +9,6 @@ set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
 
-set(CMAKE_MODULE_PATH 
-${CMAKE_MODULE_PATH}
-${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
-)
-
 ## Mapping version number -> version name
 # 3.5.99 -> alpha1 (oops)
 # 3.5.9{1,2} -> beta{1,2}
@@ -193,9 +188,6 @@ include_directories(${INCLUDES})
 include(CMakeDetermineSystem)
 set(PROCESSOR_${CMAKE_SYSTEM_PROCESSOR} 1)
 
-### Print NbCore
-include(FindNbCore)
-
 ### Setup Options
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Option.cmake)
 
@@ -241,6 +233,9 @@ else(NOT WIN32)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDocWin.cmake)  
 endif(NOT WIN32)
 
+### Print NbCore
+include(FindNbCore)
+
 ### Print ARGS
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)
 
diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 3b7ac73a6c..a4a7159bb4 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -1,3 +1,8 @@
+set(CMAKE_MODULE_PATH 
+${CMAKE_MODULE_PATH}
+${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
+)
+
 # x86_64
 # x86
 # i.86
diff --git a/buildtools/Cmake/gras_config.h.in b/buildtools/Cmake/gras_config.h.in
index ebc7c9394b..fe82221115 100644
--- a/buildtools/Cmake/gras_config.h.in
+++ b/buildtools/Cmake/gras_config.h.in
@@ -22,9 +22,6 @@
 #cmakedefine SIZEOF_INT @SIZEOF_INT@
 #cmakedefine SIZEOF_VOIDP @SIZEOF_VOIDP@
 
-// Number of processor counted by cmake
-#cmakedefine PROCESSOR_COUNT @PROCESSOR_COUNT@
-
 /* If __thread is available */
 #cmakedefine HAVE_THREAD_LOCAL_STORAGE @HAVE_THREAD_LOCAL_STORAGE@