Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/cmake/patches/02-cmState.cxx.patch
author xiao qing lu - Sun Microsystems - Beijing China <xiaoqing.lu@oracle.com>
Tue, 12 Jul 2016 19:50:03 -0700
changeset 6403 9d25dbe7eb71
parent 5831 0a28d29c7d5b
child 6915 8e42a5077b6d
permissions -rw-r--r--
23209274 Upgrade libsigsegv to 2.10
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5831
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
# Define CMAKE_HOST_SOLARIS when running on Solaris.
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
# Submitted upstream to CMake:
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
# https://public.kitware.com/Bug/view.php?id=16061
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
# Brad King said he will accept it (see comments in tbe bug above).
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
--- old/Source/cmState.cxx	2016-03-08 06:36:22.000000000 -0800
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
+++ new/Source/cmState.cxx	2016-04-13 12:36:36.918264928 -0700
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
@@ -1425,6 +1425,9 @@
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
     this->SetDefinition("APPLE", "1");
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
     this->SetDefinition("CMAKE_HOST_APPLE", "1");
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
   #endif
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
+  #if defined(__sun__)
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
+    this->SetDefinition("CMAKE_HOST_SOLARIS", "1");
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
+  #endif
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
     char temp[1024];
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
     sprintf(temp, "%d", cmVersion::GetMinorVersion());
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
--- old/Help/manual/cmake-variables.7.rst	2016-03-08 06:36:21.000000000 -0800
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
+++ new/Help/manual/cmake-variables.7.rst	2016-04-13 12:32:06.281390861 -0700
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
@@ -175,6 +175,7 @@
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
    /variable/CMAKE_CL_64
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
    /variable/CMAKE_COMPILER_2005
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
    /variable/CMAKE_HOST_APPLE
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
+   /variable/CMAKE_HOST_SOLARIS
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
    /variable/CMAKE_HOST_SYSTEM_NAME
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
    /variable/CMAKE_HOST_SYSTEM_PROCESSOR
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
    /variable/CMAKE_HOST_SYSTEM
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
--- old/Help/variable/CMAKE_HOST_SOLARIS.rst	2016-04-13 12:35:14.483750545 -0700
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
+++ new/Help/variable/CMAKE_HOST_SOLARIS.rst	2016-04-13 12:35:00.360288857 -0700
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
@@ -0,0 +1,6 @@
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
+CMAKE_HOST_SOLARIS
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
+------------------
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
+
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
+``True`` for Oracle Solaris operating systems.
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
+
0a28d29c7d5b 22950969 upgrade cmake to 3.5.0
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
 
+Set to ``true`` when the host system is Oracle Solaris.
upstream/oracle/userland-gate