diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-11 13:13:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-04-11 13:13:09 (GMT) |
| commit | 76425a62192ddad23c84e3022b400dc3c5be0ace (patch) | |
| tree | 554631357c8a36c5e35973634955bae25d28cf1a | |
| parent | 0c08da9912ab8211339098ba87047a3d0d507cda (diff) | |
| parent | 7147ed5ce45ac6ae9d5f4e6e45bce2c66be39be3 (diff) | |
| download | CMake-76425a62192ddad23c84e3022b400dc3c5be0ace.zip CMake-76425a62192ddad23c84e3022b400dc3c5be0ace.tar.gz CMake-76425a62192ddad23c84e3022b400dc3c5be0ace.tar.bz2 | |
Merge topic 'rc-windres-with-dot'
7147ed5c CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865)
db924e00 CMakeRCInformation: Do not mention 'Fortran' in documentation
| -rw-r--r-- | Modules/CMakeRCInformation.cmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake index 8ffe50a..6bb2636 100644 --- a/Modules/CMakeRCInformation.cmake +++ b/Modules/CMakeRCInformation.cmake @@ -13,15 +13,16 @@ # License text for the above reference.) -# This file sets the basic flags for the Fortran language in CMake. +# This file sets the basic flags for the Windows Resource Compiler. # It also loads the available platform file for the system-compiler # if it exists. # make sure we don't use CMAKE_BASE_NAME from somewhere else set(CMAKE_BASE_NAME) -get_filename_component(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE) -if("${CMAKE_BASE_NAME}" MATCHES "windres") - set(CMAKE_BASE_NAME "windres") +if(CMAKE_RC_COMPILER MATCHES "windres[^/]*$") + set(CMAKE_BASE_NAME "windres") +else() + get_filename_component(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE) endif() set(CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake) @@ -30,7 +31,7 @@ include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL) set (CMAKE_RC_FLAGS "$ENV{RCFLAGS} ${CMAKE_RC_FLAGS_INIT}" CACHE STRING - "Flags for Fortran compiler.") + "Flags for Windows Resource Compiler.") # These are the only types of flags that should be passed to the rc # command, if COMPILE_FLAGS is used on a target this will be used |