X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/194eced51d57295aec41905adadda8e9b21f74b9..c5c1970:/buildtools/Cmake/CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index f020bf1ea0..154219da89 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -12,12 +12,12 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86")
     set(PROCESSOR_i686 1)
     set(SIMGRID_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
     message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}")
-  ELSE(${ARCH_32_BITS})
+  ELSE()
     message(STATUS "System processor: amd64")
     set(SIMGRID_SYSTEM_PROCESSOR "amd64")
     set(PROCESSOR_x86_64 1)
     set(PROCESSOR_i686 0)
-  ENDIF(${ARCH_32_BITS})
+  ENDIF()
   set(HAVE_RAWCTX 1)
 
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
@@ -52,10 +52,10 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390")
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh")
   message(STATUS "System processor: sh")
 
-ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") #PROCESSOR NOT fIND
+ELSE() #PROCESSOR NOT fIND
   message(STATUS "PROCESSOR NOT FOUND: ${CMAKE_SYSTEM_PROCESSOR}")
 
-ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86")
+ENDIF()
 
 message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
 
@@ -70,25 +70,25 @@ TEST_BIG_ENDIAN(BIGENDIAN)
 include(FindGraphviz)
 if(WIN32)
   include(FindPcreWin)
-else(WIN32)
+else()
   include(FindPCRE)
-endif(WIN32)
+endif()
 
 set(HAVE_GTNETS 0)
 if(enable_gtnets)
   include(FindGTnets)
-endif(enable_gtnets)
+endif()
 if(enable_smpi)
   include(FindF2c)
   SET(HAVE_SMPI 1)
-endif(enable_smpi)
+endif()
 if(enable_lua)
   include(FindLua51Simgrid)
-endif(enable_lua)
+endif()
 set(HAVE_NS3 0)
 if(enable_ns3)
   include(FindNS3)
-endif(enable_ns3)
+endif()
 
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(pthread 	pthread_create 			"" pthread)
@@ -152,22 +152,22 @@ execute_process(
 
 if(HAVE_thread_storage_run)
   set(HAVE_THREAD_LOCAL_STORAGE 0)
-else(HAVE_thread_storage_run)
+else()
   set(HAVE_THREAD_LOCAL_STORAGE 1)
-endif(HAVE_thread_storage_run)
+endif()
 
 # Our usage of mmap is Linux-specific (flag MAP_ANONYMOUS), but kFreeBSD uses a GNU libc
 IF(NOT "${CMAKE_SYSTEM}" MATCHES "Linux" AND NOT "${CMAKE_SYSTEM}" MATCHES "kFreeBSD" AND NOT "${CMAKE_SYSTEM}" MATCHES "GNU")
   SET(HAVE_MMAP 0)
   message(STATUS "Warning: MMAP is thought as non functional on this architecture (${CMAKE_SYSTEM})")
-ENDIF(NOT "${CMAKE_SYSTEM}" MATCHES "Linux" AND NOT "${CMAKE_SYSTEM}" MATCHES "kFreeBSD" AND NOT "${CMAKE_SYSTEM}" MATCHES "GNU")
+ENDIF()
 
 if(WIN32) #THOSE FILES ARE FUNCTIONS ARE NOT DETECTED BUT THEY SHOULD...
   set(HAVE_UCONTEXT_H 1)
   set(HAVE_MAKECONTEXT 1)
   set(HAVE_SNPRINTF 1)
   set(HAVE_VSNPRINTF 1)
-endif(WIN32)
+endif()
 
 set(CONTEXT_UCONTEXT 0)
 SET(CONTEXT_THREADS 0)
@@ -175,40 +175,40 @@ SET(HAVE_TRACING 1)
 
 if(enable_tracing)
   SET(HAVE_TRACING 1)
-else(enable_tracing)
+else()
   SET(HAVE_TRACING 0)
-endif(enable_tracing)
+endif()
 
 if(enable_jedule)
   SET(HAVE_JEDULE 1)
-endif(enable_jedule)
+endif()
 
 if(enable_latency_bound_tracking)
   SET(HAVE_LATENCY_BOUND_TRACKING 1)
-else(enable_latency_bound_tracking)
+else()
   if(enable_gtnets)
     message(STATUS "Warning : Turning latency_bound_tracking to ON because GTNeTs is ON")
     SET(enable_latency_bound_tracking ON)
     SET(HAVE_LATENCY_BOUND_TRACKING 1)
-  else(enable_gtnets)
+  else()
     SET(HAVE_LATENCY_BOUND_TRACKING 0)
-  endif(enable_gtnets)
-endif(enable_latency_bound_tracking)
+  endif()
+endif()
 
 if(enable_mallocators)
   SET(MALLOCATOR_IS_WANTED 1)
-else(enable_mallocators)
+else()
   SET(MALLOCATOR_IS_WANTED 0)
-endif(enable_mallocators)
+endif()
 
 if(enable_model-checking AND HAVE_MMAP)
   SET(HAVE_MC 1)
   SET(MMALLOC_WANT_OVERRIDE_LEGACY 1)
   include(FindLibunwind)
-else(enable_model-checking AND HAVE_MMAP)
+else()
   SET(HAVE_MC 0)
   SET(MMALLOC_WANT_OVERRIDE_LEGACY 0)
-endif(enable_model-checking AND HAVE_MMAP)
+endif()
 
 #--------------------------------------------------------------------------------------------------
 ### Check for some architecture dependent values
@@ -222,7 +222,7 @@ if(pthread)
   set(pthread 1)
 elseif(pthread)
   set(pthread 0)
-endif(pthread)
+endif()
 
 if(pthread)
   ### Test that we have a way to create semaphores
@@ -239,10 +239,10 @@ if(pthread)
       set(HAVE_SEM_OPEN 0)
       message(STATUS "Warning: sem_open not compilable")
       message(STATUS "HAVE_SEM_OPEN_comp_output: ${HAVE_SEM_OPEN_comp_output}")
-    else(HAVE_SEM_OPEN_compil)
+    else()
       set(HAVE_SEM_OPEN 1)
       message(STATUS "sem_open is compilable")
-    endif(HAVE_SEM_OPEN_compil)
+    endif()
 
     exec_program("${CMAKE_BINARY_DIR}/testprog" RETURN_VALUE HAVE_SEM_OPEN_run OUTPUT_VARIABLE var_compil)
     file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
@@ -250,14 +250,14 @@ if(pthread)
     if(NOT HAVE_SEM_OPEN_run)
       set(HAVE_SEM_OPEN 1)
       message(STATUS "sem_open is executable")
-    else(NOT HAVE_SEM_OPEN_run)
+    else()
       set(HAVE_SEM_OPEN 0)
       message(STATUS "Warning: sem_open not executable")
-    endif(NOT HAVE_SEM_OPEN_run)
+    endif()
 
-  else(HAVE_SEM_OPEN_LIB)
+  else()
     set(HAVE_SEM_OPEN 0)
-  endif(HAVE_SEM_OPEN_LIB)
+  endif()
 
   if(HAVE_SEM_INIT_LIB)
     exec_program(
@@ -270,10 +270,10 @@ if(pthread)
       set(HAVE_SEM_INIT 0)
       message(STATUS "Warning: sem_init not compilable")
       message(STATUS "HAVE_SEM_INIT_comp_output: ${HAVE_SEM_OPEN_comp_output}")
-    else(HAVE_SEM_INIT_compil)
+    else()
       set(HAVE_SEM_INIT 1)
       message(STATUS "sem_init is compilable")
-    endif(HAVE_SEM_INIT_compil)
+    endif()
 
     exec_program("${CMAKE_BINARY_DIR}/testprog" RETURN_VALUE HAVE_SEM_INIT_run OUTPUT_VARIABLE var_compil)
     file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
@@ -281,15 +281,15 @@ if(pthread)
     if(NOT HAVE_SEM_INIT_run)
       set(HAVE_SEM_INIT 1)
       message(STATUS "sem_init is executable")
-    else(NOT HAVE_SEM_INIT_run)
+    else()
       set(HAVE_SEM_INIT 0)
       message(STATUS "Warning: sem_init not executable")
-    endif(NOT HAVE_SEM_INIT_run)
-  endif(HAVE_SEM_INIT_LIB)
+    endif()
+  endif()
 
   if(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT)
     message(FATAL_ERROR "Semaphores are not usable (neither sem_open nor sem_init is both compilable and executable), but they are mandatory to threads (you may need to mount /dev).")
-  endif(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT)
+  endif()
 
   ### Test that we have a way to timewait for semaphores
 
@@ -304,11 +304,11 @@ if(pthread)
     if(HAVE_SEM_TIMEDWAIT_run)
       set(HAVE_SEM_TIMEDWAIT 0)
       message(STATUS "timedwait not compilable")
-    else(HAVE_SEM_TIMEDWAIT_run)
+    else()
       set(HAVE_SEM_TIMEDWAIT 1)
       message(STATUS "timedwait is compilable")
-    endif(HAVE_SEM_TIMEDWAIT_run)
-  endif(HAVE_SEM_TIMEDWAIT_LIB)
+    endif()
+  endif()
 
   ### HAVE_MUTEX_TIMEDLOCK
 
@@ -323,33 +323,33 @@ if(pthread)
     if(HAVE_MUTEX_TIMEDLOCK_run)
       set(HAVE_MUTEX_TIMEDLOCK 0)
       message(STATUS "timedlock not compilable")
-    else(HAVE_MUTEX_TIMEDLOCK_run)
+    else()
       message(STATUS "timedlock is compilable")
       set(HAVE_MUTEX_TIMEDLOCK 1)
-    endif(HAVE_MUTEX_TIMEDLOCK_run)
-  endif(HAVE_MUTEX_TIMEDLOCK_LIB)
-endif(pthread)
+    endif()
+  endif()
+endif()
 
 # AC_CHECK_MCSC(mcsc=yes, mcsc=no)
 set(mcsc_flags "")
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(mcsc_flags "-D_XOPEN_SOURCE")
-endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+endif()
 
 if(WIN32)
   if(ARCH_32_BITS)
     set(mcsc_flags "-D_XBT_WIN32 -D_I_X86_ -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
-  else(ARCH_32_BITS)
+  else()
     set(mcsc_flags "-D_XBT_WIN32 -D_AMD64_ -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
-  endif(ARCH_32_BITS)
-endif(WIN32)
+  endif()
+endif()
 
 IF(CMAKE_CROSSCOMPILING)
   IF(WIN32)
     set(windows_context "yes")
     set(IS_WINDOWS 1)
-  ENDIF(WIN32)
-ELSE(CMAKE_CROSSCOMPILING)
+  ENDIF()
+ELSE()
   file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
   file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
   exec_program(
@@ -360,9 +360,9 @@ ELSE(CMAKE_CROSSCOMPILING)
   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)
+  else()
     message(STATUS "prog_AC_CHECK_MCSC.c is not compilable")
-  endif(NOT COMPILE_mcsc_VAR)
+  endif()
   file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
 
   if(EXISTS "${CMAKE_BINARY_DIR}/conftestval")
@@ -371,15 +371,15 @@ ELSE(CMAKE_CROSSCOMPILING)
     if(mcsc)
       set(mcsc "yes")
       set(HAVE_UCONTEXT_H 1)
-    else(mcsc)
+    else()
       set(mcsc "no")
-    endif(mcsc)
-  else(EXISTS "${CMAKE_BINARY_DIR}/conftestval")
+    endif()
+  else()
     set(mcsc "no")
-  endif(EXISTS "${CMAKE_BINARY_DIR}/conftestval")
+  endif()
 
   message(STATUS "mcsc: ${mcsc}")
-ENDIF(CMAKE_CROSSCOMPILING)
+ENDIF()
 
 if(mcsc MATCHES "no" AND pthread)
   if(HAVE_WINDOWS_H)
@@ -387,30 +387,30 @@ if(mcsc MATCHES "no" AND pthread)
     set(IS_WINDOWS 1)
   elseif(HAVE_WINDOWS_H)
     message(FATAL_ERROR "no appropriate backend found")
-  endif(HAVE_WINDOWS_H)
-endif(mcsc MATCHES "no" AND pthread)
+  endif()
+endif()
 
 #Only windows
 
 if(WIN32)
   if(NOT HAVE_WINDOWS_H)
     message(FATAL_ERROR "no appropriate backend found windows")
-  endif(NOT HAVE_WINDOWS_H)
-endif(WIN32)
+  endif()
+endif()
 
 if(windows_context MATCHES "yes")
   message(STATUS "Context change to windows")
-endif(windows_context MATCHES "yes")
+endif()
 
 #If can have both context
 
 if(mcsc)
   set(CONTEXT_UCONTEXT 1)
-endif(mcsc)
+endif()
 
 if(pthread)
   set(CONTEXT_THREADS 1)
-endif(pthread)
+endif()
 
 ###############
 ## GIT version check
@@ -428,8 +428,8 @@ if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32)
     STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE})
     STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
     STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
-  endif(url)
-endif(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32)
+  endif()
+endif()
 
 ###################################
 ## SimGrid and GRAS specific checks
@@ -445,10 +445,10 @@ IF(NOT CMAKE_CROSSCOMPILING)
   if(BIGENDIAN)
     set(val_big "B${var1}")
     set(GRAS_BIGENDIAN 1)
-  else(BIGENDIAN)
+  else()
     set(val_big "l${var1}")
     set(GRAS_BIGENDIAN 0)
-  endif(BIGENDIAN)
+  endif()
 
   # The syntax of this magic string is given in src/xbt/datadesc/ddt_convert.c
   # It kinda matches the values that the xbt_arch_desc_t structure can take
@@ -484,68 +484,68 @@ IF(NOT CMAKE_CROSSCOMPILING)
     #gras_arch=0; gras_size=32; gras_arch_name=little32_1;
     SET(GRAS_ARCH_32_BITS 1)
     SET(GRAS_THISARCH 0)
-  endif(val_big MATCHES "l_C:1/1:_I:2/1:4/1:4/1:8/1:_P:4/1:4/1:_D:4/1:8/1:")
+  endif()
   if(val_big MATCHES "l_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:")
     #gras_arch=1; gras_size=32; gras_arch_name=little32_2;
     SET(GRAS_ARCH_32_BITS 1)
     SET(GRAS_THISARCH 1)
-  endif(val_big MATCHES "l_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:")
+  endif()
   if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:")
     #gras_arch=2; gras_size=32; gras_arch_name=little32_4;
     SET(GRAS_ARCH_32_BITS 1)
     SET(GRAS_THISARCH 2)
-  endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:")
+  endif()
   if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:")
     #gras_arch=3; gras_size=32; gras_arch_name=little32_8;
     SET(GRAS_ARCH_32_BITS 1)
     SET(GRAS_THISARCH 3)
-  endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:")
+  endif()
   if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:")
     #gras_arch=4; gras_size=64; gras_arch_name=little64;
     SET(GRAS_ARCH_32_BITS 0)
     SET(GRAS_THISARCH 4)
-  endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:")
+  endif()
   if(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:8/8:8/8:_D:4/4:8/8:")
     #gras_arch=5; gras_size=64; gras_arch_name=little64_2;
     SET(GRAS_ARCH_32_BITS 0)
     SET(GRAS_THISARCH 5)
-  endif(val_big MATCHES "l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:8/8:8/8:_D:4/4:8/8:")
+  endif()
 
   if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:")
     #gras_arch=6; gras_size=32; gras_arch_name=big32_8;
     SET(GRAS_ARCH_32_BITS 1)
     SET(GRAS_THISARCH 6)
-  endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:")
+  endif()
   if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:")
     #gras_arch=7; gras_size=32; gras_arch_name=big32_8_4;
     SET(GRAS_ARCH_32_BITS 1)
     SET(GRAS_THISARCH 7)
-  endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:")
+  endif()
   if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:")
     #gras_arch=8; gras_size=32; gras_arch_name=big32_4;
     SET(GRAS_ARCH_32_BITS 1)
     SET(GRAS_THISARCH 8)
-  endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:")
+  endif()
   if(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:")
     #gras_arch=9; gras_size=32; gras_arch_name=big32_2;
     SET(GRAS_ARCH_32_BITS 1)
     SET(GRAS_THISARCH 9)
-  endif(val_big MATCHES "B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:")
+  endif()
   if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:")
     #gras_arch=10; gras_size=64; gras_arch_name=big64;
     SET(GRAS_ARCH_32_BITS 0)
     SET(GRAS_THISARCH 10)
-  endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:")
+  endif()
   if(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:")
     #gras_arch=11; gras_size=64; gras_arch_name=big64_8_4;
     SET(GRAS_ARCH_32_BITS 0)
     SET(GRAS_THISARCH 11)
-  endif(val_big MATCHES "B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/4:")
+  endif()
 
   if(GRAS_THISARCH MATCHES "none")
     message(STATUS "architecture: ${val_big}")
     message(FATAL_ERROR "GRAS_THISARCH is empty: '${GRAS_THISARCH}'")
-  endif(GRAS_THISARCH MATCHES "none")
+  endif()
 
   # Check architecture signature end
   try_run(RUN_GRAS_VAR COMPILE_GRAS_VAR
@@ -566,7 +566,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
     )
   message(STATUS "SIZEOF_MAX ${var3}")
   SET(SIZEOF_MAX ${var3})
-ENDIF(NOT CMAKE_CROSSCOMPILING)
+ENDIF()
 
 #--------------------------------------------------------------------------------------------------
 
@@ -575,16 +575,16 @@ if(HAVE_MAKECONTEXT OR WIN32)
   set(makecontext_CPPFLAGS "-DTEST_makecontext")
   if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
     set(makecontext_CPPFLAGS_2 "-D_XOPEN_SOURCE")
-  endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  endif()
 
   if(WIN32)
     if(ARCH_32_BITS)
       set(makecontext_CPPFLAGS "-DTEST_makecontext -D_I_X86_")
-    else(ARCH_32_BITS)
+    else()
       set(makecontext_CPPFLAGS "-DTEST_makecontext -D_AMD64_")
-    endif(ARCH_32_BITS)
+    endif()
     set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
-  endif(WIN32)
+  endif()
 
   file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
 
@@ -605,10 +605,10 @@ if(HAVE_MAKECONTEXT OR WIN32)
     set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})")
     message(STATUS "${pth_skaddr_makecontext}")
     message(STATUS "${pth_sksize_makecontext}")
-  else(EXISTS ${CMAKE_BINARY_DIR}/conftestval)
+  else()
     #	    message(FATAL_ERROR "makecontext is not compilable")
-  endif(EXISTS ${CMAKE_BINARY_DIR}/conftestval)
-endif(HAVE_MAKECONTEXT OR WIN32)
+  endif()
+endif()
 
 #--------------------------------------------------------------------------------------------------
 
@@ -621,12 +621,12 @@ if (NOT CMAKE_CROSSCOMPILING)
   file(READ "${CMAKE_BINARY_DIR}/conftestval" stack)
   if(stack MATCHES "down")
     set(PTH_STACKGROWTH "-1")
-  endif(stack MATCHES "down")
+  endif()
   if(stack MATCHES "up")
     set(PTH_STACKGROWTH "1")
-  endif(stack MATCHES "up")
+  endif()
 
-endif(NOT CMAKE_CROSSCOMPILING)
+endif()
 ###############
 ## System checks
 ##
@@ -645,9 +645,9 @@ try_run(RUN_PRINTF_NULL_VAR COMPILE_PRINTF_NULL_VAR
 
 if(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN")
   SET(PRINTF_NULL_WORKING "0")
-else(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN")
+else()
   SET(PRINTF_NULL_WORKING "1")
-endif(RUN_PRINTF_NULL_VAR MATCHES "FAILED_TO_RUN")
+endif()
 
 #AC_CHECK_VA_COPY
 
@@ -701,49 +701,49 @@ foreach(fct ${diff_va})
       set(HAVE_VA_COPY 1)
       set(ac_cv_va_copy "C99")
       set(__VA_COPY_USE_C99 "va_copy((d),(s))")
-    endif(${fctbis} STREQUAL "va_copy((d),(s))")
+    endif()
 
     if(${fctbis} STREQUAL "VA_COPY((d),(s))")
       set(ac_cv_va_copy "GCM")
       set(__VA_COPY_USE_GCM "VA_COPY((d),(s))")
-    endif(${fctbis} STREQUAL "VA_COPY((d),(s))")
+    endif()
 
     if(${fctbis} STREQUAL "__va_copy((d),(s))")
       set(ac_cv_va_copy "GCH")
       set(__VA_COPY_USE_GCH "__va_copy((d),(s))")
-    endif(${fctbis} STREQUAL "__va_copy((d),(s))")
+    endif()
 
     if(${fctbis} STREQUAL "__builtin_va_copy((d),(s))")
       set(ac_cv_va_copy "GCB")
       set(__VA_COPY_USE_GCB "__builtin_va_copy((d),(s))")
-    endif(${fctbis} STREQUAL "__builtin_va_copy((d),(s))")
+    endif()
 
     if(${fctbis} STREQUAL "do { (d) = (s) } while (0)")
       set(ac_cv_va_copy "ASS")
       set(__VA_COPY_USE_ASS "do { (d) = (s); } while (0)")
-    endif(${fctbis} STREQUAL "do { (d) = (s) } while (0)")
+    endif()
 
     if(${fctbis} STREQUAL "do { *(d) = *(s) } while (0)")
       set(ac_cv_va_copy "ASP")
       set(__VA_COPY_USE_ASP "do { *(d) = *(s); } while (0)")
-    endif(${fctbis} STREQUAL "do { *(d) = *(s) } while (0)")
+    endif()
 
     if(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
       set(ac_cv_va_copy "CPS")
       set(__VA_COPY_USE_CPS "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
-    endif(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
+    endif()
 
     if(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
       set(ac_cv_va_copy "CPP")
       set(__VA_COPY_USE_CPP "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
-    endif(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
+    endif()
 
     if(NOT STATUS_OK)
       set(__VA_COPY_USE "__VA_COPY_USE_${ac_cv_va_copy}(d, s)")
-    endif(NOT STATUS_OK)
+    endif()
     set(STATUS_OK "1")
 
-  endif(COMPILE_VA_NULL_VAR)
+  endif()
 
 endforeach(fct ${diff_va})
 
@@ -757,78 +757,78 @@ try_compile(COMPILE_RESULT_VAR
 if(NOT COMPILE_RESULT_VAR)
   SET(need_getline "#define SIMGRID_NEED_GETLINE 1")
   SET(SIMGRID_NEED_GETLINE 1)
-else(NOT COMPILE_RESULT_VAR)
+else()
   SET(need_getline "")
   SET(SIMGRID_NEED_GETLINE 0)
-endif(NOT COMPILE_RESULT_VAR)
+endif()
 
 ### check for a working snprintf
 if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
   if(WIN32)
     #set(HAVE_SNPRINTF 1)
     #set(HAVE_VSNPRINTF 1)
-  endif(WIN32)
+  endif()
 
   if(CMAKE_CROSSCOMPILING)
     set(RUN_SNPRINTF_FUNC "cross")
     #set(PREFER_PORTABLE_SNPRINTF 1)
-  else(CMAKE_CROSSCOMPILING)
+  else()
     try_run(RUN_SNPRINTF_FUNC_VAR COMPILE_SNPRINTF_FUNC_VAR
       ${CMAKE_BINARY_DIR}
       ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_snprintf.c
       )
-  endif(CMAKE_CROSSCOMPILING)
+  endif()
 
   if(CMAKE_CROSSCOMPILING)
     set(RUN_VSNPRINTF_FUNC "cross")
     set(PREFER_PORTABLE_VSNPRINTF 1)
-  else(CMAKE_CROSSCOMPILING)
+  else()
     try_run(RUN_VSNPRINTF_FUNC_VAR COMPILE_VSNPRINTF_FUNC_VAR
       ${CMAKE_BINARY_DIR}
       ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_vsnprintf.c
       )
-  endif(CMAKE_CROSSCOMPILING)
+  endif()
 
   set(PREFER_PORTABLE_SNPRINTF 0)
   if(RUN_VSNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
     set(PREFER_PORTABLE_SNPRINTF 1)
-  endif(RUN_VSNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
+  endif()
   if(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
     set(PREFER_PORTABLE_SNPRINTF 1)
-  endif(RUN_SNPRINTF_FUNC_VAR MATCHES "FAILED_TO_RUN")
-endif(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
+  endif()
+endif()
 
 ### check for asprintf function familly
 if(HAVE_ASPRINTF)
   SET(simgrid_need_asprintf "")
   SET(NEED_ASPRINTF 0)
-else(HAVE_ASPRINTF)
+else()
   SET(simgrid_need_asprintf "#define SIMGRID_NEED_ASPRINTF 1")
   SET(NEED_ASPRINTF 1)
-endif(HAVE_ASPRINTF)
+endif()
 
 if(HAVE_VASPRINTF)
   SET(simgrid_need_vasprintf "")
   SET(NEED_VASPRINTF 0)
-else(HAVE_VASPRINTF)
+else()
   SET(simgrid_need_vasprintf "#define SIMGRID_NEED_VASPRINTF 1")
   SET(NEED_VASPRINTF 1)
-endif(HAVE_VASPRINTF)
+endif()
 
 ### check for addr2line
 
 find_path(ADDR2LINE NAMES addr2line	PATHS NO_DEFAULT_PATHS	)
 if(ADDR2LINE)
   set(ADDR2LINE "${ADDR2LINE}/addr2line")
-endif(ADDR2LINE)
+endif()
 
 ### Check if OSX can compile with ucontext (with gcc 4.[1-5] it is broken)
 if(APPLE)
   if(APPLE_NEED_GCC_VERSION GREATER COMPILER_C_VERSION_MAJOR_MINOR)
     message(STATUS "Ucontext can't be used with this version of gcc (must be greater than 4.5)")
     set(HAVE_UCONTEXT_H 0)
-  endif(APPLE_NEED_GCC_VERSION GREATER COMPILER_C_VERSION_MAJOR_MINOR)
-endif(APPLE)
+  endif()
+endif()
 
 ### File to create
 
@@ -860,7 +860,7 @@ if(NOT WIN32)
   exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE OKITOKI)
   exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE OKITOKI)
   exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE OKITOKI)
-endif(NOT WIN32)
+endif()
 
 set(generated_headers_to_install
   ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
@@ -888,7 +888,7 @@ set(generated_files_to_clean
   )
 
 if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
-else("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
+else()
   configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/hostfile ${CMAKE_BINARY_DIR}/examples/smpi/hostfile COPYONLY)
   configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml ${CMAKE_BINARY_DIR}/examples/msg/small_platform.xml COPYONLY)
   configure_file(${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform_with_routers.xml ${CMAKE_BINARY_DIR}/examples/msg/small_platform_with_routers.xml COPYONLY)
@@ -909,14 +909,14 @@ else("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
     ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_bcast.txt
     ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile
     )
-endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}")
+endif()
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
   "${generated_files_to_clean}")
 
 IF(${ARCH_32_BITS})
   set(WIN_ARCH "32")
-ELSE(${ARCH_32_BITS})
+ELSE()
   set(WIN_ARCH "64")
-ENDIF(${ARCH_32_BITS})
+ENDIF()
 configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/simgrid.nsi.in" 	"${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE)