[Cmake-commits] CMake branch, next, updated. v3.1.0-1458-g03a66cf

[Stephen Kelly]

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  03a66cff114687d0d9e71a289b05a66259853d47 (commit)
       via  c7d7eef21b678a0949a26fb7b12be8f032a51ffd (commit)
       via  a240682cb7c71fe241945c6fb67c8e55ee032eb7 (commit)
      from  f26306d36f7fefcbb041587a6e432ceb4eeb6926 (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=03a66cff114687d0d9e71a289b05a66259853d47
commit 03a66cff114687d0d9e71a289b05a66259853d47
Merge: f26306d c7d7eef
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 1 11:41:58 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 1 11:41:58 2015 -0500

    Merge topic 'sun-better-stdlib' into next
    
    c7d7eef2 Bootstrap: Use -library=stlport4 with SolarisStudio.
    a240682c Fix build with SunCC/stlport.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7d7eef21b678a0949a26fb7b12be8f032a51ffd
commit c7d7eef21b678a0949a26fb7b12be8f032a51ffd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 1 17:31:54 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 1 17:31:54 2015 +0100

    Bootstrap: Use -library=stlport4 with SolarisStudio.

diff --git a/bootstrap b/bootstrap
index fe051e1..3574973 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1154,6 +1154,35 @@ if [ "x${cmake_cxx_compiler_is_gnu}" != "x1" ]; then
   cmake_test_flags=
 fi
 
+
+if [ "x${cmake_cxx_compiler_is_gnu}" != "x1" ]; then
+  # Are we SolarisStudio?
+
+  TMPFILE=`cmake_tmp_file`
+  echo '
+  #if defined(__SUNPRO_CC)
+  #include <iostream>
+  int main() { std::cout << "This is SolarisStudio" << std::endl; return 0;}
+  #endif
+  ' > ${TMPFILE}.cxx
+  cmake_cxx_compiler_is_solarisstudio=0
+  if cmake_try_run "${cmake_cxx_compiler}" \
+    "${cmake_cxx_flags} " "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then
+    cmake_cxx_compiler_is_solarisstudio=1
+  fi
+  if [ "x${cmake_cxx_compiler_is_solarisstudio}" = "x1" ]; then
+    echo "${cmake_cxx_compiler} is SolarisStudio compiler"
+  else
+    echo "${cmake_cxx_compiler} is not SolarisStudio compiler"
+  fi
+  rm -f "${TMPFILE}.cxx"
+
+  if [ "x${cmake_cxx_compiler_is_solarisstudio}" = "x1" ]; then
+    cmake_cxx_flags="${cmake_cxx_flags} -library=stlport4"
+  fi
+fi
+
+
 # Test for kwsys features
 KWSYS_NAME_IS_KWSYS=0
 KWSYS_BUILD_SHARED=0

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a240682cb7c71fe241945c6fb67c8e55ee032eb7
commit a240682cb7c71fe241945c6fb67c8e55ee032eb7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 1 16:04:39 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 1 16:36:12 2015 +0100

    Fix build with SunCC/stlport.
    
    fcntl.h needs to be included before <string> is included when using
    stlport. Otherwise:
    
    "Source/kwsys/SystemTools.cxx", line 1240: Error: UTIME_OMIT is not defined.
    "Source/kwsys/SystemTools.cxx", line 1240: Error: UTIME_NOW is not defined.
    "Source/kwsys/SystemTools.cxx", line 1241: Error: AT_FDCWD is not defined.

diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index e4c82d8..c2b6097 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -16,6 +16,14 @@
 #  define _XOPEN_SOURCE_EXTENDED
 #endif
 
+#if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__MINGW32__))
+#  define KWSYS_WINDOWS_DIRS
+#else
+#  if defined(__SUNPRO_CC)
+#    include <fcntl.h>
+#  endif
+#endif
+
 #include "kwsysPrivate.h"
 #include KWSYS_HEADER(RegularExpression.hxx)
 #include KWSYS_HEADER(SystemTools.hxx)
@@ -205,8 +213,7 @@ static time_t windows_filetime_to_posix_time(const FILETIME& ft)
 }
 #endif
 
-#if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__MINGW32__))
-
+#ifdef KWSYS_WINDOWS_DIRS
 #include <wctype.h>
 
 inline int Mkdir(const kwsys_stl::string& dir)

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

Summary of changes:
 Source/kwsys/SystemTools.cxx |   11 +++++++++--
 bootstrap                    |   29 +++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake