This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 4931e3ce96b9d0b8f89dd71b7a80d4fa15cad156 (commit) via b052902c32190f6c10c703ab07310a91fa50d46a (commit) from cb79c71e170eb5ae9f52acf68d90782697e2a9cc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4931e3ce96b9d0b8f89dd71b7a80d4fa15cad156 commit 4931e3ce96b9d0b8f89dd71b7a80d4fa15cad156 Merge: cb79c71 b052902 Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Mar 4 16:28:20 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Mar 4 16:28:20 2014 -0500 Merge topic 'watcom-rtdll-version' into next b052902c Remove hard-coded version of RTDLL for Open Watcom http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b052902c32190f6c10c703ab07310a91fa50d46a commit b052902c32190f6c10c703ab07310a91fa50d46a Author: Jiri Malak <malak.j...@gmail.com> AuthorDate: Mon Mar 3 21:36:09 2014 +0100 Commit: Brad King <brad.k...@kitware.com> CommitDate: Tue Mar 4 16:28:53 2014 -0500 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. 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} ) ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits