[Cmake-commits] CMake branch, next, updated. v3.4.0-1384-g58f54d3
Brad King
brad.king at kitware.com
Mon Nov 16 10:41:38 EST 2015
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 58f54d3a0288d6210eac005f933cf1d7f5bade53 (commit)
via 6772913fff10d59b38ccec6c1104008c8a21f7f7 (commit)
from 60014e9faf147fbdc6d7789627f02da3f176d5a7 (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=58f54d3a0288d6210eac005f933cf1d7f5bade53
commit 58f54d3a0288d6210eac005f933cf1d7f5bade53
Merge: 60014e9 6772913
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 16 10:41:37 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 16 10:41:37 2015 -0500
Merge topic 'oracle-implicit-link-dirs' into next
6772913f SunOS: Remove obsolete Studio compiler library directories
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6772913fff10d59b38ccec6c1104008c8a21f7f7
commit 6772913fff10d59b38ccec6c1104008c8a21f7f7
Author: April Chin <chin.oracle at gmail.com>
AuthorDate: Fri Nov 13 11:35:58 2015 -0800
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 16 10:41:10 2015 -0500
SunOS: Remove obsolete Studio compiler library directories
Our CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES setting is no longer needed
because CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES is now populated with the
actual implicit link directories for the current toolchain. The old
values we hard-coded in CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES are not
relevant to modern toolchains, so simply drop them.
Co-Author: Shawn Walker-Salas <shawn.walker at oracle.com>
diff --git a/Modules/Platform/SunOS.cmake b/Modules/Platform/SunOS.cmake
index 77946f2..58398c0 100644
--- a/Modules/Platform/SunOS.cmake
+++ b/Modules/Platform/SunOS.cmake
@@ -9,12 +9,6 @@ endif()
include(Platform/UnixPaths)
-# Add the compiler's implicit link directories.
-if("${CMAKE_C_COMPILER_ID} ${CMAKE_CXX_COMPILER_ID}" MATCHES SunPro)
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
- /opt/SUNWspro/lib /opt/SUNWspro/prod/lib /usr/ccs/lib)
-endif()
-
# The Sun linker needs to find transitive shared library dependencies
# in the -L path.
set(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/SunOS.cmake | 6 ------
1 file changed, 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list