diff options
| author | Jiri Malak <malak.jiri@gmail.com> | 2014-03-03 20:36:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-04 21:28:53 (GMT) |
| commit | b052902c32190f6c10c703ab07310a91fa50d46a (patch) | |
| tree | 3b73351b94c10d7159ad21d2939f0b1ef54ceeb7 | |
| parent | 74b982ce734dd55a4155ba8ba0462fef894d6ec0 (diff) | |
| download | CMake-b052902c32190f6c10c703ab07310a91fa50d46a.zip CMake-b052902c32190f6c10c703ab07310a91fa50d46a.tar.gz CMake-b052902c32190f6c10c703ab07310a91fa50d46a.tar.bz2 | |
Remove hard-coded version of RTDLL for Open Watcom
In InstallRequiredSystemLibraries the version number for RTDLL can be
calculated from the compiler version. This will support current and
future OW versions without updating the module again.
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 013a028..7e68e8f 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -366,18 +366,22 @@ endif() if(WATCOM) get_filename_component( CompilerPath ${CMAKE_C_COMPILER} PATH ) - if(WATCOM17) - set( __install__libs ${CompilerPath}/clbr17.dll - ${CompilerPath}/mt7r17.dll ${CompilerPath}/plbr17.dll ) - endif() - if(WATCOM18) - set( __install__libs ${CompilerPath}/clbr18.dll - ${CompilerPath}/mt7r18.dll ${CompilerPath}/plbr18.dll ) + if(CMAKE_C_COMPILER_VERSION) + set(_compiler_version ${CMAKE_C_COMPILER_VERSION}) + else() + set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION}) endif() - if(WATCOM19) - set( __install__libs ${CompilerPath}/clbr19.dll - ${CompilerPath}/mt7r19.dll ${CompilerPath}/plbr19.dll ) + string(REGEX MATCHALL "[0-9]+" _watcom_version_list "${_compiler_version}") + list(GET _watcom_version_list 0 _watcom_major) + list(GET _watcom_version_list 1 _watcom_minor) + if(${_watcom_major} GREATER 11) + math(EXPR _watcom_major "${_watcom_major} - 11") endif() + math(EXPR _watcom_minor "${_watcom_minor} / 10") + set( __install__libs + ${CompilerPath}/clbr${_watcom_major}${_watcom_minor}.dll + ${CompilerPath}/mt7r${_watcom_major}${_watcom_minor}.dll + ${CompilerPath}/plbr${_watcom_major}${_watcom_minor}.dll ) foreach(lib ${__install__libs} ) |