summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2002-12-09 19:33:48 (GMT)
committerBrad King <brad.king@kitware.com>2002-12-09 19:33:48 (GMT)
commitf9eb32fc6e7cf0866bfb0b04774dab251899e81a (patch)
tree0087bb494ad772552acf88d908248b0a55847460 /Modules
parentfdd4cf7cf47ac5115e0adf30c693366227857b4f (diff)
downloadCMake-f9eb32fc6e7cf0866bfb0b04774dab251899e81a.zip
CMake-f9eb32fc6e7cf0866bfb0b04774dab251899e81a.tar.gz
CMake-f9eb32fc6e7cf0866bfb0b04774dab251899e81a.tar.bz2
ENH: Using only filename without path or extension for comparing build tools.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeImportBuildSettings.cmake11
1 files changed, 9 insertions, 2 deletions
diff --git a/Modules/CMakeImportBuildSettings.cmake b/Modules/CMakeImportBuildSettings.cmake
index a2525ec..f056c2e 100644
--- a/Modules/CMakeImportBuildSettings.cmake
+++ b/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$")