Browse Source

New configure option --disable-icc to disable the compilation of specific ICC examples

Nathalie Furmento 7 years ago
parent
commit
edc929ae40
3 changed files with 21 additions and 2 deletions
  1. 2 0
      ChangeLog
  2. 10 2
      configure.ac
  3. 9 0
      doc/doxygen/chapters/510_configure_options.doxy

+ 2 - 0
ChangeLog

@@ -79,6 +79,8 @@ StarPU 1.2.4 (svn revision xxx)
 
 Small features:
    * Catch of signals SIGINT and SIGSEGV to dump fxt trace files.
+   * New configure option --disable-icc to disable the compilation of
+     specific ICC examples
 
 StarPU 1.2.3 (svn revision 22444)
 ==============================================

+ 10 - 2
configure.ac

@@ -3230,8 +3230,15 @@ if test x$have_f77_h = xyes; then
         AC_DEFINE([STARPU_HAVE_F77_H], [1], [Define to 1 if you have the <f77.h> header file.])
 fi
 
-# Check if icc is available
-AC_CHECK_PROGS([ICC], [icc])
+AC_ARG_ENABLE(icc, [AS_HELP_STRING([--enable-icc],
+				[Enable the compilation of specific ICC examples])],
+				enable_icc=$enableval, enable_icc=yes)
+
+ICC=""
+if test "$enable_icc" = "yes" ; then
+   # Check if icc is available
+   AC_CHECK_PROGS([ICC], [icc])
+fi
 
 # If cuda and icc are both available, check they are compatible
 if test "$enable_cuda" = "yes" -a "$ICC" != ""; then
@@ -3258,6 +3265,7 @@ fi
 if test "x$ICC" != "x" -a "$starpu_windows" = "yes" ; then
     ICC=""
 fi
+
 if test "x$ICC" != "x"; then
   AC_DEFINE(STARPU_HAVE_ICC, [1], [Define this if icc is available])
 fi

+ 9 - 0
doc/doxygen/chapters/510_configure_options.doxy

@@ -109,6 +109,15 @@ Disable the creation of the documentation. This should be done on a
 machine which does not have the tools <c>doxygen</c> and <c>latex</c>
 (plus the packages <c>latex-xcolor</c> and <c>texlive-latex-extra</c>).
 </dd>
+
+<dt>--disable-icc</dt>
+<dd>
+\anchor disable-icc
+\addindex __configure__--disable-icc
+Disable the usage of the ICC compiler. When found, some specific ICC
+examples are compiled.
+</dd>
+
 </dl>
 
 Additionally, the script <c>configure</c> recognize many variables, which