浏览代码

On windows but not on borland, look at cmake_build_tool instead of compiler to determine build name. Otherwise they will all be cl

Andy Cedilnik 23 年之前
父节点
当前提交
d2faa22732
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      Modules/Dart.cmake

+ 5 - 5
Modules/Dart.cmake

@@ -85,11 +85,11 @@ IF(BUILD_TESTING)
     IF(NOT DART_COMPILER)
       SET(DART_COMPILER "unknown")
     ENDIF(NOT DART_COMPILER)
-    IF(WIN32)
-      GET_FILENAME_COMPONENT(DART_CXX_NAME "${CMAKE_CXX_COMPILER}" NAME_WE)
-    ELSE(WIN32)
+    IF(UNIX OR BORLAND)
       GET_FILENAME_COMPONENT(DART_CXX_NAME "${CMAKE_CXX_COMPILER}" NAME)
-    ENDIF(WIN32)
+    ELSE(UNIX OR BORLAND)
+      GET_FILENAME_COMPONENT(DART_CXX_NAME "${CMAKE_BUILD_TOOL}" NAME_WE)
+    ENDIF(UNIX OR BORLAND)
     SET(BUILDNAME "${CMAKE_SYSTEM_NAME}-${DART_CXX_NAME}")
   ENDIF(NOT BUILDNAME)
   #BUILD_NAME(BUILDNAME)
@@ -103,7 +103,6 @@ IF(BUILD_TESTING)
     BUILD_WARNING_REPORT_LIMIT 
     BUILD_ERROR_REPORT_LIMIT     
     SITE 
-    BUILDNAME 
     MAKECOMMAND 
     JAVACOMMAND 
     PURIFYCOMMAND
@@ -115,6 +114,7 @@ IF(BUILD_TESTING)
     SCPCOMMAND
     DELIVER_CONTINUOUS_EMAIL
   )
+  #  BUILDNAME 
 
   #
   # Section #2: