Since cmake 2.6, else() and endif() don't need to repeat the condition.

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

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index e2fb563..afd614c 100644 (file)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -3,13 +3,9 @@
 #########################################
 
 # doc
-if(NOT EXISTS ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/)
-  file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/)
-endif(NOT EXISTS ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/)
-
-if(NOT EXISTS ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/)
-  file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/)
-endif(NOT EXISTS ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/)
+file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/shared/doxygen/)
+file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/)
+file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/)
 
 install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/"
   DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/ref_guide/html/"
@@ -31,17 +27,17 @@ install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/"
 if(NOT WIN32)
   if( NOT MANPAGE_DIR)
     set( MANPAGE_DIR ${CMAKE_BINARY_DIR}/manpages )
-  endif( NOT MANPAGE_DIR)
+  endif()
 
   add_custom_target(manpages ALL
     COMMAND ${CMAKE_COMMAND} -E make_directory ${MANPAGE_DIR}
     COMMAND pod2man ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl > ${MANPAGE_DIR}/simgrid_update_xml.1
     COMMENT "Generating manpages"
     )
-  install(FILES ${MANPAGE_DIR}/simgrid_update_xml.1
+  install(FILES ${MANPAGE_DIR}/simgrid_update_xml.1 ${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.1
     DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/man/man1)
 
-endif(NOT WIN32)
+endif()
 
 # binaries
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
@@ -84,7 +80,7 @@ install(TARGETS simgrid gras
 if(enable_smpi)
   install(TARGETS smpi
     DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
-endif(enable_smpi)
+endif()
 
 if(enable_lib_static AND NOT WIN32)
   install(TARGETS simgrid_static
@@ -92,8 +88,8 @@ if(enable_lib_static AND NOT WIN32)
   if(enable_smpi)
     install(TARGETS smpi_static
       DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
-  endif(enable_smpi)
-endif(enable_lib_static AND NOT WIN32)
+  endif()
+endif()
 
 # include files
 set(HEADERS
@@ -130,7 +126,7 @@ if(HAVE_LUA)
   install(FILES ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
     DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/lua/5.1
     )
-endif(HAVE_LUA)
+endif()
 
 ###########################################
 ### Fill in the "make uninstall" target ###
@@ -179,7 +175,7 @@ if(HAVE_LUA)
     COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/lua/5.1/simgrid.${LIB_EXE}
     WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/"
     )
-endif(HAVE_LUA)
+endif()
 
 ################################################################
 ## Build a sain "make dist" target to build a source package ###
@@ -191,45 +187,52 @@ endif(HAVE_LUA)
 set(source_to_pack
   ${headers_to_install}
   ${source_of_generated_headers}
-  ${XBT_RL_SRC}
-  ${EXTRA_DIST}
-  ${SMPI_SRC}
-  ${GRAS_RL_SRC}
-  ${XBT_SRC}
-  ${GTNETS_SRC}
-  ${NS3_SRC}
-  ${SURF_SRC}
-  ${SIMIX_SRC}
-  ${TRACING_SRC}
-  ${MSG_SRC}
-  ${SIMDAG_SRC}
+  ${AMOK_SRC}
+  ${BINDINGS_SRC}
   ${GRAS_COMMON_SRC}
+  ${GRAS_RL_SRC}
   ${GRAS_SG_SRC}
-  ${AMOK_SRC}
+  ${GTNETS_SRC}
+  ${JEDULE_SRC}
   ${LUA_SRC}
   ${MC_SRC}
-  ${JEDULE_SRC}
+  ${MSG_SRC}
+  ${NS3_SRC}
   ${RNGSTREAM_SRC}
-  ${BINDINGS_FILES}
+  ${SIMDAG_SRC}
+  ${SIMIX_SRC}
+  ${SMPI_SRC}
+  ${SURF_SRC}
+  ${TRACING_SRC}
+  ${XBT_RL_SRC}
+  ${XBT_SRC}
+  ${EXTRA_DIST}
   ${CMAKE_SOURCE_FILES}
   ${EXAMPLES_CMAKEFILES_TXT}
   ${TESHSUITE_CMAKEFILES_TXT}
-  ${TOOLS_CMAKEFILES_TXT}
   ${TESTSUITE_CMAKEFILES_TXT}
+  ${TOOLS_CMAKEFILES_TXT}
+  ${DOC_FIGS}
+  ${DOC_IMG}
   ${DOC_SOURCES}
-  ${USER_GUIDE_SOURCES}
+  ${DOC_GTUT_SRC}
+  ${LISTE_GTUT}
+  ${EXTRA_LISTE_GTUT}
+  ${DOC_TOOLS}
+  ${DOC_SHARED_TAG}
   ${REF_GUIDE_SOURCES}
-  ${DOC_FIGS}
+  ${USER_GUIDE_SOURCES}
+  ${DEV_GUIDE_SOURCES}
+  ${PLATFORMS_EXAMPLES}
   ${README_files}
-  ${xml_files}
-  ${tesh_files}
-  ${txt_files}
   ${bin_files}
   ${examples_src}
+  ${tesh_files}
   ${teshsuite_src}
-  ${tools_src}
   ${testsuite_src}
-  ${PLATFORMS_EXAMPLES}
+  ${tools_src}
+  ${txt_files}
+  ${xml_files}
   )
 
 ##########################################
@@ -264,20 +267,20 @@ foreach(file ${source_to_pack})
       TARGET dist-dir
       COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/${file_location}/
       )
-  endif(NOT OPERATION)
+  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}/
     )
-
-  add_custom_command(
-    TARGET dist-dir
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile
-    )
 endforeach(file ${source_to_pack})
 
+add_custom_command(
+  TARGET dist-dir
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Makefile.default ${PROJECT_NAME}-${release_version}/Makefile
+  )
+
 ######################################
 ### Fill in the "make dist" target ###
 ######################################
@@ -304,7 +307,7 @@ if(NOT enable_maintainer_mode)
     COMMAND ${CMAKE_COMMAND} -E echo "WARNING: ----------------------------------------------------"
     )
   add_dependencies(dist echo-dist)
-endif(NOT enable_maintainer_mode)
+endif()
 
 ###########################################
 ### Fill in the "make distcheck" target ###
@@ -356,11 +359,11 @@ if(enable_memcheck)
   add_custom_target(check
     COMMAND ctest -D ExperimentalMemCheck
     )
-else(enable_memcheck)
+else()
   add_custom_target(check
     COMMAND make test
     )
-endif(enable_memcheck)
+endif()
 
 #######################################
 ### Fill in the "make xxx-clean" target ###