[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-500-g8a6a1f4
Kitware Robot
kwrobot at kitware.com
Fri Mar 17 09:16:35 EDT 2017
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 8a6a1f4984644e1eb20d9bdc866e9ae8c1c7e375 (commit)
via 0b668e52a91b7f03f312c691e5b1c54a371d0316 (commit)
via 2a8c2af4d4ca1ec653c87c11a3f79a241b6b27e7 (commit)
via 7eb1f5b7aca1500e68a8be7ba158ed616a8595df (commit)
from 9be47180bdc5d7a885bfd9c311f8651ca5c64eb5 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a6a1f4984644e1eb20d9bdc866e9ae8c1c7e375
commit 8a6a1f4984644e1eb20d9bdc866e9ae8c1c7e375
Merge: 9be4718 0b668e5
Author: Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Mar 17 13:11:19 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Mar 17 09:14:25 2017 -0400
Stage topic 'move-platform-specific-paths'
Topic-id: 23087
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/589
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b668e52a91b7f03f312c691e5b1c54a371d0316
commit 0b668e52a91b7f03f312c691e5b1c54a371d0316
Author: Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Mar 16 06:04:29 2017 -0400
Commit: Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Thu Mar 16 06:04:29 2017 -0400
Cygwin: Move Cygwin-specific paths to the cygwin platform
diff --git a/Modules/Platform/CYGWIN.cmake b/Modules/Platform/CYGWIN.cmake
index 22816e7..9b897bd 100644
--- a/Modules/Platform/CYGWIN.cmake
+++ b/Modules/Platform/CYGWIN.cmake
@@ -62,3 +62,13 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a")
set(CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION 1)
include(Platform/UnixPaths)
+
+# Windows API on Cygwin
+list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+ /usr/include/w32api
+ )
+
+# Windows API on Cygwin
+list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+ /usr/lib/w32api
+ )
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index 48bbd40..89f7d87 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -50,17 +50,11 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
# List common include file locations not under the common prefixes.
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
- # Windows API on Cygwin
- /usr/include/w32api
-
# X11
/usr/include/X11
)
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
- # Windows API on Cygwin
- /usr/lib/w32api
-
# X11
/usr/lib/X11
)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a8c2af4d4ca1ec653c87c11a3f79a241b6b27e7
commit 2a8c2af4d4ca1ec653c87c11a3f79a241b6b27e7
Author: Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Mar 16 06:00:19 2017 -0400
Commit: Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Thu Mar 16 06:00:49 2017 -0400
SunOS: Move solaris-specific paths to the solaris platform
diff --git a/Modules/Platform/SunOS.cmake b/Modules/Platform/SunOS.cmake
index 58398c0..e19e89a 100644
--- a/Modules/Platform/SunOS.cmake
+++ b/Modules/Platform/SunOS.cmake
@@ -9,6 +9,11 @@ endif()
include(Platform/UnixPaths)
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ /opt/csw
+ /opt/openwin
+ )
+
# The Sun linker needs to find transitive shared library dependencies
# in the -L path.
set(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index 11b28f8..48bbd40 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -45,9 +45,7 @@ endif()
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
/usr/X11R6
/usr/pkg
- /opt/csw
/opt
- /opt/openwin
)
# List common include file locations not under the common prefixes.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7eb1f5b7aca1500e68a8be7ba158ed616a8595df
commit 7eb1f5b7aca1500e68a8be7ba158ed616a8595df
Author: Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Mar 16 05:57:58 2017 -0400
Commit: Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Thu Mar 16 05:57:58 2017 -0400
Unix: Consolidate path components into prefixes
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index b216d03..11b28f8 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -41,18 +41,22 @@ if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
endif()
endif()
+# Non "standard" but common install prefixes
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ /usr/X11R6
+ /usr/pkg
+ /opt/csw
+ /opt
+ /opt/openwin
+ )
+
# List common include file locations not under the common prefixes.
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
# Windows API on Cygwin
/usr/include/w32api
# X11
- /usr/X11R6/include /usr/include/X11
-
- # Other
- /usr/pkg/include
- /opt/csw/include /opt/include
- /usr/openwin/include
+ /usr/include/X11
)
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
@@ -60,16 +64,7 @@ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
/usr/lib/w32api
# X11
- /usr/X11R6/lib /usr/lib/X11
-
- # Other
- /usr/pkg/lib
- /opt/csw/lib /opt/lib
- /usr/openwin/lib
- )
-
-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
- /usr/pkg/bin
+ /usr/lib/X11
)
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/CYGWIN.cmake | 10 ++++++++++
Modules/Platform/SunOS.cmake | 5 +++++
Modules/Platform/UnixPaths.cmake | 31 +++++++++----------------------
3 files changed, 24 insertions(+), 22 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list