Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Put PROCESSOR_COUNT in gras_config.h
authornavarro <navarro@caraja.(none)>
Wed, 25 Jan 2012 09:29:17 +0000 (10:29 +0100)
committernavarro <navarro@caraja.(none)>
Wed, 25 Jan 2012 09:29:17 +0000 (10:29 +0100)
CMakeLists.txt
buildtools/Cmake/CompleteInFiles.cmake
buildtools/Cmake/gras_config.h.in

index 10b14d8..d360b8f 100644 (file)
@@ -9,6 +9,11 @@ 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_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}
 ## Mapping version number -> version name
 # 3.5.99 -> alpha1 (oops)
 # 3.5.9{1,2} -> beta{1,2}
@@ -188,6 +193,9 @@ include_directories(${INCLUDES})
 include(CMakeDetermineSystem)
 set(PROCESSOR_${CMAKE_SYSTEM_PROCESSOR} 1)
 
 include(CMakeDetermineSystem)
 set(PROCESSOR_${CMAKE_SYSTEM_PROCESSOR} 1)
 
+### Print NbCore
+include(FindNbCore)
+
 ### Setup Options
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Option.cmake)
 
 ### Setup Options
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Option.cmake)
 
@@ -233,9 +241,6 @@ else(NOT WIN32)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDocWin.cmake)  
 endif(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)
 
 ### Print ARGS
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)
 
index 132faf9..90d3fbc 100644 (file)
@@ -1,8 +1,3 @@
-set(CMAKE_MODULE_PATH 
-${CMAKE_MODULE_PATH}
-${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
-)
-
 # x86_64
 # x86
 # i.86
 # x86_64
 # x86
 # i.86
index fe82221..ebc7c93 100644 (file)
@@ -22,6 +22,9 @@
 #cmakedefine SIZEOF_INT @SIZEOF_INT@
 #cmakedefine SIZEOF_VOIDP @SIZEOF_VOIDP@
 
 #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@
 
 /* If __thread is available */
 #cmakedefine HAVE_THREAD_LOCAL_STORAGE @HAVE_THREAD_LOCAL_STORAGE@