From 9967d60ec1a6eaa8a4781f61f87d621a89b605a9 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Fri, 24 May 2019 00:52:49 +0300
Subject: [PATCH] Fix Boost_COMPILER handling

---
 boost-install.jam | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/boost-install.jam b/boost-install.jam
index e82aa03..ad22710 100644
--- a/boost-install.jam
+++ b/boost-install.jam
@@ -161,14 +161,16 @@ rule generate-cmake-variant- ( target : sources * : properties * )
     {
         print.text
 
-            "if(Boost_COMPILER AND NOT Boost_COMPILER STREQUAL \"$(toolset)\")"
-            "  _BOOST_SKIPPED(\"$(fname)\" \"$(toolset), Boost_COMPILER=${Boost_COMPILER}\")"
-            "  return()"
-            "endif()"
-            ""
-            "if(BOOST_DETECTED_TOOLSET AND NOT BOOST_DETECTED_TOOLSET STREQUAL \"$(toolset)\")"
-            "  _BOOST_SKIPPED(\"$(fname)\" \"$(toolset), detected ${BOOST_DETECTED_TOOLSET}, set Boost_COMPILER to override\")"
-            "  return()"
+            "if(Boost_COMPILER)"
+            "  if(NOT Boost_COMPILER STREQUAL \"$(toolset)\")"
+            "    _BOOST_SKIPPED(\"$(fname)\" \"$(toolset), Boost_COMPILER=${Boost_COMPILER}\")"
+            "    return()"
+            "  endif()"
+            "else()"
+            "  if(BOOST_DETECTED_TOOLSET AND NOT BOOST_DETECTED_TOOLSET STREQUAL \"$(toolset)\")"
+            "    _BOOST_SKIPPED(\"$(fname)\" \"$(toolset), detected ${BOOST_DETECTED_TOOLSET}, set Boost_COMPILER to override\")"
+            "    return()"
+            "  endif()"
             "endif()"
             ""
             : true ;