[Cmake-commits] CMake branch, next, updated. v2.8.9-3055-gdfee3ec

[Brad King]

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  dfee3ecc46cafcbc3e66972a23c14cb933aa621b (commit)
       via  af42ae4f8190c5c0257703b04671f35e66dfaa05 (commit)
       via  408c04e7342ab4ee09b1243a2c460c797f7996cc (commit)
       via  ee1ee209052d12e29a7720ee5c207c7a524a31b5 (commit)
       via  95e8636711a04cdd100011ccd150a48baa48ae27 (commit)
      from  ec8ad7088144d0907889310d97e0b062d2a427e1 (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=dfee3ecc46cafcbc3e66972a23c14cb933aa621b
commit dfee3ecc46cafcbc3e66972a23c14cb933aa621b
Merge: ec8ad70 af42ae4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 13 08:21:27 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 13 08:21:27 2012 -0400

    Merge topic 'watcom-compiler-version' into next
    
    af42ae4 Watcom: Simplify compiler version detection (#11866)
    408c04e CMake Nightly Date Stamp
    ee1ee20 CMake Nightly Date Stamp
    95e8636 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af42ae4f8190c5c0257703b04671f35e66dfaa05
commit af42ae4f8190c5c0257703b04671f35e66dfaa05
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 13 08:15:42 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 13 08:19:23 2012 -0400

    Watcom: Simplify compiler version detection (#11866)
    
    Since commit c198730b (Detect Watcom compiler version with its id,
    2011-12-07) the CMAKE_(C|CXX)_COMPILER_VERSION variables are set for the
    Watcom compiler.  Use these in Windows-wcl386.cmake to set the old
    WATCOM1* version variables.  This avoids using the old EXECUTE_PROCESS
    command which failed due to extra quotes anyway.

diff --git a/Modules/Platform/Windows-wcl386.cmake b/Modules/Platform/Windows-wcl386.cmake
index 14b3b81..21c4a69 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -83,40 +83,27 @@ SET(CMAKE_CXX_CREATE_STATIC_LIBRARY  "wlib ${CMAKE_LIB_QUIET} -c -n -b '<TARGET_
 # create a C static library
 SET(CMAKE_C_CREATE_STATIC_LIBRARY ${CMAKE_CXX_CREATE_STATIC_LIBRARY})
 
-IF(NOT CMAKE_WATCOM_COMPILER_TESTS_RUN)
-  SET(CMAKE_WATCOM_COMPILER_TESTS_RUN 1)
-  SET(testWatcomVersionFile
-    "${CMAKE_ROOT}/Modules/CMakeTestWatcomVersion.c")
-  STRING(REGEX REPLACE "/" "\\\\" testWatcomVersionFile "${testWatcomVersionFile}")
-  MESSAGE(STATUS "Check for Watcom compiler version")
-  SET(CMAKE_TEST_COMPILER ${CMAKE_C_COMPILER})
-  IF (NOT CMAKE_C_COMPILER)
-    SET(CMAKE_TEST_COMPILER ${CMAKE_CXX_COMPILER})
-  ENDIF()
-  EXECUTE_PROCESS(COMMAND ${CMAKE_TEST_COMPILER}
-    -q -pc \"${testWatcomVersionFile}\"
-    OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT
-    RESULT_VARIABLE CMAKE_COMPILER_RETURN
-    )
-  STRING(REGEX REPLACE "\n" " " compilerVersion "${CMAKE_COMPILER_OUTPUT}")
-  STRING(REGEX REPLACE ".*VERSION=(.*)" "\\1"
-    compilerVersion "${compilerVersion}")
-  IF("${CMAKE_COMPILER_RETURN}" STREQUAL "0")
-    SET(WATCOM16)
-    SET(WATCOM17)
-    SET(WATCOM18)
-    SET(WATCOM19)
-    IF("${compilerVersion}" LESS 1270)
-      SET(WATCOM16 1)
-    ENDIF()
-    IF("${compilerVersion}" EQUAL 1270)
-      SET(WATCOM17 1)
-    ENDIF()
-    IF("${compilerVersion}" EQUAL 1280)
-      SET(WATCOM18 1)
-    ENDIF()
-    IF("${compilerVersion}" EQUAL 1290)
-      SET(WATCOM19 1)
-    ENDIF()
-  ENDIF()
-ENDIF()
+if(NOT _CMAKE_WATCOM_VERSION)
+  set(_CMAKE_WATCOM_VERSION 1)
+  if(CMAKE_C_COMPILER_VERSION)
+    set(_compiler_version ${CMAKE_C_COMPILER_VERSION})
+  else()
+    set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION})
+  endif()
+  set(WATCOM16)
+  set(WATCOM17)
+  set(WATCOM18)
+  set(WATCOM19)
+  if("${_compiler_version}" LESS 12.70)
+    set(WATCOM16 1)
+  endif()
+  if("${_compiler_version}" EQUAL 12.70)
+    set(WATCOM17 1)
+  endif()
+  if("${_compiler_version}" EQUAL 12.80)
+    set(WATCOM18 1)
+  endif()
+  if("${_compiler_version}" EQUAL 12.90)
+    set(WATCOM19 1)
+  endif()
+endif()

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Windows-wcl386.cmake |   61 +++++++++++++--------------------
 Source/CMakeVersion.cmake             |    2 +-
 2 files changed, 25 insertions(+), 38 deletions(-)


hooks/post-receive
-- 
CMake