From: Martin Quinson Date: Tue, 8 Mar 2016 13:25:46 +0000 (+0100) Subject: reindent X-Git-Tag: v3_13~475 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/27dae4656477a8d8b59924167f9c2082bf614078?hp=-c reindent --- 27dae4656477a8d8b59924167f9c2082bf614078 diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake index d87c44fc9d..309eb7e560 100644 --- a/tools/cmake/Distrib.cmake +++ b/tools/cmake/Distrib.cmake @@ -34,8 +34,7 @@ install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl add_custom_target(simgrid-colorizer ALL COMMENT "Install ${CMAKE_BINARY_DIR}/bin/colorize" - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl ${CMAKE_BINARY_DIR}/bin/colorize - ) + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl ${CMAKE_BINARY_DIR}/bin/colorize) install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/ @@ -43,8 +42,7 @@ install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl add_custom_target(simgrid_update_xml ALL COMMENT "Install ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml" - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml - ) + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml) # libraries install(TARGETS simgrid @@ -122,15 +120,13 @@ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -E echo "uninstall man ok" - WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}" - ) + WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}") if(HAVE_LUA) add_custom_command(TARGET uninstall COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding lua ok" COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/lua/5.1/simgrid.${LIB_EXE} - WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/" - ) + WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/") endif() ################################################################ @@ -195,8 +191,7 @@ add_custom_target(dist-dir COMMAND ${CMAKE_COMMAND} -E remove ${PROJECT_NAME}-${release_version}.tar.gz COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version} COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/doc/html/ - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/html/ ${PROJECT_NAME}-${release_version}/doc/html/ - ) + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/html/ ${PROJECT_NAME}-${release_version}/doc/html/) add_dependencies(dist-dir maintainer_files) set(dirs_in_tarball "") @@ -212,21 +207,18 @@ foreach(file ${source_to_pack}) set(dirs_in_tarball "${dirs_in_tarball};${file_location};") add_custom_command( TARGET dist-dir - COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/${file_location}/ - ) + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/${file_location}/) endif() # Actually copy the file add_custom_command( TARGET dist-dir - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/${file} ${PROJECT_NAME}-${release_version}/${file_location} - ) + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/${file} ${PROJECT_NAME}-${release_version}/${file_location}) endforeach(file ${source_to_pack}) add_custom_command( TARGET dist-dir - COMMAND ${CMAKE_COMMAND} -E echo "${GIT_VERSION}" > ${PROJECT_NAME}-${release_version}/.gitversion - ) + COMMAND ${CMAKE_COMMAND} -E echo "${GIT_VERSION}" > ${PROJECT_NAME}-${release_version}/.gitversion) ###################################### ### Fill in the "make dist" target ### @@ -236,24 +228,21 @@ add_custom_target(dist COMMENT "Removing the distribution directory" DEPENDS ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-${release_version}.tar.gz COMMAND ${CMAKE_COMMAND} -E echo ${PROJECT_NAME}-${release_version} > ${CMAKE_BINARY_DIR}/VERSION - COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/ - ) + COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/) add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-${release_version}.tar.gz COMMENT "Compressing the archive from the distribution directory" COMMAND ${CMAKE_COMMAND} -E tar cf ${PROJECT_NAME}-${release_version}.tar ${PROJECT_NAME}-${release_version}/ COMMAND gzip -9v ${PROJECT_NAME}-${release_version}.tar - COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/ - ) + COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/) add_dependencies(dist dist-dir) if(NOT enable_maintainer_mode) add_custom_target(echo-dist COMMAND ${CMAKE_COMMAND} -E echo "WARNING: ----------------------------------------------------" COMMAND ${CMAKE_COMMAND} -E echo "WARNING: Distrib is generated without option maintainer mode " - COMMAND ${CMAKE_COMMAND} -E echo "WARNING: ----------------------------------------------------" - ) + COMMAND ${CMAKE_COMMAND} -E echo "WARNING: ----------------------------------------------------") add_dependencies(dist echo-dist) endif() @@ -307,13 +296,9 @@ add_dependencies(distcheck dist) ####################################### if(enable_memcheck) - add_custom_target(check - COMMAND ctest -D ExperimentalMemCheck - ) + add_custom_target(check COMMAND ctest -D ExperimentalMemCheck) else() - add_custom_target(check - COMMAND make test - ) + add_custom_target(check COMMAND make test) endif() ####################################### @@ -332,7 +317,6 @@ add_custom_target(maintainer-clean COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_str_unit.c COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_strbuff_unit.c COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_synchro_unit.c - WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}" - ) + WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}") include(CPack)