gccxml 2007-09-20 (cc9f78c8)

gccxml · Sep 20, 2007 · d9ec80e · d9ec80e
1 parent 4befcbf
commit d9ec80e
Show file tree

Hide file tree

Showing 23 changed files with 870 additions and 85 deletions.
diff --git a/GCC/config_cmake/CMakeLists.txt b/GCC/config_cmake/CMakeLists.txt
@@ -575,18 +575,23 @@ ENDIF(UNIX)
 IF(MINGW)
   SET(GCC_USE_PLATFORM_SCRIPT 1)
 ENDIF(MINGW)
+SET(GCC_EXECUTED_PLATFORM_SCRIPT)
 IF(GCC_USE_PLATFORM_SCRIPT)
   FIND_PROGRAM(GCC_SH sh /bin/sh c:/msys/1.0/bin/sh.exe)
   MARK_AS_ADVANCED(GCC_SH)
-  EXEC_PROGRAM(${GCC_SH}
-    ARGS
-    "\"${GCCCONFIG_SOURCE_DIR}/gcc_platform.sh\""
-    "\"${GCCCONFIG_BINARY_DIR}/gcc_platform.cmake\""
-    "\"${CMAKE_COMMAND}\"")
-ELSE(GCC_USE_PLATFORM_SCRIPT)
+  IF(GCC_SH)
+    EXEC_PROGRAM(${GCC_SH}
+      ARGS
+      "\"${GCCCONFIG_SOURCE_DIR}/gcc_platform.sh\""
+      "\"${GCCCONFIG_BINARY_DIR}/gcc_platform.cmake\""
+      "\"${CMAKE_COMMAND}\"")
+    SET(GCC_EXECUTED_PLATFORM_SCRIPT 1)
+  ENDIF(GCC_SH)
+ENDIF(GCC_USE_PLATFORM_SCRIPT)
+IF(NOT GCC_EXECUTED_PLATFORM_SCRIPT)
   CONFIGURE_FILE(${GCCCONFIG_SOURCE_DIR}/gcc_platform_win32.cmake
                  ${GCCCONFIG_BINARY_DIR}/gcc_platform.cmake @ONLY IMMEDIATE)
-ENDIF(GCC_USE_PLATFORM_SCRIPT)
+ENDIF(NOT GCC_EXECUTED_PLATFORM_SCRIPT)
 
 # Load the platform configuration.
 IF(EXISTS "${GCCCONFIG_BINARY_DIR}/gcc_platform.cmake")

diff --git a/GCC_XML/CMakeLists.txt b/GCC_XML/CMakeLists.txt
@@ -92,6 +92,7 @@ SET(BUILD_SHARED_LIBS 0)
 SET(LIBRARY_OUTPUT_PATH ${GCCXML_BINARY_DIR}/KWSys)
 SET(KWSYS_NAMESPACE gxsys)
 SET(KWSYS_USE_Process 1)
+SET(KWSYS_USE_RegularExpression 1)
 SET(KWSYS_USE_SystemTools 1)
 SET(KWSYS_HEADER_ROOT ${GCCXML_BINARY_DIR})
 IF("${CMAKE_SYSTEM}" MATCHES "AIX")
@@ -131,10 +132,10 @@ ENDFOREACH(dir)
 # Include compiler support directory.
 SUBDIRS(Support)
 
-IF(NOT UNIX)
+IF(WIN32)
   # Include Visual Studio compiler support directory.
   SUBDIRS(VcInstall)
-ENDIF(NOT UNIX)
+ENDIF(WIN32)
 
 # Directory to build gccxml executable.
 SUBDIRS(GXFront)