[boost] Improve non-windows support

4 files changed, 26 insertions, 3 deletions

diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index 20306e7ed..4153f0132 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -9,6 +9,10 @@ set(VCPKG_PLATFORM_TOOLSET external)
 

 set(B2_OPTIONS)

 

+if(DEFINED BOOST_CMAKE_FRAGMENT)

+    include(${BOOST_CMAKE_FRAGMENT})

+endif()

+

 # Add build type specific options

 if(BUILD_SHARED_LIBS)

     list(APPEND B2_OPTIONS runtime-link=shared)

@@ -28,7 +32,11 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
     list(APPEND B2_OPTIONS address-model=64)

 endif()

 

-list(APPEND B2_OPTIONS target-os=linux toolset=gcc)

+if(APPLE)

+    list(APPEND B2_OPTIONS target-os=darwin toolset=clang)

+else()

+    list(APPEND B2_OPTIONS target-os=linux toolset=gcc)

+endif()

 

 string(REPLACE " " " <compileflags>" CXXFLAGS "${CMAKE_CXX_FLAGS}")

 #set(CXXFLAGS "${CXXFLAGS} <compileflags>-Wno-error=unused-command-line-argument")

@@ -45,6 +53,10 @@ foreach(INCDIR ${CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES})
     set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_INCLUDE_FLAG_C}${CMAKE_INCLUDE_FLAG_C_SEP}${INCDIR}")

 endforeach()

 

+if(APPLE)

+  set(CXXFLAGS "${CXXFLAGS} <compileflags>-D_DARWIN_C_SOURCE")

+endif()

+

 find_library(ZLIB_LIBPATH z)

 list(APPEND B2_OPTIONS

     -sZLIB_BINARY=z

diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL
index d57815738..a7f1ecf61 100644
--- a/ports/boost-modular-build-helper/CONTROL
+++ b/ports/boost-modular-build-helper/CONTROL
@@ -1,2 +1,2 @@
 Source: boost-modular-build-helper

-Version: 2

+Version: 2018-04-15

diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index 222fc7fe9..2833c51a6 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -1,5 +1,5 @@
 function(boost_modular_build)

-    cmake_parse_arguments(_bm "" "SOURCE_PATH;REQUIREMENTS" "OPTIONS" ${ARGN})

+    cmake_parse_arguments(_bm "" "SOURCE_PATH;REQUIREMENTS;BOOST_CMAKE_FRAGMENT" "OPTIONS" ${ARGN})

 

     if(NOT DEFINED _bm_SOURCE_PATH)

         message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_build.")

@@ -80,6 +80,9 @@ function(boost_modular_build)
     configure_file(${_bm_DIR}/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY)

 

     if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

+        if(DEFINED _bm_BOOST_CMAKE_FRAGMENT)

+            set(fragment_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}")

+        endif()

         vcpkg_configure_cmake(

             SOURCE_PATH ${CURRENT_INSTALLED_DIR}/share/boost-build

             PREFER_NINJA

@@ -87,8 +90,13 @@ function(boost_modular_build)
                 "-DB2_EXE=${B2_EXE}"

                 "-DSOURCE_PATH=${_bm_SOURCE_PATH}"

                 "-DBOOST_BUILD_PATH=${BOOST_BUILD_PATH}"

+                ${fragment_option}

         )

         vcpkg_install_cmake()

+

+        if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/lib)

+            message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.")

+        endif()

         return()

     endif()

 

diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam
index bd3797283..abefc7fae 100644
--- a/ports/boost-modular-build-helper/user-config.jam
+++ b/ports/boost-modular-build-helper/user-config.jam
@@ -45,3 +45,6 @@ lib icuin : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib" <variant>debu
 

 lib icudt : : <file>"@CURRENT_INSTALLED_DIR@/lib/icudt.lib" <variant>release : : ;

 lib icudt : : <file>"@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib" <variant>debug : : ;

+

+lib iconv : : <file>"@LIBICONV_LIBRARY@" <link>shared <runtime-link>shared <variant>release : : ;

+lib iconv : : <file>"@LIBICONV_LIBRARY@" <link>shared <runtime-link>shared <variant>debug : : ;