Revert "Add a script to detect the number of core."

[simgrid.git] / buildtools / Cmake / CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 7c1511c..3b7ac73 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -1,8 +1,3 @@
-set(CMAKE_MODULE_PATH 
-${CMAKE_MODULE_PATH}
-${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
-)
-
 # x86_64
 # x86
 # i.86
@@ -113,6 +108,8 @@ CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE("execinfo.h" HAVE_EXECINFO_H)
 CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H)
 CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H)
+CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H)
+CHECK_INCLUDE_FILE("sys/sysctl.h" HAVE_SYS_SYSCTL_H)
 CHECK_INCLUDE_FILE("time.h" HAVE_TIME_H)
 CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
 CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
@@ -334,14 +331,18 @@ IF(CMAKE_CROSSCOMPILING)
                set(IS_WINDOWS 1)       
        ENDIF(WIN32)
 ELSE(CMAKE_CROSSCOMPILING)
+    file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
+    file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
     exec_program(
                  "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c ${mcsc_flags} -o testprog"
                  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
                  OUTPUT_VARIABLE COMPILE_mcsc_VAR)
 
-    file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
     if(NOT COMPILE_mcsc_VAR)
+        message(STATUS "prog_AC_CHECK_MCSC.c is compilable")
         exec_program("${CMAKE_BINARY_DIR}/testprog" OUTPUT_VARIABLE var_compil)
+    else(NOT COMPILE_mcsc_VAR)
+        message(STATUS "prog_AC_CHECK_MCSC.c is not compilable")
     endif(NOT COMPILE_mcsc_VAR)
     file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
     
@@ -560,7 +561,7 @@ if(HAVE_MAKECONTEXT OR WIN32)
        
     if(WIN32)
         if(ARCH_32_BITS)
-           set(makecontext_CPPFLAGS "-DTEST_makecontext")
+           set(makecontext_CPPFLAGS "-DTEST_makecontext -D_I_X86_")
            else(ARCH_32_BITS)
            set(makecontext_CPPFLAGS "-DTEST_makecontext -D_AMD64_")
            endif(ARCH_32_BITS)
@@ -865,7 +866,7 @@ ${CMAKE_BINARY_DIR}/bin/smpiff
 ${CMAKE_BINARY_DIR}/bin/smpirun
 ${CMAKE_BINARY_DIR}/bin/colorize
 ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml
-${CMAKE_BINARY_DIR}/examples/smpi/smpi_traced.trace
+${CMAKE_BINARY_DIR}/examples/smpi/tracing/smpi_traced.trace
 ${CMAKE_BINARY_DIR}/src/supernovae_sg.c
 ${CMAKE_BINARY_DIR}/src/supernovae_gras.c
 ${CMAKE_BINARY_DIR}/src/supernovae_smpi.c