[Cmake-commits] CMake branch, next, updated. v3.5.0-626-g5774400
Brad King
brad.king at kitware.com
Wed Mar 23 13:42:12 EDT 2016
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 57744007d898ae6a2c61902cf31933bf294753a3 (commit)
via 4527b9c41680aab191de7f37eca3fa47f1b07478 (commit)
from 334f492602a7aaf03fc87ddc33ef82fb9081b14f (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=57744007d898ae6a2c61902cf31933bf294753a3
commit 57744007d898ae6a2c61902cf31933bf294753a3
Merge: 334f492 4527b9c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 23 13:42:11 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 23 13:42:11 2016 -0400
Merge topic 'FindBoost-xl-compiler' into next
4527b9c4 FindBoost: Add support for IBM XL compiler
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4527b9c41680aab191de7f37eca3fa47f1b07478
commit 4527b9c41680aab191de7f37eca3fa47f1b07478
Author: Erik Zenker <erikzenker at posteo.de>
AuthorDate: Wed Mar 23 11:44:56 2016 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 23 13:41:42 2016 -0400
FindBoost: Add support for IBM XL compiler
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 728dcdf..9e6083d 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -464,6 +464,8 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
set(_boost_COMPILER "-bcb")
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
set(_boost_COMPILER "-sw")
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "XL")
+ set(_boost_COMPILER "-xlc")
elseif (MINGW)
if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
set(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list