[Cmake-commits] CMake branch, next, updated. v2.8.3-1385-gba2f4f2

[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  ba2f4f244345cd9c1e6cb7cdf92cdedd8348bca0 (commit)
       via  e60c8ec6c7dc2b9c963684ef37bc38c3db367ae2 (commit)
       via  db05da35d26b7b10a65b5330e1506582c29268ad (commit)
      from  dde952184d611f5be82a63a48e1cf21111589136 (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=ba2f4f244345cd9c1e6cb7cdf92cdedd8348bca0
commit ba2f4f244345cd9c1e6cb7cdf92cdedd8348bca0
Merge: dde9521 e60c8ec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 10:35:41 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 17 10:35:41 2011 -0500

    Merge topic 'sco-compiler' into next
    
    e60c8ec Factor SCO compiler info out of platform file (#11700)
    db05da3 Recognize SCO UnixWare C/C++ compilers (#11700)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e60c8ec6c7dc2b9c963684ef37bc38c3db367ae2
commit e60c8ec6c7dc2b9c963684ef37bc38c3db367ae2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 09:57:17 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 17 09:57:17 2011 -0500

    Factor SCO compiler info out of platform file (#11700)
    
    Move these flags out of the SCO_SV platform file so that other compilers
    may be used on that platform without interference.

diff --git a/Modules/Compiler/SCO-C.cmake b/Modules/Compiler/SCO-C.cmake
new file mode 100644
index 0000000..6e762cc
--- /dev/null
+++ b/Modules/Compiler/SCO-C.cmake
@@ -0,0 +1,2 @@
+include(Compiler/SCO)
+__compiler_sco(C)
diff --git a/Modules/Compiler/SCO-CXX.cmake b/Modules/Compiler/SCO-CXX.cmake
new file mode 100644
index 0000000..5b713a0
--- /dev/null
+++ b/Modules/Compiler/SCO-CXX.cmake
@@ -0,0 +1,2 @@
+include(Compiler/SCO)
+__compiler_sco(CXX)
diff --git a/Modules/Compiler/SCO.cmake b/Modules/Compiler/SCO.cmake
new file mode 100644
index 0000000..d3deeb1
--- /dev/null
+++ b/Modules/Compiler/SCO.cmake
@@ -0,0 +1,25 @@
+
+#=============================================================================
+# Copyright 2002-2011 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# This module is shared by multiple languages; use include blocker.
+if(__COMPILER_SCO)
+  return()
+endif()
+set(__COMPILER_SCO 1)
+
+macro(__compiler_sco lang)
+  # Feature flags.
+  set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-Kpic -belf")
+  set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-belf -Wl,-Bexport")
+endmacro()
diff --git a/Modules/Platform/SCO_SV.cmake b/Modules/Platform/SCO_SV.cmake
index efb7aa0..cbdcb7d 100644
--- a/Modules/Platform/SCO_SV.cmake
+++ b/Modules/Platform/SCO_SV.cmake
@@ -1,5 +1,2 @@
-SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-Kpic -belf")
-SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-Kpic -belf")
 SET(CMAKE_DL_LIBS "")
-SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-belf -Wl,-Bexport")  
 INCLUDE(Platform/UnixPaths)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db05da35d26b7b10a65b5330e1506582c29268ad
commit db05da35d26b7b10a65b5330e1506582c29268ad
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 09:52:33 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 17 09:52:33 2011 -0500

    Recognize SCO UnixWare C/C++ compilers (#11700)
    
    These compilers define __SCO_VERSION__ as VvvYYYYMML:
    
         V = major version
        vv = minor version
      YYYY = release year
        MM = release month
    
    http://osr600doc.sco.com/en/manCP/cc.CP.html
    http://osr600doc.sco.com/en/manCP/CC.CP.html

diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index c7778fb..c91553a 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -48,6 +48,9 @@
 #elif defined(__TI_COMPILER_VERSION__)
 # define COMPILER_ID "TI_DSP"
 
+#elif defined(__SCO_VERSION__)
+# define COMPILER_ID "SCO"
+
 #elif defined(__GNUC__)
 # define COMPILER_ID "GNU"
 
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index 2ff227a..4c8f497 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -50,6 +50,9 @@
 #elif defined(__TI_COMPILER_VERSION__)
 # define COMPILER_ID "TI_DSP"
 
+#elif defined(__SCO_VERSION__)
+# define COMPILER_ID "SCO"
+
 #elif defined(__GNUC__)
 # define COMPILER_ID "GNU"
 

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

Summary of changes:
 Modules/CMakeCCompilerId.c.in                      |    3 +++
 Modules/CMakeCXXCompilerId.cpp.in                  |    3 +++
 Modules/Compiler/SCO-C.cmake                       |    2 ++
 Modules/Compiler/SCO-CXX.cmake                     |    2 ++
 .../{Platform/AIX-GNU.cmake => Compiler/SCO.cmake} |   12 +++++++-----
 Modules/Platform/SCO_SV.cmake                      |    3 ---
 6 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 Modules/Compiler/SCO-C.cmake
 create mode 100644 Modules/Compiler/SCO-CXX.cmake
 copy Modules/{Platform/AIX-GNU.cmake => Compiler/SCO.cmake} (72%)


hooks/post-receive
-- 
CMake