Don't require clang for other toolset.

freeorion · Nov 23, 2019 · 86cf84a · 86cf84a
1 parent 88babdb
commit 86cf84a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -706,6 +706,15 @@ configure_file(
     boost-config.jam
 )
 
+if(BOOST_TOOLSET EQUAL clang)
+    configure_file(
+        boost-config-clang.jam.in
+        boost-config-clang.jam
+    )
+    file(READ ${CMAKE_BINARY_DIR}/boost-config-clang.jam BOOST_CONFIG_CONTENTS)
+    file(APPEND ${CMAKE_BINARY_DIR}/boost-config.jam "${BOOST_CONFIG_CONTENTS}")
+endif()
+
 ExternalProject_PatchSet(boost BOOST_PATCHSET)
 ExternalProject_Add(boost
     DEPENDS patch zlib python python3

diff --git a/boost-config-clang.jam.in b/boost-config-clang.jam.in
@@ -0,0 +1,7 @@
+# detect the location of the Mac OSX SDK.
+using clang
+    : # version (not used)
+    : # cmd (compiler; not used)
+    : <root>@BOOST_OSX_SYSROOT@
+    ;
+
diff --git a/boost-config.jam.in b/boost-config.jam.in
@@ -12,9 +12,3 @@ using python
     : @PYTHON3_INSTALL_DIR@/lib # libraries
     ;
 
-# detect the location of the Mac OSX SDK.
-using clang
-    : # version (not used)
-    : # cmd (compiler; not used)
-    : <root>@BOOST_OSX_SYSROOT@
-    ;