Browse Source

Merge topic 'FindBoost-1.73'

a1e04be913 FindBoost: Update MinGW compiler tag for Boost 1.73

Acked-by: Kitware Robot <[email protected]>
Acked-by: Boris Basic <[email protected]>
Merge-request: !4706
Brad King 5 years ago
parent
commit
e99e5418b4
1 changed files with 5 additions and 1 deletions
  1. 5 1
      Modules/FindBoost.cmake

+ 5 - 1
Modules/FindBoost.cmake

@@ -754,7 +754,11 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
         set(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
     else()
       _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION _boost_COMPILER_VERSION_MAJOR _boost_COMPILER_VERSION_MINOR)
-      set(_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
+      if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.73 AND _boost_COMPILER_VERSION_MAJOR VERSION_GREATER_EQUAL 5)
+        set(_boost_COMPILER "-mgw${_boost_COMPILER_VERSION_MAJOR}")
+      else()
+        set(_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
+      endif()
     endif()
   elseif (UNIX)
     _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION _boost_COMPILER_VERSION_MAJOR _boost_COMPILER_VERSION_MINOR)