save a couple more lines

diff --git a/tools/cmake/CTestCustom.cmake b/tools/cmake/CTestCustom.cmake
index 3fa5fb9..868b467 100644 (file)
--- a/tools/cmake/CTestCustom.cmake
+++ b/tools/cmake/CTestCustom.cmake
@@ -1,4 +1 @@
-
-SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
-@PATTERN_CTEST_IGNORED@
-)
\ No newline at end of file
+SET(CTEST_CUSTOM_COVERAGE_EXCLUDE @PATTERN_CTEST_IGNORED@)
\ No newline at end of file

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 1dec930..c9aa053 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -491,9 +491,7 @@ set(JTRACE_C_SRC
   src/bindings/java/jtrace.h
 )
 
-set(JTRACE_JAVA_SRC
-  src/bindings/java/org/simgrid/trace/Trace.java
-)
+set(JTRACE_JAVA_SRC src/bindings/java/org/simgrid/trace/Trace.java)
 
 list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
 list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
@@ -722,27 +720,16 @@ else() # NOT pthread
 endif()
 
 if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC
-    ${SURF_SRC}
-    src/xbt/xbt_os_thread.c
-    )
+  set(SURF_SRC    ${SURF_SRC}   src/xbt/xbt_os_thread.c)
 else() # NOT pthread
-  set(EXTRA_DIST
-    ${EXTRA_DIST}
-    src/xbt/xbt_os_thread.c
+  set(EXTRA_DIST  ${EXTRA_DIST} src/xbt/xbt_os_thread.c
     )
 endif()
 
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
-  set(SURF_SRC
-    ${SURF_SRC}
-    src/simix/UContext.cpp
-    )
+  set(SURF_SRC    ${SURF_SRC}   src/simix/UContext.cpp)
 else() # NOT ucontext
-  set(EXTRA_DIST
-    ${EXTRA_DIST}
-    src/simix/UContext.cpp
-    )
+  set(EXTRA_DIST  ${EXTRA_DIST} src/simix/UContext.cpp)
 endif()
 
 ### Simgrid Lib sources

diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index 309eb7e..d9513dc 100644 (file)
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -22,11 +22,9 @@ if(enable_smpi)
   endif()
 endif()
 
-install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh
-  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
+install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
 
-install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/graphicator
-  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
+install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/graphicator  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
 
 install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl
   DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
@@ -45,28 +43,22 @@ add_custom_target(simgrid_update_xml ALL
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml)
 
 # libraries
-install(TARGETS simgrid
-  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
+install(TARGETS simgrid DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
 
 if(enable_java)
   set(SIMGRID_JAR_TO_INSTALL "${SIMGRID_JAR}")
-  install(TARGETS simgrid-java
-      DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
+  install(TARGETS simgrid-java   DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
   install(FILES ${SIMGRID_JAR_TO_INSTALL}
       DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/
       RENAME simgrid.jar)
 endif()
 
 # include files
-set(HEADERS
-  ${headers_to_install}
-  ${generated_headers_to_install}
-  )
+set(HEADERS  ${headers_to_install}  ${generated_headers_to_install})
 foreach(file ${HEADERS})
   get_filename_component(location ${file} PATH)
   string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" location "${location}")
-  install(FILES ${file}
-    DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${location})
+  install(FILES ${file} DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${location})
 endforeach(file ${HEADERS})
 
 # example files

diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index e8fa5e2..eb20402 100644 (file)
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -42,11 +42,9 @@ target_link_libraries(simgrid-java simgrid)
 
 get_target_property(COMMON_INCLUDES simgrid-java INCLUDE_DIRECTORIES)
 if (COMMON_INCLUDES)
-  set_target_properties(simgrid-java PROPERTIES
-    INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}")
+  set_target_properties(simgrid-java PROPERTIES  INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}")
 else()
-  set_target_properties(simgrid-java PROPERTIES
-    INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}")
+  set_target_properties(simgrid-java PROPERTIES  INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}")
 endif()
 
 get_target_property(CHECK_INCLUDES simgrid-java INCLUDE_DIRECTORIES)
@@ -61,10 +59,8 @@ set(SIMGRID_JAR "${CMAKE_BINARY_DIR}/simgrid.jar")
 set(MANIFEST_IN_FILE "${CMAKE_HOME_DIRECTORY}/src/bindings/java/MANIFEST.in")
 set(MANIFEST_FILE "${CMAKE_BINARY_DIR}/src/bindings/java/MANIFEST.MF")
 
-set(LIBSIMGRID_SO
-  libsimgrid${CMAKE_SHARED_LIBRARY_SUFFIX})
-set(LIBSIMGRID_JAVA_SO
-  ${CMAKE_SHARED_LIBRARY_PREFIX}simgrid-java${CMAKE_SHARED_LIBRARY_SUFFIX})
+set(LIBSIMGRID_SO       libsimgrid${CMAKE_SHARED_LIBRARY_SUFFIX})
+set(LIBSIMGRID_JAVA_SO  ${CMAKE_SHARED_LIBRARY_PREFIX}simgrid-java${CMAKE_SHARED_LIBRARY_SUFFIX})
 
 ## Here is how to build simgrid.jar
 ##
@@ -104,8 +100,6 @@ endif()
 ###
 
 if(enable_lib_in_jar)
-
-  
   set(SG_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
   
   if(${SG_SYSTEM_NAME} MATCHES "kFreeBSD")

diff --git a/tools/cmake/Modules/FindGraphviz.cmake b/tools/cmake/Modules/FindGraphviz.cmake
index 4c5d7ac..5e80fa4 100644 (file)
--- a/tools/cmake/Modules/FindGraphviz.cmake
+++ b/tools/cmake/Modules/FindGraphviz.cmake
@@ -16,7 +16,6 @@ find_library(HAVE_CDT_LIB
   PATH_SUFFIXES lib/graphviz lib
   PATHS         /opt;/opt/local;/opt/csw;/sw;/usr)
 
-
 if(HAVE_CDT_LIB AND HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
   string(REGEX REPLACE "/libcgraph.*" "" lib_graphviz ${HAVE_CGRAPH_LIB})
 

diff --git a/tools/cmake/Modules/FindLibdw.cmake b/tools/cmake/Modules/FindLibdw.cmake
index 9e07a38..77ffc47 100644 (file)
--- a/tools/cmake/Modules/FindLibdw.cmake
+++ b/tools/cmake/Modules/FindLibdw.cmake
@@ -12,7 +12,6 @@ find_library(PATH_LIBDW_LIB
   /sw
   /usr)
 
-
 find_path(PATH_LIBDW_H "elfutils/libdw.h"
   HINTS
   $ENV{SIMGRID_LIBDW_LIBRARY_PATH}
@@ -46,7 +45,6 @@ if(PATH_LIBDW_LIB AND PATH_LIBDW_H)
 
   include_directories(${PATH_LIBDW_H})
   link_directories(${PATH_LIBDW_LIB})
-
 else()
   message(FATAL_ERROR "Please either install the libdw-dev package (or equivalent) or turn off the model-checking option of SimGrid.")
 endif()

diff --git a/tools/cmake/Modules/FindLibunwind.cmake b/tools/cmake/Modules/FindLibunwind.cmake
index a5f4637..70f3ecf 100644 (file)
--- a/tools/cmake/Modules/FindLibunwind.cmake
+++ b/tools/cmake/Modules/FindLibunwind.cmake
@@ -64,7 +64,6 @@ if(PATH_LIBUNWIND_LIB AND PATH_LIBUNWIND_H)
       
   include_directories(${PATH_LIBUNWIND_H})
   link_directories(${PATH_LIBUNWIND_LIB})
-  
 else()
   message(FATAL_ERROR "Please either install the libunwind7-dev package (or equivalent) or turn off the model-checking option of SimGrid.")
 endif()

diff --git a/tools/cmake/Modules/FindLuaSimgrid.cmake b/tools/cmake/Modules/FindLuaSimgrid.cmake
index 6ffca2c..2904b98 100644 (file)
--- a/tools/cmake/Modules/FindLuaSimgrid.cmake
+++ b/tools/cmake/Modules/FindLuaSimgrid.cmake
@@ -57,7 +57,6 @@ unset(lua_version_str)
 # Check that we have a sufficient version of Lua
 if(LUA_VERSION_MAJOR EQUAL 5 AND LUA_VERSION_MINOR EQUAL 3)
   set(HAVE_LUA 1)
-    
   include_directories(${LUA_INCLUDE_DIR})
 else()
   message(FATAL_ERROR "Error: Lua version 5.3 is required, but version ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} found instead.")

diff --git a/tools/cmake/Modules/FindNS3.cmake b/tools/cmake/Modules/FindNS3.cmake
index 6014e36..3679e89 100644 (file)
--- a/tools/cmake/Modules/FindNS3.cmake
+++ b/tools/cmake/Modules/FindNS3.cmake
@@ -12,7 +12,6 @@
 #  - No way to specify a minimal version (v3.10 is hardcoded).
 #  - No proper find_package() integration
 
-
 ## ADDING A NS3 VERSION.
 #   - Add ns3.${version}-core to the NAME line of the find_library below
 #   - Add include/ns3{version} to the PATH_SUFFIXES line of the find_path below
@@ -34,8 +33,6 @@ find_path(NS3_INCLUDE_DIR
   ${NS3_HINT}
   )
 
-
-
 if(NS3_INCLUDE_DIR)
   message(STATUS "Looking for ns3/core-module.h - found")
 else()
@@ -51,7 +48,6 @@ else()
 endif()
 mark_as_advanced(NS3_LIBRARIES)
 
-
 if(NS3_INCLUDE_DIR)
   if(NS3_LIBRARIES)
     set(HAVE_NS3 1)

diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake
index c43b5e3..dc14fd0 100644 (file)
--- a/tools/cmake/Option.cmake
+++ b/tools/cmake/Option.cmake
@@ -20,8 +20,6 @@ option(enable_mallocators           "Enable mallocators (disable only for debugg
 option(enable_maintainer_mode       "Whether flex and flexml files should be rebuilt." off)
 option(enable_debug                 "Turn this off to remove all debug messages at compile time (faster, but no debug activatable)" on)
 
-
-
 # Optional modules
 ###
 option(enable_documentation "Whether to produce documentation" on)
@@ -44,7 +42,6 @@ else()
 endif()
 option(enable_smpi_ISP_testsuite "Whether the test suite from ISP should be built." off)
 
-
 # Internal targets used by jenkins
 ###
 option(enable_coverage "Whether coverage should be enabled." off)