diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-20 18:02:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-20 18:02:52 (GMT) |
| commit | 5e0e65c18926b0a9c5b66ff4ec93d45cc008d383 (patch) | |
| tree | 2d9276431fe32440bb6e83a2f2406731f3a0e2de /Modules/FindBoost.cmake | |
| parent | 8056dda8a2406b63c94d4aca3f79187747c0a120 (diff) | |
| parent | 66b641f443a1d3fc8b5f74233307ba9b0929d340 (diff) | |
| download | CMake-5e0e65c18926b0a9c5b66ff4ec93d45cc008d383.zip CMake-5e0e65c18926b0a9c5b66ff4ec93d45cc008d383.tar.gz CMake-5e0e65c18926b0a9c5b66ff4ec93d45cc008d383.tar.bz2 | |
Merge topic 'add-GreenHills-MULTI-generator'
66b641f4 Help: Add notes for topic 'add-GreenHills-MULTI-generator'
48004d9d Add a 'Green Hills MULTI' generator on Windows
051d8be1 cmLocalGenerator: Constify some cmTarget and cmGeneratorTarget arguments
Diffstat (limited to 'Modules/FindBoost.cmake')
| -rw-r--r-- | Modules/FindBoost.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 466090b..c844aed 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -405,6 +405,8 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret) else() set (_boost_COMPILER "-il") endif() + elseif (GHSMULTI) + set(_boost_COMPILER "-ghs") elseif (MSVC14) set(_boost_COMPILER "-vc140") elseif (MSVC12) @@ -777,7 +779,8 @@ endif() # ------------------------------------------------------------------------ set(Boost_LIB_PREFIX "") -if ( WIN32 AND Boost_USE_STATIC_LIBS AND NOT CYGWIN) +if ( (GHSMULTI AND Boost_USE_STATIC_LIBS) OR + (WIN32 AND Boost_USE_STATIC_LIBS AND NOT CYGWIN) ) set(Boost_LIB_PREFIX "lib") endif() |