Commits

Anonymous committed 22d7f1d

ENH: Merging GCC 3.x support directories to ITK 1.6 branch.

  • Participants
  • Parent commits d474c22
  • Branches ITK-1-6

Comments (0)

Files changed (9)

File GCC_XML/Support/GCC/3.0/CMakeLists.txt

+# Install ./ header file wrappers.
+FILE(GLOB HEADERS [a-z]*)
+INSTALL_FILES(${GCCXML_INSTALL_ROOT}${GCCXML_DATA_DIR}/GCC/3.0
+  FILES ${HEADERS})

File GCC_XML/Support/GCC/3.0/pthread.h

+#ifndef GCCXML_PTHREAD_H
+#define GCCXML_PTHREAD_H
+
+/* Some pthread.h files use __thread, which is a keyword for GCC 3.3.
+   Change the name for the duration of including pthread.h.  */
+#ifndef __thread
+# define __thread gccxml__thread
+# define gccxml__thread gccxml__thread
+#endif
+#include_next <pthread.h>
+#ifdef gccxml__thread
+# undef gccxml__thread
+# undef __thread
+#endif
+
+#endif

File GCC_XML/Support/GCC/3.1/CMakeLists.txt

+# Install ./ header file wrappers.
+FILE(GLOB HEADERS [a-z]*)
+INSTALL_FILES(${GCCXML_INSTALL_ROOT}${GCCXML_DATA_DIR}/GCC/3.1
+  FILES ${HEADERS})

File GCC_XML/Support/GCC/3.1/pthread.h

+#ifndef GCCXML_PTHREAD_H
+#define GCCXML_PTHREAD_H
+
+/* Some pthread.h files use __thread, which is a keyword for GCC 3.3.
+   Change the name for the duration of including pthread.h.  */
+#ifndef __thread
+# define __thread gccxml__thread
+# define gccxml__thread gccxml__thread
+#endif
+#include_next <pthread.h>
+#ifdef gccxml__thread
+# undef gccxml__thread
+# undef __thread
+#endif
+
+#endif

File GCC_XML/Support/GCC/3.2/CMakeLists.txt

+# Install ./ header file wrappers.
+FILE(GLOB HEADERS [a-z]*)
+INSTALL_FILES(${GCCXML_INSTALL_ROOT}${GCCXML_DATA_DIR}/GCC/3.2
+  FILES ${HEADERS})

File GCC_XML/Support/GCC/3.2/pthread.h

+#ifndef GCCXML_PTHREAD_H
+#define GCCXML_PTHREAD_H
+
+/* Some pthread.h files use __thread, which is a keyword for GCC 3.3.
+   Change the name for the duration of including pthread.h.  */
+#ifndef __thread
+# define __thread gccxml__thread
+# define gccxml__thread gccxml__thread
+#endif
+#include_next <pthread.h>
+#ifdef gccxml__thread
+# undef gccxml__thread
+# undef __thread
+#endif
+
+#endif

File GCC_XML/Support/GCC/3.3/CMakeLists.txt

+# Install ./ header file wrappers.
+FILE(GLOB HEADERS [a-z]*)
+INSTALL_FILES(${GCCXML_INSTALL_ROOT}${GCCXML_DATA_DIR}/GCC/3.3
+  FILES ${HEADERS})

File GCC_XML/Support/GCC/CMakeLists.txt

 INSTALL_PROGRAMS(${GCCXML_INSTALL_ROOT}${GCCXML_DATA_DIR}/GCC find_flags)
 INSTALL_FILES(${GCCXML_INSTALL_ROOT}${GCCXML_DATA_DIR}/GCC/3.3 FILES
               ${GCCXML_SUPPORT}/GCC/3.3/gccxml_builtins.h)
-SUBDIRS(2.95 2.96)
+SUBDIRS(2.95 2.96 3.0 3.1 3.2 3.3)

File GCC_XML/Support/GCC/find_flags

 if [ "$MAJOR_VERSION" -lt 3 ]; then
   INCLUDES="-iwrapper$SELFPATH/2.95 $INCLUDES"
   if [ "$MINOR_VERSION" = 96 ]; then
-  INCLUDES="-iwrapper$SELFPATH/2.96 $INCLUDES"
+    INCLUDES="-iwrapper$SELFPATH/2.96 $INCLUDES"
   fi
 elif [ "$MAJOR_VERSION" = 3 -a "$MINOR_VERSION" -ge 3 ]; then
+  INCLUDES="-iwrapper$SELFPATH/3.3 $INCLUDES"
   SPECIAL="-include $SELFPATH/3.3/gccxml_builtins.h"
+elif [ "$MAJOR_VERSION" = 3 -a "$MINOR_VERSION" = 2 ]; then
+  INCLUDES="-iwrapper$SELFPATH/3.2 $INCLUDES"
+elif [ "$MAJOR_VERSION" = 3 -a "$MINOR_VERSION" = 1 ]; then
+  INCLUDES="-iwrapper$SELFPATH/3.1 $INCLUDES"
+elif [ "$MAJOR_VERSION" = 3 -a "$MINOR_VERSION" = 0 ]; then
+  INCLUDES="-iwrapper$SELFPATH/3.0 $INCLUDES"
 fi
 
 # Format and print out the options.