# HG changeset patch
# User Max Samukha <maxsamukha@gmail.com>
# Date 1304615486 -10800
# Node ID 4189f1d51a7dbc9cc92e3883a2940564d1d19d1f
# Parent  6fe37cbd9510f4b5bc8214c34503fa7fc7163187
support for new dmd naming

diff -r 6fe37cbd9510 -r 4189f1d51a7d cmake/FindD.cmake
--- a/cmake/FindD.cmake	Mon Apr 18 00:16:33 2011 +0200
+++ b/cmake/FindD.cmake	Thu May 05 20:11:26 2011 +0300
@@ -10,13 +10,13 @@
         get_filename_component(DC ${DC} NAME)
     endif("${dc_path}" STREQUAL ${CMAKE_BINARY_DIR})
     exec_program(${DC} ARGS "" OUTPUT_VARIABLE d_output)
-    string(REGEX MATCH "Digital Mars D Compiler v[0-9]\\.[0-9]+" dmd_version "${d_output}")
+    string(REGEX MATCH "(Digital Mars|DMD32) D Compiler v[0-9]\\.[0-9]+" dmd_version "${d_output}")
     if (dmd_version)
         set(D_IS_MARS true)
         set(D_IS_DMD true)
-        set(D_COMPILER_NAME "Digital Mars D Compiler")
-        string(REGEX REPLACE "Digital Mars D Compiler v([0-9])\\.[0-9]+" "\\1" D_VERSION "${dmd_version}")
-        string(REGEX REPLACE "Digital Mars D Compiler v[0-9]\\.([0-9]+)" "\\1" D_FRONTEND "${dmd_version}")
+        string(REGEX REPLACE "(.+) v([0-9])\\.([0-9])+" "\\1" D_COMPILER_NAME "${dmd_version}")
+        string(REGEX REPLACE "${D_COMPILER_NAME} v([0-9])\\.[0-9]+" "\\1" D_VERSION "${dmd_version}")
+        string(REGEX REPLACE "${D_COMPILER_NAME} v[0-9]\\.([0-9]+)" "\\1" D_FRONTEND "${dmd_version}")
     else (dmd_version)
 	string(REGEX MATCH "LLVM-based D Compiler" is_ldc "${d_output}")
 	if (is_ldc)
@@ -641,4 +641,4 @@
     else(update_deps_tmp)
 	file(STRINGS ${deps_file_tmp} ${out})
     endif(update_deps_tmp)
-endmacro(get_files_depends out)
\ No newline at end of file
+endmacro(get_files_depends out)