Bläddra i källkod

ENH: Using only filename without path or extension for comparing build tools.

Brad King 23 år sedan
förälder
incheckning
f9eb32fc6e
1 ändrade filer med 9 tillägg och 2 borttagningar
  1. 9 2
      Modules/CMakeImportBuildSettings.cmake

+ 9 - 2
Modules/CMakeImportBuildSettings.cmake

@@ -18,8 +18,15 @@ MACRO(CMAKE_IMPORT_BUILD_SETTINGS SETTINGS_FILE)
        GREATER ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
 
     # Check the build tool.
-    STRING(COMPARE NOTEQUAL
-           "x${CMAKE_BUILD_TOOL}" "x${CMAKE_BUILD_SETTING_BUILD_TOOL}"
+    SET(CMAKE_BUILD_TOOL1 "")
+    IF(CMAKE_BUILD_TOOL)
+      GET_FILENAME_COMPONENT (CMAKE_BUILD_TOOL1 ${CMAKE_BUILD_TOOL} NAME_WE)
+    ENDIF(CMAKE_BUILD_TOOL)
+    SET(CMAKE_BUILD_TOOL2 "")
+    IF(CMAKE_BUILD_SETTING_BUILD_TOOL)
+      GET_FILENAME_COMPONENT (CMAKE_BUILD_TOOL2 ${CMAKE_BUILD_SETTING_BUILD_TOOL} NAME_WE)
+    ENDIF(CMAKE_BUILD_SETTING_BUILD_TOOL)
+    STRING(COMPARE NOTEQUAL "x${CMAKE_BUILD_TOOL1}" "x${CMAKE_BUILD_TOOL2}"
            CMAKE_BUILD_TOOL_MISMATCH)
 
     IF(CMAKE_BUILD_SETTING_BUILD_TOOL MATCHES "^msdev$")