From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 16 May 2019 11:49:35 +0000 (+0200)
Subject: Merge branch 'master' of https://framagit.org/simgrid/simgrid
X-Git-Tag: v3.22.4~125
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3e1507aae0c6ef620ee4aa68c4f6d32795fc2ea1?hp=b6de662880769ad2cb4c13545bf9a7ceade5ede4

Merge branch 'master' of https://framagit.org/simgrid/simgrid
---

diff --git a/ChangeLog b/ChangeLog
index 1f670a58d4..f739415bd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@ Fixed bugs (GH=GitHub; FG=FramaGit):
  - FG#10: Can not use MSG_process_set_data from SMPI any more
  - FG#11: Auto-restart actors forget their on_exit behavior
  - FG#12: -Denable_lto=OFF doesn't disable LTO
+ - FG#13: Installs unstripped file 'bin/graphicator'
+ - FG#14: Installs the empty directory 'doc/simgrid/html'
  - GH#133: Java : a process can run on a VM even if its host is off
  - GH#326: Valgrind-detected error for join() when energy plugin is activated
 
diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index 91b516c33c..10fa30ab7f 100644
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -3,9 +3,7 @@
 #########################################
 
 # doc
-file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/doc/html/)
-install(DIRECTORY "${CMAKE_BINARY_DIR}/doc/html/"
-  DESTINATION doc/simgrid/html/)
+install(DIRECTORY "${CMAKE_BINARY_DIR}/doc/html/" DESTINATION doc/simgrid/html/ OPTIONAL)
 
 # binaries
 if(enable_smpi)
@@ -27,7 +25,7 @@ endif()
 
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh  DESTINATION bin/)
 
-install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/graphicator  DESTINATION bin/)
+install(TARGETS graphicator DESTINATION bin/)
 
 install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl
   DESTINATION bin/
diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake
index 1d3262ba35..99f597630f 100644
--- a/tools/cmake/Flags.cmake
+++ b/tools/cmake/Flags.cmake
@@ -23,11 +23,12 @@ if(enable_compile_warnings)
   endif()
   if (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
     # ignore remark  #1418: external function definition with no prior declaration
+    # 2196: routine is both "inline" and "noinline"
     # 3179: deprecated conversion of string literal to char* (should be const char*)
     # 191: type qualifier is meaningless on cast type
     # 597: entity-kind "entity" will not be called for implicit or explicit conversions
     # 2330: argument of type "type" is incompatible with parameter of type "type" (dropping qualifiers)
-    set(warnCFLAGS "${warnCFLAGS} -wd1418 -wd191 -wd3179 -ww597 -ww2330")
+    set(warnCFLAGS "${warnCFLAGS} -wd1418 -wd191 -wd2196 -wd3179 -ww597 -ww2330")
   endif()
 
   set(warnCXXFLAGS "${warnCFLAGS} -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing")