Whitespace cleanup.

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 5d34967..93fa2e4 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -103,12 +103,12 @@ if(enable_ns3)
 endif()
 
 # Checks for header libraries functions.
 endif()
 
 # Checks for header libraries functions.

-CHECK_LIBRARY_EXISTS(pthread   pthread_create                  "" pthread)
-CHECK_LIBRARY_EXISTS(pthread   sem_init                                "" HAVE_SEM_INIT_LIB)
-CHECK_LIBRARY_EXISTS(pthread   sem_open                                "" HAVE_SEM_OPEN_LIB)
-CHECK_LIBRARY_EXISTS(pthread   sem_timedwait                   "" HAVE_SEM_TIMEDWAIT_LIB)
-CHECK_LIBRARY_EXISTS(pthread   pthread_mutex_timedlock "" HAVE_MUTEX_TIMEDLOCK_LIB)
-CHECK_LIBRARY_EXISTS(rt                clock_gettime                   "" HAVE_POSIX_GETTIME)
+CHECK_LIBRARY_EXISTS(pthread pthread_create          "" pthread)
+CHECK_LIBRARY_EXISTS(pthread sem_init                "" HAVE_SEM_INIT_LIB)
+CHECK_LIBRARY_EXISTS(pthread sem_open                "" HAVE_SEM_OPEN_LIB)
+CHECK_LIBRARY_EXISTS(pthread sem_timedwait           "" HAVE_SEM_TIMEDWAIT_LIB)
+CHECK_LIBRARY_EXISTS(pthread pthread_mutex_timedlock "" HAVE_MUTEX_TIMEDLOCK_LIB)
+CHECK_LIBRARY_EXISTS(rt      clock_gettime           "" HAVE_POSIX_GETTIME)

 
 CHECK_INCLUDE_FILES("time.h;sys/time.h" TIME_WITH_SYS_TIME)
 CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
 
 CHECK_INCLUDE_FILES("time.h;sys/time.h" TIME_WITH_SYS_TIME)
 CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)


@@ -241,8 +241,8 @@ if (HAVE_DLFCN_H)
     else()
 
       execute_process(COMMAND ./test_gnu_ld
     else()
 
       execute_process(COMMAND ./test_gnu_ld

-          WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 
-          RESULT_VARIABLE HAVE_GNU_LD_run 
+          WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+          RESULT_VARIABLE HAVE_GNU_LD_run

           OUTPUT_VARIABLE var_exec
       )
 
           OUTPUT_VARIABLE var_exec
       )
 


@@ -253,7 +253,7 @@ if (HAVE_DLFCN_H)
         set(HAVE_GNU_LD 0)
         message(STATUS "Warning: error while checking for GNU ld:")
         message(STATUS "Test output: '${var_exec}'")
         set(HAVE_GNU_LD 0)
         message(STATUS "Warning: error while checking for GNU ld:")
         message(STATUS "Test output: '${var_exec}'")

-       message(STATUS "Exit status: ${HAVE_GNU_LD_run}")
+        message(STATUS "Exit status: ${HAVE_GNU_LD_run}")

       endif()
       file(REMOVE test_gnu_ld)
     endif()
       endif()
       file(REMOVE test_gnu_ld)
     endif()


@@ -288,8 +288,8 @@ if(pthread)
     endif()
 
     execute_process(COMMAND ./sem_open
     endif()
 
     execute_process(COMMAND ./sem_open

-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 
-    RESULT_VARIABLE HAVE_SEM_OPEN_run 
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    RESULT_VARIABLE HAVE_SEM_OPEN_run

     OUTPUT_VARIABLE var_compil
     )
     file(REMOVE sem_open)
     OUTPUT_VARIABLE var_compil
     )
     file(REMOVE sem_open)


@@ -315,9 +315,9 @@ if(pthread)
 
   if(HAVE_SEM_INIT_LIB)
     execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_init.c -lpthread -o sem_init
 
   if(HAVE_SEM_INIT_LIB)
     execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_sem_init.c -lpthread -o sem_init

-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}

     RESULT_VARIABLE HAVE_SEM_INIT_run OUTPUT_VARIABLE HAVE_SEM_INIT_compil)
     RESULT_VARIABLE HAVE_SEM_INIT_run OUTPUT_VARIABLE HAVE_SEM_INIT_compil)

-    
+

     if(HAVE_SEM_INIT_compil)
       set(HAVE_SEM_INIT 0)
       message(STATUS "Warning: sem_init not compilable")
     if(HAVE_SEM_INIT_compil)
       set(HAVE_SEM_INIT 0)
       message(STATUS "Warning: sem_init not compilable")


@@ -326,9 +326,9 @@ if(pthread)
       set(HAVE_SEM_INIT 1)
       message(STATUS "sem_init is compilable")
     endif()
       set(HAVE_SEM_INIT 1)
       message(STATUS "sem_init is compilable")
     endif()

-    execute_process(COMMAND ./sem_init 
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR} 
-    RESULT_VARIABLE HAVE_SEM_INIT_run 
+    execute_process(COMMAND ./sem_init
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    RESULT_VARIABLE HAVE_SEM_INIT_run

     OUTPUT_VARIABLE var_compil
     )
     file(REMOVE sem_init)
     OUTPUT_VARIABLE var_compil
     )
     file(REMOVE sem_init)


@@ -555,7 +555,7 @@ if(HAVE_MAKECONTEXT OR WIN32)
     message(STATUS "${pth_skaddr_makecontext}")
     message(STATUS "${pth_sksize_makecontext}")
   else()
     message(STATUS "${pth_skaddr_makecontext}")
     message(STATUS "${pth_sksize_makecontext}")
   else()

-    #      message(FATAL_ERROR "makecontext is not compilable")
+    # message(FATAL_ERROR "makecontext is not compilable")

   endif()
 endif()
 
   endif()
 endif()
 


@@ -612,33 +612,33 @@ set(diff_va "va_copy((d),(s))"
 
 foreach(fct ${diff_va})
   write_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c" "#include <stdlib.h>
 
 foreach(fct ${diff_va})
   write_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_va_copy.c" "#include <stdlib.h>

-       #include <stdarg.h>
-       #include <string.h>
-       #define DO_VA_COPY(d,s) ${fct}
-       void test(char *str, ...)
-       {
-           va_list ap, ap2;
-           int i;
-           va_start(ap, str);
-           DO_VA_COPY(ap2, ap);
-           for (i = 1; i <= 9; i++) {
-               int k = (int)va_arg(ap, int);
-               if (k != i)
-                   abort();
-           }
-           DO_VA_COPY(ap, ap2);
-           for (i = 1; i <= 9; i++) {
-               int k = (int)va_arg(ap, int);
-               if (k != i)
-                   abort();
-           }
-           va_end(ap);
-       }
-       int main(void)
-       {
-           test(\"test\", 1, 2, 3, 4, 5, 6, 7, 8, 9);
-           exit(0);
-       }"
+#include <stdarg.h>
+#include <string.h>
+#define DO_VA_COPY(d,s) ${fct}
+void test(char *str, ...)
+{
+  va_list ap, ap2;
+  int i;
+  va_start(ap, str);
+  DO_VA_COPY(ap2, ap);
+  for (i = 1; i <= 9; i++) {
+    int k = (int)va_arg(ap, int);
+    if (k != i)
+      abort();
+  }
+  DO_VA_COPY(ap, ap2);
+  for (i = 1; i <= 9; i++) {
+    int k = (int)va_arg(ap, int);
+    if (k != i)
+      abort();
+  }
+  va_end(ap);
+}
+int main(void)
+{
+  test(\"test\", 1, 2, 3, 4, 5, 6, 7, 8, 9);
+  exit(0);
+}"

     )
   try_compile(COMPILE_VA_NULL_VAR
     ${CMAKE_BINARY_DIR}
     )
   try_compile(COMPILE_VA_NULL_VAR
     ${CMAKE_BINARY_DIR}


@@ -767,12 +767,13 @@ endif()
 
 ### File to create
 
 
 ### File to create
 

-configure_file("${CMAKE_HOME_DIRECTORY}/src/context_sysv_config.h.in"                  "${CMAKE_BINARY_DIR}/src/context_sysv_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/src/context_sysv_config.h.in"
+  "${CMAKE_BINARY_DIR}/src/context_sysv_config.h" @ONLY IMMEDIATE)

 
 SET( CMAKEDEFINE "#cmakedefine" )
 
 SET( CMAKEDEFINE "#cmakedefine" )

-configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/internal_config.h.in"     "${CMAKE_BINARY_DIR}/src/internal_config.h" @ONLY IMMEDIATE)
-configure_file("${CMAKE_BINARY_DIR}/src/internal_config.h"                     "${CMAKE_BINARY_DIR}/src/internal_config.h" @ONLY IMMEDIATE)
-configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in"           "${CMAKE_BINARY_DIR}/include/simgrid_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/internal_config.h.in" "${CMAKE_BINARY_DIR}/src/internal_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_BINARY_DIR}/src/internal_config.h" "${CMAKE_BINARY_DIR}/src/internal_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in" "${CMAKE_BINARY_DIR}/include/simgrid_config.h" @ONLY IMMEDIATE)

 
 set(top_srcdir "${CMAKE_HOME_DIRECTORY}")
 set(srcdir "${CMAKE_HOME_DIRECTORY}/src")
 
 set(top_srcdir "${CMAKE_HOME_DIRECTORY}")
 set(srcdir "${CMAKE_HOME_DIRECTORY}/src")


@@ -909,4 +910,4 @@ IF(${ARCH_32_BITS})
 ELSE()
   set(WIN_ARCH "64")
 ENDIF()
 ELSE()
   set(WIN_ARCH "64")
 ENDIF()

-configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/simgrid.nsi.in"   "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/simgrid.nsi.in" "${CMAKE_BINARY_DIR}/simgrid.nsi" @ONLY IMMEDIATE)